Repository: archiva-redback-core Updated Branches: refs/heads/feature/jetty_9.3 [created] 0b9f6c8d4
use jetty 9.3.19 for testing -> really faster to start Signed-off-by: olivier lamy <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/commit/0b9f6c8d Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/0b9f6c8d Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/0b9f6c8d Branch: refs/heads/feature/jetty_9.3 Commit: 0b9f6c8d45a5426dac29ff9c832b057b8e0e7ea3 Parents: 4e4e342 Author: olivier lamy <[email protected]> Authored: Thu May 11 16:13:39 2017 +1000 Committer: olivier lamy <[email protected]> Committed: Thu May 11 16:13:39 2017 +1000 ---------------------------------------------------------------------- pom.xml | 2 +- .../redback-rest/redback-rest-services/pom.xml | 33 +++--------- .../rest/services/AbstractRestServicesTest.java | 54 ++++++++++++-------- 3 files changed, 41 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/0b9f6c8d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b394865..de751eb 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ <properties> <springVersion>4.2.1.RELEASE</springVersion> <slf4jVersion>1.7.12</slf4jVersion> - <log4j2Version>2.3</log4j2Version> + <log4j2Version>2.8.2</log4j2Version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <gpg.useagent>true</gpg.useagent> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/0b9f6c8d/redback-integrations/redback-rest/redback-rest-services/pom.xml ---------------------------------------------------------------------- diff --git a/redback-integrations/redback-rest/redback-rest-services/pom.xml b/redback-integrations/redback-rest/redback-rest-services/pom.xml index 2de4c00..bfd1770 100644 --- a/redback-integrations/redback-rest/redback-rest-services/pom.xml +++ b/redback-integrations/redback-rest/redback-rest-services/pom.xml @@ -33,6 +33,7 @@ <properties> <tomcatVersion>7.0.57</tomcatVersion> + <jetty.version>9.3.19.v20170502</jetty.version> <rest.test.timeout>1000000</rest.test.timeout> </properties> @@ -138,34 +139,14 @@ </dependency> <dependency> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-core</artifactId> - <version>${tomcatVersion}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-juli</artifactId> - <version>${tomcatVersion}</version> - <scope>test</scope> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${jetty.version}</version> </dependency> <dependency> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-logging-juli</artifactId> - <version>${tomcatVersion}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-servlet-api</artifactId> - <version>${tomcatVersion}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-jsp-api</artifactId> - <version>${tomcatVersion}</version> - <scope>provided</scope> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>${jetty.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/0b9f6c8d/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java ---------------------------------------------------------------------- diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java index 4b565a2..a6c34ef 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java @@ -27,14 +27,18 @@ import org.apache.archiva.redback.rest.api.services.LdapGroupMappingService; import org.apache.archiva.redback.rest.api.services.LoginService; import org.apache.archiva.redback.rest.api.services.RoleManagementService; import org.apache.archiva.redback.rest.api.services.UserService; -import org.apache.catalina.Context; -import org.apache.catalina.deploy.ApplicationParameter; -import org.apache.catalina.startup.Tomcat; import org.apache.commons.lang.StringUtils; import org.apache.cxf.common.util.Base64Utility; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.transport.servlet.CXFServlet; +import org.eclipse.jetty.server.HttpConnectionFactory; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.server.session.SessionHandler; +import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.servlet.ServletHandler; +import org.eclipse.jetty.servlet.ServletHolder; import org.junit.After; import org.junit.Before; import org.junit.runner.RunWith; @@ -56,8 +60,8 @@ public abstract class AbstractRestServicesTest { protected Logger log = LoggerFactory.getLogger( getClass() ); - private Tomcat tomcat; - + Server server; + ServerConnector serverConnector; public int port; public String authorizationHeader = getAdminAuthzHeader(); @@ -98,17 +102,10 @@ public abstract class AbstractRestServicesTest public void startServer() throws Exception { - - SLF4JBridgeHandler.removeHandlersForRootLogger(); - - SLF4JBridgeHandler.install(); - - tomcat = new Tomcat(); - tomcat.setBaseDir( System.getProperty( "java.io.tmpdir" ) ); - tomcat.setPort( 0 ); - - Context context = tomcat.addContext( "", System.getProperty( "java.io.tmpdir" ) ); - + server = new Server(); + serverConnector = new ServerConnector( server, new HttpConnectionFactory()); + server.addConnector(serverConnector); + /* ApplicationParameter applicationParameter = new ApplicationParameter(); applicationParameter.setName( "contextConfigLocation" ); applicationParameter.setValue( getSpringConfigLocation() ); @@ -118,10 +115,25 @@ public abstract class AbstractRestServicesTest Tomcat.addServlet( context, "cxf", new CXFServlet() ); context.addServletMapping( "/" + getRestServicesPath() + "/*", "cxf" ); + */ + ServletHolder servletHolder = new ServletHolder( new CXFServlet() ); + + ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS); + context.setSessionHandler( new SessionHandler( ) ); + context.setContextPath( "/" ); + context.addServlet( servletHolder, "/" + getRestServicesPath() + "/*" ); + context.setInitParameter( "contextConfigLocation", getSpringConfigLocation() ); + context.addEventListener(new ContextLoaderListener()); - tomcat.start(); + server.setHandler( context ); + server.start(); - this.port = tomcat.getConnector().getLocalPort(); + if (log.isDebugEnabled()) + { + log.debug( "jetty dump: {}", server.dump() ); + } + + this.port = serverConnector.getLocalPort(); log.info( "start server on port {}", this.port ); @@ -143,16 +155,16 @@ public abstract class AbstractRestServicesTest { return JAXRSClientFactory.create( "http://localhost:"; + port + "/" + getRestServicesPath() + "/fakeCreateAdminService/", - FakeCreateAdminService.class, Collections.singletonList( new com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider() ) ); + FakeCreateAdminService.class, Collections.singletonList( new JacksonJaxbJsonProvider() ) ); } @After public void stopServer() throws Exception { - if ( this.tomcat != null ) + if ( this.server != null ) { - this.tomcat.stop(); + this.server.stop(); } }
