[Amdatu-commits] SVN r763 - branches/amdatu-dispatcher/integration-tests/src/test/java/org/amdatu/test/integration/tests

[subvers...@amdatu.org]

Author: bdekruijff at gmail.com
Date: Thu Feb  3 16:36:11 2011
New Revision: 763

Log:
AMDATU-282 fixing the httpservice itest (we hope)

Modified:
   
branches/amdatu-dispatcher/integration-tests/src/test/java/org/amdatu/test/integration/tests/HttpServiceTest.java

Modified: 
branches/amdatu-dispatcher/integration-tests/src/test/java/org/amdatu/test/integration/tests/HttpServiceTest.java
==============================================================================
--- 
branches/amdatu-dispatcher/integration-tests/src/test/java/org/amdatu/test/integration/tests/HttpServiceTest.java
   (original)
+++ 
branches/amdatu-dispatcher/integration-tests/src/test/java/org/amdatu/test/integration/tests/HttpServiceTest.java
   Thu Feb  3 16:36:11 2011
@@ -37,6 +37,7 @@
 
 import org.amdatu.test.integration.base.ConfigProvider;
 import org.amdatu.test.integration.base.IntegrationTestBase;
+import org.amdatu.web.dispatcher.DispatcherService;
 import org.amdatu.web.httpcontext.HttpContextServiceFactory;
 import org.amdatu.web.httpcontext.ResourceProvider;
 import org.apache.commons.httpclient.Header;
@@ -54,7 +55,6 @@
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.osgi.framework.Constants;
 import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.service.http.HttpService;
 import org.osgi.service.log.LogService;
 
 @RunWith(JUnit4TestRunner.class)
@@ -93,6 +93,10 @@
             ops4jBaseLang(),
             commonsLogging(),
             commonsCodec(),
+            amdatuTenantService(),
+            amdatuDispatcher(),
+            amdatuHostnameTenantResolver(),
+            amdatuParameterResolver(),
             amdatuHttpContext(),
             amdatuJspSupport());
     }
@@ -127,7 +131,7 @@
         
.add(manager.createServiceDependency().setService(LogService.class).setRequired(true))
         
.add(manager.createServiceDependency().setService(ConfigurationAdmin.class))
         
.add(manager.createServiceDependency().setService(HttpContextServiceFactory.class).setRequired(true))
-        
.add(manager.createServiceDependency().setService(HttpService.class).setRequired(true));
+        
.add(manager.createServiceDependency().setService(DispatcherService.class).setRequired(true));
 
         return new Component[] { filterComponent, servletComponent, 
testComponent };
     }
@@ -136,7 +140,6 @@
         m_configAdmin = getService(ConfigurationAdmin.class);
         m_logService = getService(LogService.class);
 
-        // Add cassandra and templates configs
         ConfigProvider configProvider = new ConfigProvider();
         configProvider.addFelixHttpServiceConfig(m_configAdmin);
         m_logService.log(LogService.LOG_DEBUG, "HttpService config set to " + 
ConfigProvider.HOSTNAME + ":" + ConfigProvider.PORTNR);