committed this pom accidentally, fixed it. thanks Pierre-Anaud On Thu, Aug 19, 2010 at 6:18 PM, Pierre-Arnaud Marcelot <[email protected]> wrote: > Hi Kiran, > > It looks like the 'http-directory-bridge' module has not been committed. > > Could you please commit it or is this part of some testing and it can be > removed? > > Thanks, > Pierre-Arnaud > > On 18 août 2010, at 00:19, [email protected] wrote: > >> Author: kayyagari >> Date: Tue Aug 17 22:19:29 2010 >> New Revision: 986508 >> >> URL: http://svn.apache.org/viewvc?rev=986508&view=rev >> Log: >> passing directory service instance to the start method of http server >> (useful for future work based on http as a transport) >> >> Modified: >> directory/apacheds/trunk/http-integration/pom.xml >> >> directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java >> >> directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java >> >> Modified: directory/apacheds/trunk/http-integration/pom.xml >> URL: >> http://svn.apache.org/viewvc/directory/apacheds/trunk/http-integration/pom.xml?rev=986508&r1=986507&r2=986508&view=diff >> ============================================================================== >> --- directory/apacheds/trunk/http-integration/pom.xml (original) >> +++ directory/apacheds/trunk/http-integration/pom.xml Tue Aug 17 22:19:29 >> 2010 >> @@ -35,6 +35,23 @@ >> <groupId>${project.groupId}</groupId> >> <artifactId>apacheds-i18n</artifactId> >> </dependency> >> + >> + <dependency> >> + <groupId>${project.groupId}</groupId> >> + <artifactId>apacheds-core-api</artifactId> >> + </dependency> >> + >> + <dependency> >> + <groupId>${project.groupId}</groupId> >> + <artifactId>http-directory-bridge</artifactId> >> + <version>${project.version}</version> >> + </dependency> >> + >> + <dependency> >> + <groupId>org.apache.directory.client.ldap</groupId> >> + <artifactId>ldap-client-api</artifactId> >> + <version>0.2-SNAPSHOT</version> >> + </dependency> >> >> <dependency> >> <groupId>org.mortbay.jetty</groupId> >> @@ -50,6 +67,7 @@ >> <groupId>org.mortbay.jetty</groupId> >> <artifactId>jetty-util</artifactId> >> </dependency> >> + >> </dependencies> >> >> <build> >> >> Modified: >> directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java >> URL: >> http://svn.apache.org/viewvc/directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java?rev=986508&r1=986507&r2=986508&view=diff >> ============================================================================== >> --- >> directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java >> (original) >> +++ >> directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java >> Tue Aug 17 22:19:29 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 ) >> >> Modified: >> directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java >> URL: >> http://svn.apache.org/viewvc/directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java?rev=986508&r1=986507&r2=986508&view=diff >> ============================================================================== >> --- >> directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java >> (original) >> +++ >> directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java >> Tue Aug 17 22:19:29 2010 >> @@ -462,7 +462,7 @@ public class Service implements DaemonAp >> >> if ( httpServer != null ) >> { >> - httpServer.start(); >> + httpServer.start( getDirectoryService() ); >> } >> } >> >> >> > >
-- Kiran Ayyagari
