zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed ARIA Plugin

Browse source
This commit is contained in:
anhefti 2021-06-30 14:10:34 +02:00
parent 0638bcafd6
commit 80ff396383
2 changed files with 0 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pom.xml
View file

@ -322,18 +322,6 @@
<artifactId>org.eclipse.rap.fileupload</artifactId> <artifactId>org.eclipse.rap.fileupload</artifactId>
<version>3.7.0</version> <version>3.7.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.xeustechnologies</groupId>
<artifactId>jcl-core</artifactId>
<version>2.8</version>
</dependency>
<!-- <dependency> -->
<!-- <groupId>com.eclipsesource.rap.aria</groupId> -->
<!-- <artifactId>aria</artifactId> -->
<!-- <version>1.0</version> -->
<!-- <scope>system</scope> -->
<!-- <systemPath>C:\dev\workspaces\sebserver\externalResources\lib\com.eclipsesource.rap.aria_0.4.0.20210614-0915.jar</systemPath> -->
<!-- </dependency> -->
<!-- Misc --> <!-- Misc -->
<dependency> <dependency>

38
src/main/java/ch/ethz/seb/sebserver/gui/RAPConfiguration.java
View file

@ -10,7 +10,6 @@ package ch.ethz.seb.sebserver.gui;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.lang.reflect.Method;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -18,7 +17,6 @@ import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.application.AbstractEntryPoint; import org.eclipse.rap.rwt.application.AbstractEntryPoint;
import org.eclipse.rap.rwt.application.Application; import org.eclipse.rap.rwt.application.Application;
@ -35,7 +33,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils; import org.springframework.web.context.support.WebApplicationContextUtils;
import org.xeustechnologies.jcl.JarClassLoader;
//import com.eclipsesource.rap.aria.Aria; //import com.eclipsesource.rap.aria.Aria;
@ -127,7 +124,6 @@ public class RAPConfiguration implements ApplicationConfiguration {
public static final class RAPSpringEntryPointFactory implements EntryPointFactory { public static final class RAPSpringEntryPointFactory implements EntryPointFactory {
private final JarClassLoader jcl = new JarClassLoader();
private boolean initialized = false; private boolean initialized = false;
@Override @Override
@ -162,28 +158,6 @@ public class RAPConfiguration implements ApplicationConfiguration {
final WebApplicationContext webApplicationContext = getWebApplicationContext(httpSession); final WebApplicationContext webApplicationContext = getWebApplicationContext(httpSession);
initSpringBasedRAPServices(webApplicationContext); 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 final EntryPointService entryPointService = webApplicationContext
.getBean(EntryPointService.class); .getBean(EntryPointService.class);
@ -203,24 +177,12 @@ public class RAPConfiguration implements ApplicationConfiguration {
final DownloadService downloadService = webApplicationContext.getBean(DownloadService.class); final DownloadService downloadService = webApplicationContext.getBean(DownloadService.class);
manager.registerServiceHandler(DownloadService.DOWNLOAD_SERVICE_NAME, downloadService); manager.registerServiceHandler(DownloadService.DOWNLOAD_SERVICE_NAME, downloadService);
final String ariaPluginPath = ariaPluginPath(webApplicationContext);
if (StringUtils.isNotBlank(ariaPluginPath)) {
this.jcl.add(ariaPluginPath);
}
this.initialized = true; this.initialized = true;
} catch (final IllegalArgumentException iae) { } catch (final IllegalArgumentException iae) {
log.warn("Failed to register DownloadService on ServiceManager. Already registered: ", 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( private static boolean isAuthenticated(