You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2017/05/18 03:49:52 UTC
[5/7] archiva-redback-core git commit: configure a resource base
configure a resource base
Signed-off-by: olivier lamy <ol...@apache.org>
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/bc3018ed
Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/bc3018ed
Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/bc3018ed
Branch: refs/heads/master
Commit: bc3018edbe00a0c3a0fc8068e86484226e5d7c48
Parents: 900e010
Author: olivier lamy <ol...@apache.org>
Authored: Thu May 11 21:31:00 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Thu May 11 21:31:00 2017 +1000
----------------------------------------------------------------------
.travis.yml | 4 ++--
.../archiva/redback/rest/services/AbstractRestServicesTest.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/bc3018ed/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index ea38ef3..5e9c272 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
language: java
jdk:
- - openjdk7
- - oraclejdk7
+ - openjdk8
+ - oraclejdk8
script: "mvn clean install"
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/bc3018ed/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 ac4c802..4421abe 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
@@ -28,6 +28,7 @@ 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.commons.lang.StringUtils;
+import org.apache.commons.lang.SystemUtils;
import org.apache.cxf.common.util.Base64Utility;
import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
import org.apache.cxf.jaxrs.client.WebClient;
@@ -105,8 +106,8 @@ public abstract class AbstractRestServicesTest
server.addConnector(serverConnector);
ServletHolder servletHolder = new ServletHolder( new CXFServlet() );
-
ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
+ context.setResourceBase( SystemUtils.JAVA_IO_TMPDIR );
context.setSessionHandler( new SessionHandler( ) );
context.addServlet( servletHolder, "/" + getRestServicesPath() + "/*" );
context.setInitParameter( "contextConfigLocation", getSpringConfigLocation() );