svn commit: r987493 - in /directory/apacheds/branches/apacheds-codec-merge/http-integration: ./ pom.xml src/main/java/org/apache/directory/server/integration/http/HttpServer.java

[el...@apache.org]

Author: elecharny
Date: Fri Aug 20 13:03:00 2010
New Revision: 987493

URL: http://svn.apache.org/viewvc?rev=987493&view=rev
Log:
Merged trunk into the codec branch

Modified:
    directory/apacheds/branches/apacheds-codec-merge/http-integration/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/http-integration/pom.xml
    directory/apacheds/branches/apacheds-codec-merge/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java

Propchange: directory/apacheds/branches/apacheds-codec-merge/http-integration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:03:00 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/http-integration:980138-980935
-/directory/apacheds/trunk/http-integration:980025-980137,982368-982970
+/directory/apacheds/trunk/http-integration:980025-980137,982368-987479

Modified: directory/apacheds/branches/apacheds-codec-merge/http-integration/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/http-integration/pom.xml?rev=987493&r1=987492&r2=987493&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/http-integration/pom.xml (original)
+++ directory/apacheds/branches/apacheds-codec-merge/http-integration/pom.xml Fri Aug 20 13:03:00 2010
@@ -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>

Modified: directory/apacheds/branches/apacheds-codec-merge/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java?rev=987493&r1=987492&r2=987493&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java Fri Aug 20 13:03:00 2010
@@ -26,6 +26,7 @@ import java.util.ArrayList;
 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 @@ public class HttpServer
 
     private static final Logger LOG = LoggerFactory.getLogger( HttpServer.class );
 
+    private DirectoryService dirService;
 
     public HttpServer()
     {
@@ -73,7 +75,7 @@ public class HttpServer
      * 
      * @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 @@ public class HttpServer
             return;
         }
 
+        this.dirService = dirService;
+        
         XmlConfiguration jettyConf = null;
 
         if ( confFile != null )