Removed Custom Class Loader - (Task #1184)

- Removed Custiom ClassLoader from Applet for jetty/jersey servlets --- Task #1184: Updating to Eclipse 2024/03 and all dependencies
virtualsatellite · May 3, 2024 · 9758af3 · 9758af3
1 parent cc239a1
commit 9758af3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 123 deletions.
diff --git a/de.dlr.sc.virsat.external.lib.jersey/.classpath b/de.dlr.sc.virsat.external.lib.jersey/.classpath
@@ -2,10 +2,10 @@
 <classpath>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jetty-http-12.0.6.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jetty-io-12.0.6.jar"/>
- <classpathentry exported="true" kind="lib" path="externalLib/maven/jetty-security-12.0.6.jar"/>
+ <classpathentry exported="true" kind="lib" path="externalLib/maven/jetty-security-12.0.6.jar" sourcepath="externalLib/maven/jetty-security-12.0.6-sources.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jetty-server-12.0.6.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jetty-session-12.0.6.jar"/>
- <classpathentry exported="true" kind="lib" path="externalLib/maven/jetty-util-12.0.6.jar"/>
+ <classpathentry exported="true" kind="lib" path="externalLib/maven/jetty-util-12.0.6.jar" sourcepath="externalLib/maven/jetty-util-12.0.6-sources.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/angus-mail-2.0.2.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/aopalliance-repackaged-3.0.6.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/asm-9.7.jar"/>
@@ -25,14 +25,14 @@
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jakarta.mail-api-2.1.2.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jakarta.servlet-api-6.0.0.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jakarta.validation-api-3.0.2.jar"/>
- <classpathentry exported="true" kind="lib" path="externalLib/maven/jakarta.ws.rs-api-3.1.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="externalLib/maven/jakarta.ws.rs-api-3.1.0.jar" sourcepath="externalLib/maven/jakarta.ws.rs-api-3.1.0-sources.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jakarta.xml.bind-api-4.0.2.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/javassist-3.30.2-GA.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-client-3.1.6.jar" sourcepath="externalLib/maven/jersey-client-3.1.6-sources.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-common-3.1.6.jar" sourcepath="externalLib/maven/jersey-common-3.1.6-sources.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-container-jetty-http-3.1.6.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-container-servlet-3.1.6.jar"/>
- <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-container-servlet-core-3.1.6.jar"/>
+ <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-container-servlet-core-3.1.6.jar" sourcepath="externalLib/maven/jersey-container-servlet-core-3.1.6-sources.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-entity-filtering-3.1.6.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-hk2-3.1.6.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-media-jaxb-3.1.6.jar"/>

diff --git a/de.dlr.sc.virsat.external.lib.jersey/META-INF/MANIFEST.MF b/de.dlr.sc.virsat.external.lib.jersey/META-INF/MANIFEST.MF
@@ -47,7 +47,6 @@ Export-Package: .,
  com.fasterxml.jackson.module.jakarta.xmlbind.ser,
  com.sun.research.ws.wadl,
  de.dlr.virsat.external.lib.jersey,
- de.dlr.virsat.external.lib.jersey.servlet,
  jakarta.activation,
  jakarta.activation.spi,
  jakarta.annotation,
@@ -572,3 +571,4 @@ Bundle-ClassPath: .,
  externalLib/maven/jetty-util-12.0.6.jar
 Automatic-Module-Name: de.dlr.sc.virsat.external.lib.jersey
 Bundle-ActivationPolicy: lazy
+Eclipse-BuddyPolicy: dependent
diff --git a/...lib.jersey/src/de/dlr/virsat/external/lib/jersey/servlet/ApplicationServletContainer.java b/...lib.jersey/src/de/dlr/virsat/external/lib/jersey/servlet/ApplicationServletContainer.java
diff --git a/de.dlr.sc.virsat.server/src/de/dlr/sc/virsat/server/servlet/RepoManagementServlet.java b/de.dlr.sc.virsat.server/src/de/dlr/sc/virsat/server/servlet/RepoManagementServlet.java
@@ -20,23 +20,20 @@
 import org.glassfish.jersey.servlet.ServletContainer;
 
 import de.dlr.sc.virsat.server.auth.filter.CorsFilter;
-import de.dlr.sc.virsat.server.classloader.BundleDependencyClassLoader;
 import de.dlr.sc.virsat.server.resources.DocumentationResource;
 import de.dlr.sc.virsat.server.resources.ProjectManagementResource;
-import de.dlr.virsat.external.lib.jersey.servlet.ApplicationServletContainer;
 
-public class RepoManagementServlet extends ApplicationServletContainer implements Servlet {
+public class RepoManagementServlet extends ServletContainer implements Servlet {
 
+ private static final long serialVersionUID = -2692482360010807873L;
  public static final String MANAGEMENT_API_ID = "/management";
  public static final String MANAGEMENT_API_VERSION = "v0.0.1";
  public static final String MANAGEMENT_API = MANAGEMENT_API_ID + "/" + MANAGEMENT_API_VERSION;
 
- @Override
- protected Servlet onCreateServlet() {
- RepoManagementRestApplication resourceConfig = new RepoManagementRestApplication();
- return new ServletContainer(resourceConfig);
+ public RepoManagementServlet() {
+ super(new RepoManagementRestApplication());
  }
-
+ 
  private static class RepoManagementRestApplication extends ResourceConfig {
  /**
  * Registers all relevant Classes: Resources, Filter and Bindings
@@ -63,9 +60,4 @@ public void configure() {
  }
  }
 
- @Override
- protected ClassLoader onCreateClassLoader() {
- return new BundleDependencyClassLoader(getClass());
- }
-
 }
diff --git a/de.dlr.sc.virsat.server/src/de/dlr/sc/virsat/server/servlet/VirSatModelAccessServlet.java b/de.dlr.sc.virsat.server/src/de/dlr/sc/virsat/server/servlet/VirSatModelAccessServlet.java
@@ -21,30 +21,25 @@
 
 import de.dlr.sc.virsat.server.auth.filter.CorsFilter;
 import de.dlr.sc.virsat.server.auth.filter.DynamicRepositoryFilterBinding;
-import de.dlr.sc.virsat.server.classloader.BundleDependencyClassLoader;
 import de.dlr.sc.virsat.server.dataaccess.TransactionalJsonProvider;
 import de.dlr.sc.virsat.server.resources.DocumentationResource;
 import de.dlr.sc.virsat.server.resources.ModelAccessResource;
-import de.dlr.virsat.external.lib.jersey.servlet.ApplicationServletContainer;
 
 /**
  * This servlet registers the classes that should be provided as REST resources.
  *
  */
-public class VirSatModelAccessServlet extends ApplicationServletContainer implements Servlet {
+public class VirSatModelAccessServlet extends ServletContainer implements Servlet {
 
+ private static final long serialVersionUID = 3446565649712728172L;
  public static final String MODEL_API_ID = "/model";
  public static final String MODEL_API_VERSION = "v0.0.1";
  public static final String MODEL_API = MODEL_API_ID + "/" + MODEL_API_VERSION;
 
- @Override
- protected Servlet onCreateServlet() {
- ModelAccessRestApplication resourceConfig = new ModelAccessRestApplication();
- // Disable the default json provider
- resourceConfig.property(CommonProperties.MOXY_JSON_FEATURE_DISABLE_SERVER, true);
- return new ServletContainer(resourceConfig);
+ public VirSatModelAccessServlet() {
+ super(new ModelAccessRestApplication());
  }
-
+ 
  private static class ModelAccessRestApplication extends ResourceConfig {
  /**
  * Registers all relevant Classes: Resources, Filter and Bindings
@@ -83,11 +78,9 @@ public void configure() {
  };
  register(binder);
  register(TransactionalJsonProvider.class);
+
+ // Disable the default json provider
+ this.property(CommonProperties.MOXY_JSON_FEATURE_DISABLE_SERVER, true);
  }
  }
-
- @Override
- protected ClassLoader onCreateClassLoader() {
- return new BundleDependencyClassLoader(getClass());
- }
 }