diff --git a/pom.xml b/pom.xml index a6fd0a92..d62bec96 100644 --- a/pom.xml +++ b/pom.xml @@ -322,18 +322,6 @@ org.eclipse.rap.fileupload 3.7.0 - - org.xeustechnologies - jcl-core - 2.8 - - - - - - - - diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/RAPConfiguration.java b/src/main/java/ch/ethz/seb/sebserver/gui/RAPConfiguration.java index e35ecd27..17be4e81 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/RAPConfiguration.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/RAPConfiguration.java @@ -10,7 +10,6 @@ package ch.ethz.seb.sebserver.gui; import java.io.IOException; import java.io.InputStream; -import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; @@ -18,7 +17,6 @@ import javax.servlet.ServletContext; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.commons.lang3.StringUtils; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.application.AbstractEntryPoint; import org.eclipse.rap.rwt.application.Application; @@ -35,7 +33,6 @@ import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; -import org.xeustechnologies.jcl.JarClassLoader; //import com.eclipsesource.rap.aria.Aria; @@ -127,7 +124,6 @@ public class RAPConfiguration implements ApplicationConfiguration { public static final class RAPSpringEntryPointFactory implements EntryPointFactory { - private final JarClassLoader jcl = new JarClassLoader(); private boolean initialized = false; @Override @@ -162,28 +158,6 @@ public class RAPConfiguration implements ApplicationConfiguration { final WebApplicationContext webApplicationContext = getWebApplicationContext(httpSession); initSpringBasedRAPServices(webApplicationContext); - final String ariaPluginPath = ariaPluginPath(webApplicationContext); - if (StringUtils.isNotBlank(ariaPluginPath)) { - - log.debug("Try to initialize com.eclipsesource.rap.aria.Aria plugin..."); - - try { - - final Class forName = Class.forName( - "com.eclipsesource.rap.aria.Aria", - false, - RAPSpringEntryPointFactory.this.jcl); - - final Method method = forName.getMethod("activate"); - method.invoke(null); - - log.info("Initialization of com.eclipsesource.rap.aria.Aria plugin was successful"); - - } catch (final Exception e) { - log.error("Failed to initialize com.eclipsesource.rap.aria.Aria plugin: ", e); - } - } - final EntryPointService entryPointService = webApplicationContext .getBean(EntryPointService.class); @@ -203,24 +177,12 @@ public class RAPConfiguration implements ApplicationConfiguration { final DownloadService downloadService = webApplicationContext.getBean(DownloadService.class); manager.registerServiceHandler(DownloadService.DOWNLOAD_SERVICE_NAME, downloadService); - final String ariaPluginPath = ariaPluginPath(webApplicationContext); - if (StringUtils.isNotBlank(ariaPluginPath)) { - this.jcl.add(ariaPluginPath); - } - this.initialized = true; } catch (final IllegalArgumentException iae) { log.warn("Failed to register DownloadService on ServiceManager. Already registered: ", iae); } } } - - private String ariaPluginPath(final WebApplicationContext webApplicationContext) { - return webApplicationContext - .getEnvironment() - .getProperty("sebserver.gui.external.lib.aria.plugin.path", ""); - - } } private static boolean isAuthenticated(