You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/02/23 12:22:53 UTC
[1/2] git commit: fixed error quite difficult to detect during the
refactorization process which was breaking tests
fixed error quite difficult to detect during the refactorization process which was breaking tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/95ece08a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/95ece08a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/95ece08a
Branch: refs/heads/master
Commit: 95ece08ac60abc0bdcdfa4e9761e24f4161304dc
Parents: bfd3021
Author: Sergio Fernández <wi...@apache.org>
Authored: Sat Feb 23 12:16:54 2013 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Sat Feb 23 12:16:54 2013 +0100
----------------------------------------------------------------------
.../marmotta/platform/core/test/base/JettyLMF.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/95ece08a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyLMF.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyLMF.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyLMF.java
index 8e8f59a..fa8bbd8 100644
--- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyLMF.java
+++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyLMF.java
@@ -77,10 +77,9 @@ public class JettyLMF extends AbstractLMF {
startupService.startupConfiguration(lmfHome.getAbsolutePath(),override,ctx.getServletContext());
// register the RestEasy CDI injector factory
- ctx.setAttribute("resteasy.injector.factory","kiwi.core.test.base.jetty.TestInjectorFactory");
+ ctx.setAttribute("resteasy.injector.factory", "org.apache.marmotta.platform.core.test.base.jetty.TestInjectorFactory");
-
- // register the LMF filters
+ // register filters
FilterHolder resourceFilter = new FilterHolder(CDIContext.getInstance(KiWiResourceFilter.class));
resourceFilter.setInitParameter("kiwi.resourceCaching", "true");
ctx.addFilter(resourceFilter,"/*", Handler.DEFAULT);
@@ -90,16 +89,15 @@ public class JettyLMF extends AbstractLMF {
// if a single web service is given, only register that webservice, otherwise startup the default configuration
//FilterHolder restEasyFilter = new FilterHolder(org.jboss.resteasy.plugins.server.servlet.FilterDispatcher.class);
ServletHolder restEasyFilter = new ServletHolder(org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher.class);
- restEasyFilter.setInitParameter("resteasy.injector.factory", "kiwi.core.test.base.jetty.TestInjectorFactory");
+ restEasyFilter.setInitParameter("resteasy.injector.factory", "org.apache.marmotta.platform.core.test.base.jetty.TestInjectorFactory");
if(webservice != null) {
TestApplication.setTestedWebServices(webservice);
-
//restEasyFilter.setInitParameter("resteasy.resources", webservice.getName());
- restEasyFilter.setInitParameter("javax.ws.rs.Application","kiwi.core.test.base.jetty.TestApplication");
+ restEasyFilter.setInitParameter("javax.ws.rs.Application", "org.apache.marmotta.platform.core.test.base.jetty.TestApplication");
} else {
- restEasyFilter.setInitParameter("javax.ws.rs.Application","kiwi.core.webservices.CoreApplication");
+ restEasyFilter.setInitParameter("javax.ws.rs.Application", "org.apache.marmotta.platform.core.webservices.CoreApplication");
}
//ctx.addFilter(restEasyFilter,"/*", Handler.ALL);