You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/11/17 09:03:16 UTC
svn commit: r1035944 - in /directory/apacheds/trunk: ./ server-config-builder/ service-builder/ service-builder/src/main/java/org/apache/directory/server/config/ service/ service/src/main/java/org/apache/directory/server/

Author: pamarcelot
Date: Wed Nov 17 08:03:15 2010
New Revision: 1035944

URL: http://svn.apache.org/viewvc?rev=1035944&view=rev
Log:
Renamed module 'apacheds-server-config-builder'  to 'apacheds-service-builder'. Renamed class 'ConfigBuilder' to 'ServiceBuilder'.

Added:
    directory/apacheds/trunk/service-builder/
      - copied from r1035717, directory/apacheds/trunk/server-config-builder/
    directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
      - copied, changed from r1035717, directory/apacheds/trunk/server-config-builder/src/main/java/org/apache/directory/server/config/ConfigBuilder.java
Removed:
    directory/apacheds/trunk/server-config-builder/
    directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ConfigBuilder.java
Modified:
    directory/apacheds/trunk/pom.xml
    directory/apacheds/trunk/service-builder/pom.xml
    directory/apacheds/trunk/service/pom.xml
    directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java

Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=1035944&r1=1035943&r2=1035944&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Wed Nov 17 08:03:15 2010
@@ -128,7 +128,7 @@
     <!-- Tools are broken and need to be fixed -->
     <!--<module>server-tools</module>-->
     <module>server-config</module>
-    <module>server-config-builder</module>
+    <module>service-builder</module>
     <!--Uncomment to build all in one OSGi bundle-->
     <!--<module>osgi</module>-->
     <module>server-jndi</module>

Modified: directory/apacheds/trunk/service-builder/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service-builder/pom.xml?rev=1035944&r1=1035717&r2=1035944&view=diff
==============================================================================
--- directory/apacheds/trunk/service-builder/pom.xml (original)
+++ directory/apacheds/trunk/service-builder/pom.xml Wed Nov 17 08:03:15 2010
@@ -25,8 +25,8 @@
     <version>1.5.8-SNAPSHOT</version>
   </parent>
 
-  <artifactId>apacheds-server-config-builder</artifactId>
-  <name>ApacheDS Server Config Builder</name>
+  <artifactId>apacheds-service-builder</artifactId>
+  <name>ApacheDS Service Builder</name>
 
   <dependencies>
     <dependency>

Copied: directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java (from r1035717, directory/apacheds/trunk/server-config-builder/src/main/java/org/apache/directory/server/config/ConfigBuilder.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java?p2=directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java&p1=directory/apacheds/trunk/server-config-builder/src/main/java/org/apache/directory/server/config/ConfigBuilder.java&r1=1035717&r2=1035944&rev=1035944&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config-builder/src/main/java/org/apache/directory/server/config/ConfigBuilder.java (original)
+++ directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java Wed Nov 17 08:03:15 2010
@@ -101,10 +101,10 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ConfigBuilder
+public class ServiceBuilder
 {
     /** The logger for this class */
-    private static final Logger LOG = LoggerFactory.getLogger( ConfigBuilder.class );
+    private static final Logger LOG = LoggerFactory.getLogger( ServiceBuilder.class );
 
     /** LDIF file filter */
     private static FilenameFilter ldifFilter = new FilenameFilter()

Modified: directory/apacheds/trunk/service/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service/pom.xml?rev=1035944&r1=1035943&r2=1035944&view=diff
==============================================================================
--- directory/apacheds/trunk/service/pom.xml (original)
+++ directory/apacheds/trunk/service/pom.xml Wed Nov 17 08:03:15 2010
@@ -48,7 +48,7 @@
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-server-config-builder</artifactId>
+      <artifactId>apacheds-service-builder</artifactId>
       <version>${project.version}</version>
     </dependency>
 

Modified: directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java?rev=1035944&r1=1035943&r2=1035944&view=diff
==============================================================================
--- directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java (original)
+++ directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java Wed Nov 17 08:03:15 2010
@@ -29,7 +29,7 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.apache.directory.server.changepw.ChangePasswordServer;
-import org.apache.directory.server.config.ConfigBuilder;
+import org.apache.directory.server.config.ServiceBuilder;
 import org.apache.directory.server.config.ConfigPartitionReader;
 import org.apache.directory.server.config.LdifConfigExtractor;
 import org.apache.directory.server.config.beans.ChangePasswordServerBean;
@@ -267,7 +267,7 @@ public class ApacheDsService
         
         long startTime = System.currentTimeMillis();
 
-        DirectoryService directoryService = ConfigBuilder.createDirectoryService( directoryServiceBean, instanceLayout, schemaManager );
+        DirectoryService directoryService = ServiceBuilder.createDirectoryService( directoryServiceBean, instanceLayout, schemaManager );
 
         SchemaPartition schemaPartition = directoryService.getSchemaService().getSchemaPartition();
         schemaPartition.setWrappedPartition( schemaLdifPartition );
@@ -334,7 +334,7 @@ public class ApacheDsService
         LOG.info( "Starting the LDAP server" );
         long startTime = System.currentTimeMillis();
 
-        ldapServer = ConfigBuilder.createLdapServer( ldapServerBean, directoryService );
+        ldapServer = ServiceBuilder.createLdapServer( ldapServerBean, directoryService );
         
         if ( ldapServer == null )
         {
@@ -368,7 +368,7 @@ public class ApacheDsService
         LOG.info( "Starting the NTP server" );
         long startTime = System.currentTimeMillis();
 
-        ntpServer = ConfigBuilder.createNtpServer( ntpServerBean, directoryService);
+        ntpServer = ServiceBuilder.createNtpServer( ntpServerBean, directoryService);
         
         if ( ntpServer == null )
         {
@@ -430,7 +430,7 @@ public class ApacheDsService
         LOG.info( "Starting the Kerberos server" );
         long startTime = System.currentTimeMillis();
 
-        kdcServer = ConfigBuilder.createKdcServer( kdcServerBean, directoryService );
+        kdcServer = ServiceBuilder.createKdcServer( kdcServerBean, directoryService );
         
         if ( kdcServer == null )
         {
@@ -457,7 +457,7 @@ public class ApacheDsService
      */
     private void startChangePwd( ChangePasswordServerBean changePwdServerBean, DirectoryService directoryService ) throws Exception
     {
-        changePwdServer = ConfigBuilder.createChangePasswordServer( changePwdServerBean, directoryService );
+        changePwdServer = ServiceBuilder.createChangePasswordServer( changePwdServerBean, directoryService );
         
         if ( changePwdServer == null )
         {
@@ -490,7 +490,7 @@ public class ApacheDsService
      */
     private void startHttpServer( HttpServerBean httpServerBean, DirectoryService directoryService ) throws Exception
     {
-        httpServer = ConfigBuilder.createHttpServer( httpServerBean, directoryService);
+        httpServer = ServiceBuilder.createHttpServer( httpServerBean, directoryService);
         
         if ( httpServer == null )
         {