Merged trunk into the codec branch
git-svn-id: https://svn.apache.org/repos/asf/directory/apacheds/branches/apacheds-codec-merge@987493 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http-integration/pom.xml b/http-integration/pom.xml
index d8cf89e..1568f3e 100644
--- a/http-integration/pom.xml
+++ b/http-integration/pom.xml
@@ -35,6 +35,11 @@
<groupId>${project.groupId}</groupId>
<artifactId>apacheds-i18n</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-core-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -50,6 +55,7 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
</dependency>
+
</dependencies>
<build>
diff --git a/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java b/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java
index 22a9f0f..580d471 100644
--- a/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java
+++ b/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java
@@ -26,6 +26,7 @@
import java.util.List;
import java.util.Set;
+import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.i18n.I18n;
import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Handler;
@@ -62,6 +63,7 @@
private static final Logger LOG = LoggerFactory.getLogger( HttpServer.class );
+ private DirectoryService dirService;
public HttpServer()
{
@@ -73,7 +75,7 @@
*
* @throws Exception
*/
- public void start() throws Exception
+ public void start( DirectoryService dirService ) throws Exception
{
if ( confFile == null && ( webApps == null || webApps.isEmpty() ) )
@@ -82,6 +84,8 @@
return;
}
+ this.dirService = dirService;
+
XmlConfiguration jettyConf = null;
if ( confFile != null )
