SSDM-1960: remove jetty 6 reference from ui-test/js-test

SVN: 34196

js-test/source/java/ch/systemsx/cisd/openbis/test/server/TestApplicationServer.java

@@ -22,10 +22,10 @@ import java.io.InputStreamReader;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.io.PrintStream;
-import java.util.Map;
 
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.AllowSymLinkAliasChecker;
+import org.eclipse.jetty.webapp.WebAppContext;
 
 /**
  * @author anttil
@@ -64,9 +64,7 @@ public class TestApplicationServer
                     	context.setWar(war.getAbsolutePath());
                     	context.setExtractWAR(true);
                     	context.setTempDirectory(new File(System.getProperty("jetty.home")+"/webapps"));
-						Map initParams = context.getInitParams();
-                    	initParams.put("org.mortbay.jetty.servlet.Default.aliases", "true");
-                    	context.setInitParams(initParams);
+                        context.addAliasCheck(new AllowSymLinkAliasChecker());
                     } else {
 	                    context.setDescriptor(getWebXmlPath());
 	                    context.setResourceBase(getRootPath());

ui-test/build.gradle

@@ -31,8 +31,7 @@ configurations.create('externalDss')
 
 dependencies {
 	testCompile project(':datastore_server'),
-			'selenium:selenium-java:+',
-			'mortbay:jetty:+'
+			'selenium:selenium-java:+'
 			
 	testRuntimeFirst 'javax:servlet-api:+', 'reflections:reflections:+'
 

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/dsl/StartApplicationServer.java

@@ -23,8 +23,9 @@ import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.io.PrintStream;
 
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.AllowSymLinkAliasChecker;
+import org.eclipse.jetty.webapp.WebAppContext;
 
 /**
  * @author anttil
@@ -47,8 +48,8 @@ public class StartApplicationServer
                                 "../openbis/targets/www", "-logLevel", "INFO" });
 
                     */
-                    Server server = new Server(10000);
-
+                	Server server = new Server(10000);
+                	
                     WebAppContext context = new WebAppContext();
                     
                     if (new File("targets/gradle/openbis-war/openbis.war").exists() == false) {
@@ -60,7 +61,8 @@ public class StartApplicationServer
                     
                     context.setContextPath("/");
                     context.setParentLoaderPriority(true);
-
+                    context.addAliasCheck(new AllowSymLinkAliasChecker());
+                    
                     server.setHandler(context);
                     try
                     {