directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r1043113 - in /directory/apacheds/branches/apacheds-kerberos-codec-2.0: ./ all/ service-builder/ service-builder/src/main/java/org/apache/directory/server/config/ service/src/main/java/org/apache/directory/server/
Date Tue, 07 Dec 2010 16:18:09 GMT
Author: kayyagari
Date: Tue Dec  7 16:18:09 2010
New Revision: 1043113

URL: http://svn.apache.org/viewvc?rev=1043113&view=rev
Log:
o commented the code and dependencies related changepassword module

Modified:
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/all/pom.xml
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/pom.xml
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/service-builder/pom.xml
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/service/src/main/java/org/apache/directory/server/ApacheDsService.java

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/all/pom.xml?rev=1043113&r1=1043112&r2=1043113&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/all/pom.xml (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/all/pom.xml Tue Dec  7 16:18:09
2010
@@ -93,11 +93,6 @@
     
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>apacheds-protocol-changepw</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-protocol-dhcp</artifactId>
     </dependency>
     

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/pom.xml?rev=1043113&r1=1043112&r2=1043113&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/pom.xml (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/pom.xml Tue Dec  7 16:18:09 2010
@@ -124,7 +124,7 @@
     <module>protocol-kerberos</module>
     <module>protocol-dhcp</module>
     <module>protocol-dns</module>
-    <module>protocol-changepw</module>
+    <!-- <module>protocol-changepw</module> -->
     <module>server-integ</module>
     <!-- Tools are broken and need to be fixed -->
     <!--<module>server-tools</module>-->
@@ -300,11 +300,11 @@
         <version>${project.version}</version>
       </dependency>
       
-      <dependency>
+     <!-- <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>apacheds-protocol-changepw</artifactId>
         <version>${project.version}</version>
-      </dependency>
+      </dependency> -->
       
       <dependency>
         <groupId>${project.groupId}</groupId>

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/service-builder/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/service-builder/pom.xml?rev=1043113&r1=1043112&r2=1043113&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/service-builder/pom.xml (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/service-builder/pom.xml Tue Dec
 7 16:18:09 2010
@@ -65,10 +65,10 @@
       <artifactId>apacheds-ldif-partition</artifactId>
     </dependency>
 
-    <dependency>
+    <!-- <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-protocol-changepw</artifactId>
-    </dependency>
+    </dependency> -->
 
     <dependency>
       <groupId>${project.groupId}</groupId>

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java?rev=1043113&r1=1043112&r2=1043113&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
Tue Dec  7 16:18:09 2010
@@ -32,9 +32,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.directory.server.changepw.ChangePasswordServer;
 import org.apache.directory.server.config.beans.ChangeLogBean;
-import org.apache.directory.server.config.beans.ChangePasswordServerBean;
 import org.apache.directory.server.config.beans.DirectoryServiceBean;
 import org.apache.directory.server.config.beans.ExtendedOpHandlerBean;
 import org.apache.directory.server.config.beans.HttpServerBean;
@@ -703,7 +701,7 @@ public class ServiceBuilder
      * @param ldapServerBean The ChangePasswordServerBean containing the ChangePasswordServer
configuration
      * @return Instance of ChangePasswordServer
      * @throws LdapException
-     */
+     *
     public static ChangePasswordServer createChangePasswordServer( ChangePasswordServerBean
changePasswordServerBean, DirectoryService directoryService ) throws LdapException
     {
         // Fist, do nothing if the LdapServer is disabled
@@ -757,7 +755,7 @@ public class ServiceBuilder
         
         return changePasswordServer;
     }
-    
+    */
     
     /**
      * Instantiates a LdapServer based on the configuration present in the partition 

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/service/src/main/java/org/apache/directory/server/ApacheDsService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/service/src/main/java/org/apache/directory/server/ApacheDsService.java?rev=1043113&r1=1043112&r2=1043113&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/service/src/main/java/org/apache/directory/server/ApacheDsService.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/service/src/main/java/org/apache/directory/server/ApacheDsService.java
Tue Dec  7 16:18:09 2010
@@ -28,11 +28,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.directory.server.changepw.ChangePasswordServer;
-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;
+import org.apache.directory.server.config.ServiceBuilder;
 import org.apache.directory.server.config.beans.ConfigBean;
 import org.apache.directory.server.config.beans.DirectoryServiceBean;
 import org.apache.directory.server.config.beans.HttpServerBean;
@@ -101,8 +99,8 @@ public class ApacheDsService
     /** The DNS server instance */
     //    private DnsServer dnsServer;
 
-    /** The Change Password server instance */
-    private ChangePasswordServer changePwdServer;
+    /** The Change Password server instance *
+    private ChangePasswordServer changePwdServer;/
 
     /** The Kerberos server instance */
     private KdcServer kdcServer;
@@ -177,7 +175,7 @@ public class ApacheDsService
         // initDhcp( configBean );
 
         // start the ChangePwd server (Not ready yet)
-        startChangePwd( directoryServiceBean.getChangePasswordServerBean(), directoryService
);
+        //startChangePwd( directoryServiceBean.getChangePasswordServerBean(), directoryService
);
 
         // start the Kerberos server
         startKerberos( directoryServiceBean.getKdcServerBean(), directoryService );
@@ -454,7 +452,7 @@ public class ApacheDsService
 
     /**
      * start the Change Password server
-     */
+     *
     private void startChangePwd( ChangePasswordServerBean changePwdServerBean, DirectoryService
directoryService ) throws Exception
     {
         changePwdServer = ServiceBuilder.createChangePasswordServer( changePwdServerBean,
directoryService );
@@ -483,6 +481,7 @@ public class ApacheDsService
                 + "" );
         }
     }
+    */
 
 
     /**
@@ -536,10 +535,10 @@ public class ApacheDsService
             kdcServer.stop();
         }
 
-        if ( changePwdServer != null )
+        /*if ( changePwdServer != null )
         {
             changePwdServer.stop();
-        }
+        }*/
 
         if ( ntpServer != null )
         {



Mime
View raw message