directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r379013 [42/45] - in /directory/trunks/apacheds: ./ core-plugin/ core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/ core-plugin/src/test/java/org/apache/directory/server/core/tools/schema/ core-shared/ core-shared/src/...
Date Mon, 20 Feb 2006 03:58:21 GMT
Modified: directory/trunks/apacheds/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java (original)
+++ directory/trunks/apacheds/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java Sun Feb 19 19:57:02 2006
@@ -18,6 +18,7 @@
  */
 package org.apache.directory.server.configuration;
 
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
@@ -47,10 +48,8 @@
     private ServiceRegistry minaServiceRegistry = new SimpleServiceRegistry();
     private int ldapPort = 389;
     private int ldapsPort = 636;
-    private File ldapsCertificateFile = new File(
-            this.getWorkingDirectory().getPath() + File.separator +
-            "certificates" + File.separator +
-            "server.cert" );
+    private File ldapsCertificateFile = new File( this.getWorkingDirectory().getPath() + File.separator
+        + "certificates" + File.separator + "server.cert" );
     private String ldapsCertificatePassword = "changeit";
     private boolean enableLdaps = false;
     private boolean enableKerberos = false;
@@ -60,10 +59,12 @@
     private File ldifDirectory = null;
     private final List ldifFilters = new ArrayList();
 
+
     protected ServerStartupConfiguration()
     {
     }
 
+
     /**
      * Returns <tt>true</tt> if networking (LDAP, LDAPS, and Kerberos) is enabled.
      */
@@ -72,6 +73,7 @@
         return enableNetworking;
     }
 
+
     /**
      * Sets whether to enable networking (LDAP, LDAPS, and Kerberos) or not.
      */
@@ -80,6 +82,7 @@
         this.enableNetworking = enableNetworking;
     }
 
+
     /**
      * Returns <tt>true</tt> if Kerberos support is enabled.
      */
@@ -88,6 +91,7 @@
         return enableKerberos;
     }
 
+
     /**
      * Returns <tt>true</tt> if Change Password support is enabled.
      */
@@ -96,6 +100,7 @@
         return enableChangePassword;
     }
 
+
     /**
      * Returns <tt>true</tt> if Kerberos support is enabled.
      */
@@ -104,6 +109,7 @@
         return enableNtp;
     }
 
+
     /**
      * Sets whether to enable Kerberos support or not.
      */
@@ -112,6 +118,7 @@
         this.enableKerberos = enableKerberos;
     }
 
+
     /**
      * Sets whether to enable Change Password support or not.
      */
@@ -120,6 +127,7 @@
         this.enableChangePassword = enableChangePassword;
     }
 
+
     /**
      * Sets whether to enable Ntp support or not.
      */
@@ -128,6 +136,7 @@
         this.enableNtp = enableNtp;
     }
 
+
     /**
      * Returns LDAP TCP/IP port number to listen to.
      */
@@ -136,6 +145,7 @@
         return ldapPort;
     }
 
+
     /**
      * Sets LDAP TCP/IP port number to listen to.
      */
@@ -145,6 +155,7 @@
         this.ldapPort = ldapPort;
     }
 
+
     /**
      * Returns LDAPS TCP/IP port number to listen to.
      */
@@ -153,6 +164,7 @@
         return ldapsPort;
     }
 
+
     /**
      * Sets LDAPS TCP/IP port number to listen to.
      */
@@ -161,7 +173,8 @@
         ConfigurationUtil.validatePortNumber( ldapsPort );
         this.ldapsPort = ldapsPort;
     }
-    
+
+
     /**
      * Returns <tt>true</tt> if LDAPS is enabled.
      */
@@ -170,6 +183,7 @@
         return enableLdaps;
     }
 
+
     /**
      * Sets if LDAPS is enabled or not.
      */
@@ -177,7 +191,8 @@
     {
         this.enableLdaps = enableLdaps;
     }
-    
+
+
     /**
      * Returns the path of the X509 (or JKS) certificate file for LDAPS.
      * The default value is <tt>"&lt;WORKDIR&gt;/certificates/server.cert"</tt>. 
@@ -187,20 +202,22 @@
     {
         return ldapsCertificateFile;
     }
-    
+
+
     /**
      * Sets the path of the SunX509 certificate file (either PKCS12 or JKS format)
      * for LDAPS.
      */
     protected void setLdapsCertificateFile( File ldapsCertificateFile )
     {
-        if( ldapsCertificateFile == null )
+        if ( ldapsCertificateFile == null )
         {
             throw new ConfigurationException( "LdapsCertificateFile cannot be null." );
         }
         this.ldapsCertificateFile = ldapsCertificateFile;
     }
-    
+
+
     /**
      * Returns the password which is used to load the the SunX509 certificate file
      * (either PKCS12 or JKS format).
@@ -212,19 +229,21 @@
     {
         return ldapsCertificatePassword;
     }
-    
+
+
     /**
      * Sets the password which is used to load the LDAPS certificate file.
      */
     protected void setLdapsCertificatePassword( String ldapsCertificatePassword )
     {
-        if( ldapsCertificatePassword == null )
+        if ( ldapsCertificatePassword == null )
         {
             throw new ConfigurationException( "LdapsCertificatePassword cannot be null." );
         }
         this.ldapsCertificatePassword = ldapsCertificatePassword;
     }
 
+
     /**
      * Returns <a href="http://directory.apache.org/subprojects/network/">MINA</a>
      * {@link ServiceRegistry} that will be used by ApacheDS.
@@ -234,32 +253,35 @@
         return minaServiceRegistry;
     }
 
+
     /**
      * Sets <a href="http://directory.apache.org/subprojects/network/">MINA</a>
      * {@link ServiceRegistry} that will be used by ApacheDS.
      */
     protected void setMinaServiceRegistry( ServiceRegistry minaServiceRegistry )
     {
-        if( minaServiceRegistry == null )
+        if ( minaServiceRegistry == null )
         {
             throw new ConfigurationException( "MinaServiceRegistry cannot be null" );
         }
         this.minaServiceRegistry = minaServiceRegistry;
     }
 
+
     public Collection getExtendedOperationHandlers()
     {
         return new ArrayList( extendedOperationHandlers );
     }
 
+
     protected void setExtendedOperationHandlers( Collection handlers )
     {
-        for( Iterator i = handlers.iterator(); i.hasNext(); )
+        for ( Iterator i = handlers.iterator(); i.hasNext(); )
         {
-            if( !( i.next() instanceof ExtendedOperationHandler ) )
+            if ( !( i.next() instanceof ExtendedOperationHandler ) )
             {
                 throw new IllegalArgumentException(
-                        "The specified handler collection contains an element which is not an ExtendedOperationHandler." );
+                    "The specified handler collection contains an element which is not an ExtendedOperationHandler." );
             }
         }
 
@@ -267,29 +289,33 @@
         this.extendedOperationHandlers.addAll( handlers );
     }
 
+
     public File getLdifDirectory()
     {
         return this.ldifDirectory;
     }
 
+
     protected void setLdifDirectory( File ldifDirectory )
     {
         this.ldifDirectory = ldifDirectory;
     }
 
+
     public List getLdifFilters()
     {
         return new ArrayList( ldifFilters );
     }
 
+
     protected void setLdifFilters( List filters )
     {
-        for( int ii = 0; ii < filters.size(); ii++ )
+        for ( int ii = 0; ii < filters.size(); ii++ )
         {
-            if( !( filters.get( ii ) instanceof LdifLoadFilter ) )
+            if ( !( filters.get( ii ) instanceof LdifLoadFilter ) )
             {
                 throw new IllegalArgumentException(
-                        "The specified filter collection contains an element which is not an LdifLoadFilter." );
+                    "The specified filter collection contains an element which is not an LdifLoadFilter." );
             }
         }
 

Propchange: directory/trunks/apacheds/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java (original)
+++ directory/trunks/apacheds/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java Sun Feb 19 19:57:02 2006
@@ -42,6 +42,8 @@
 import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
 import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
 import org.apache.directory.server.kerberos.kdc.KerberosServer;
+import org.apache.directory.server.kerberos.shared.store.JndiPrincipalStoreImpl;
+import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
 import org.apache.directory.server.ldap.ExtendedOperationHandler;
 import org.apache.directory.server.ldap.LdapProtocolProvider;
 import org.apache.directory.server.ntp.NtpConfiguration;
@@ -51,8 +53,6 @@
 import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
 import org.apache.directory.shared.ldap.exception.LdapNamingException;
 import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect;
-import org.apache.kerberos.store.JndiPrincipalStoreImpl;
-import org.apache.kerberos.store.PrincipalStore;
 import org.apache.mina.common.DefaultIoFilterChainBuilder;
 import org.apache.mina.common.IoAcceptor;
 import org.apache.mina.common.IoFilterChainBuilder;
@@ -92,8 +92,8 @@
     {
         this.directoryService = service;
     }
-    
-    
+
+
     protected ServiceRegistry getMinaRegistry()
     {
         return minaRegistry;
@@ -151,8 +151,8 @@
 
     public void afterStartup( DirectoryService service ) throws NamingException
     {
-        ServerStartupConfiguration cfg =
-            ( ServerStartupConfiguration ) service.getConfiguration().getStartupConfiguration();
+        ServerStartupConfiguration cfg = ( ServerStartupConfiguration ) service.getConfiguration()
+            .getStartupConfiguration();
         Hashtable env = service.getConfiguration().getEnvironment();
 
         loadLdifs( service );
@@ -162,9 +162,9 @@
             setupRegistry( cfg );
             startLDAP( cfg, env );
             startLDAPS( cfg, env );
-            startKerberos(cfg, env);
-            startChangePassword(cfg, env);
-            startNTP(cfg, env);
+            startKerberos( cfg, env );
+            startChangePassword( cfg, env );
+            startNTP( cfg, env );
         }
     }
 
@@ -179,14 +179,18 @@
             root.createSubcontext( LDIF_FILES_DN, entry );
             log.info( "Creating " + LDIF_FILES_DN );
         }
-        catch( NamingException e ) { log.info( LDIF_FILES_DN + " exists" );}
+        catch ( NamingException e )
+        {
+            log.info( LDIF_FILES_DN + " exists" );
+        }
     }
 
-
     private final static String WINDOWSFILE_ATTR = "windowsFilePath";
     private final static String UNIXFILE_ATTR = "unixFilePath";
     private final static String WINDOWSFILE_OC = "windowsFile";
     private final static String UNIXFILE_OC = "unixFile";
+
+
     private void addFileEntry( DirContext root, File ldif ) throws NamingException
     {
         String rdnAttr = File.separatorChar == '\\' ? WINDOWSFILE_ATTR : UNIXFILE_ATTR;
@@ -217,7 +221,8 @@
 
         try
         {
-            return root.getAttributes( buf.toString(), new String[]{ "createTimestamp" });
+            return root.getAttributes( buf.toString(), new String[]
+                { "createTimestamp" } );
         }
         catch ( NamingException e )
         {
@@ -233,20 +238,20 @@
         {
             canonical = file.getCanonicalPath();
         }
-        catch (IOException e)
+        catch ( IOException e )
         {
             log.error( "could not get canonical path", e );
             return null;
         }
-        
+
         return StringUtils.replace( canonical, "\\", "\\\\" );
     }
 
 
     private void loadLdifs( DirectoryService service ) throws NamingException
     {
-        ServerStartupConfiguration cfg =
-            ( ServerStartupConfiguration ) service.getConfiguration().getStartupConfiguration();
+        ServerStartupConfiguration cfg = ( ServerStartupConfiguration ) service.getConfiguration()
+            .getStartupConfiguration();
 
         // log and bail if property not set
         if ( cfg.getLdifDirectory() == null )
@@ -259,7 +264,7 @@
         if ( !cfg.getLdifDirectory().exists() )
         {
             log.warn( "LDIF load directory '" + getCanonical( cfg.getLdifDirectory() )
-                    + "' does not exist.  No LDIF files will be loaded.");
+                + "' does not exist.  No LDIF files will be loaded." );
             return;
         }
 
@@ -275,13 +280,13 @@
         if ( !cfg.getLdifDirectory().isDirectory() )
         {
             log.info( "LDIF load directory '" + getCanonical( cfg.getLdifDirectory() )
-                    + "' is a file.  Will attempt to load as LDIF." );
+                + "' is a file.  Will attempt to load as LDIF." );
             Attributes fileEntry = getLdifFileEntry( root, cfg.getLdifDirectory() );
             if ( fileEntry != null )
             {
                 String time = ( String ) fileEntry.get( "createTimestamp" ).get();
                 log.info( "Load of LDIF file '" + getCanonical( cfg.getLdifDirectory() )
-                        + "' skipped.  It has already been loaded on " + time + "." );
+                    + "' skipped.  It has already been loaded on " + time + "." );
                 return;
             }
             LdifFileLoader loader = new LdifFileLoader( root, cfg.getLdifDirectory(), cfg.getLdifFilters() );
@@ -299,13 +304,13 @@
                 boolean isLdif = pathname.getName().toLowerCase().endsWith( ".ldif" );
                 return pathname.isFile() && pathname.canRead() && isLdif;
             }
-        });
+        } );
 
         // log and bail if we could not find any LDIF files
         if ( ldifFiles == null || ldifFiles.length == 0 )
         {
             log.warn( "LDIF load directory '" + getCanonical( cfg.getLdifDirectory() )
-                    + "' does not contain any LDIF files.  No LDIF files will be loaded.");
+                + "' does not contain any LDIF files.  No LDIF files will be loaded." );
             return;
         }
 
@@ -317,7 +322,7 @@
             {
                 String time = ( String ) fileEntry.get( "createTimestamp" ).get();
                 log.info( "Load of LDIF file '" + getCanonical( ldifFiles[ii] )
-                        + "' skipped.  It has already been loaded on " + time + "." );
+                    + "' skipped.  It has already been loaded on " + time + "." );
                 continue;
             }
             LdifFileLoader loader = new LdifFileLoader( root, ldifFiles[ii], cfg.getLdifFilters() );
@@ -349,15 +354,16 @@
     {
         // Skip if disabled
         int port = cfg.getLdapPort();
-        if( port < 0 )
+        if ( port < 0 )
         {
             return;
         }
-        
+
         Service service = new Service( "LDAP", TransportType.SOCKET, new InetSocketAddress( port ) );
         startLDAP0( cfg, env, service, new DefaultIoFilterChainBuilder() );
     }
 
+
     /**
      * Starts up the LDAPS protocol provider to service LDAPS requests
      *
@@ -366,7 +372,7 @@
     private void startLDAPS( ServerStartupConfiguration cfg, Hashtable env ) throws NamingException
     {
         // Skip if disabled
-        if( !cfg.isEnableLdaps() )
+        if ( !cfg.isEnableLdaps() )
         {
             return;
         }
@@ -375,42 +381,40 @@
         IoFilterChainBuilder chain;
         try
         {
-            chain = ( IoFilterChainBuilder ) Class.forName(
-                    "org.apache.directory.server.ssl.LdapsInitializer",
-                    true,
-                    ServerContextFactory.class.getClassLoader() ).getMethod(
-                            "init", new Class[] { ServerStartupConfiguration.class } ).invoke(
-                                    null, new Object[] { cfg } );
+            chain = ( IoFilterChainBuilder ) Class.forName( "org.apache.directory.server.ssl.LdapsInitializer", true,
+                ServerContextFactory.class.getClassLoader() ).getMethod( "init", new Class[]
+                { ServerStartupConfiguration.class } ).invoke( null, new Object[]
+                { cfg } );
         }
-        catch( InvocationTargetException e )
+        catch ( InvocationTargetException e )
         {
-            if( e.getCause() instanceof NamingException )
+            if ( e.getCause() instanceof NamingException )
             {
                 throw ( NamingException ) e.getCause();
             }
             else
             {
-                throw ( NamingException ) new NamingException(
-                        "Failed to load LDAPS initializer." ).initCause( e.getCause() );
+                throw ( NamingException ) new NamingException( "Failed to load LDAPS initializer." ).initCause( e
+                    .getCause() );
             }
         }
-        catch( Exception e )
+        catch ( Exception e )
         {
-            throw ( NamingException ) new NamingException(
-                    "Failed to load LDAPS initializer." ).initCause( e );
+            throw ( NamingException ) new NamingException( "Failed to load LDAPS initializer." ).initCause( e );
         }
 
         Service service = new Service( "LDAPS", TransportType.SOCKET, new InetSocketAddress( cfg.getLdapsPort() ) );
         startLDAP0( cfg, env, service, chain );
     }
 
-    private void startLDAP0( ServerStartupConfiguration cfg, Hashtable env, Service service, IoFilterChainBuilder chainBuilder )
-            throws LdapNamingException, LdapConfigurationException
+
+    private void startLDAP0( ServerStartupConfiguration cfg, Hashtable env, Service service,
+        IoFilterChainBuilder chainBuilder ) throws LdapNamingException, LdapConfigurationException
     {
         // Register all extended operation handlers.
         LdapProtocolProvider protocolProvider = new LdapProtocolProvider( ( Hashtable ) env.clone() );
-        
-        for( Iterator i = cfg.getExtendedOperationHandlers().iterator(); i.hasNext(); )
+
+        for ( Iterator i = cfg.getExtendedOperationHandlers().iterator(); i.hasNext(); )
         {
             ExtendedOperationHandler h = ( ExtendedOperationHandler ) i.next();
             protocolProvider.addExtendedOperationHandler( h );
@@ -421,17 +425,17 @@
             DirectoryPartitionNexus nexus = directoryService.getConfiguration().getPartitionNexus();
             nexus.registerSupportedExtensions( h.getExtensionOids() );
         }
-        
+
         try
         {
             // Disable the disconnection of the clients on unbind
             IoAcceptor acceptor = minaRegistry.getAcceptor( service.getTransportType() );
             acceptor.setDisconnectClientsOnUnbind( false );
             ( ( SocketAcceptor ) acceptor ).setReuseAddress( true );
-            
+
             minaRegistry.bind( service, protocolProvider.getHandler(), chainBuilder );
             ldapService = service;
-            
+
             if ( log.isInfoEnabled() )
             {
                 log.info( "Successful bind of " + service.getName() + " Service completed: " + ldapService );
@@ -439,15 +443,18 @@
         }
         catch ( IOException e )
         {
-            String msg = "Failed to bind the " + service.getName() + " protocol service to the service registry: " + service;
+            String msg = "Failed to bind the " + service.getName() + " protocol service to the service registry: "
+                + service;
             LdapConfigurationException lce = new LdapConfigurationException( msg );
             lce.setRootCause( e );
             log.error( msg, e );
             throw lce;
         }
     }
-    
-    private void startKerberos(ServerStartupConfiguration cfg, Hashtable env) {
+
+
+    private void startKerberos( ServerStartupConfiguration cfg, Hashtable env )
+    {
         if ( cfg.isEnableKerberos() )
         {
             try
@@ -464,12 +471,14 @@
     }
 
 
-    private void startChangePassword(ServerStartupConfiguration cfg, Hashtable env) {
+    private void startChangePassword( ServerStartupConfiguration cfg, Hashtable env )
+    {
         if ( cfg.isEnableChangePassword() )
         {
             try
             {
-                ChangePasswordConfiguration changePasswordConfiguration = new ChangePasswordConfiguration( env, LoadStrategy.PROPS );
+                ChangePasswordConfiguration changePasswordConfiguration = new ChangePasswordConfiguration( env,
+                    LoadStrategy.PROPS );
                 PrincipalStore store = new JndiPrincipalStoreImpl( changePasswordConfiguration, this );
                 changePasswordServer = new ChangePasswordServer( changePasswordConfiguration, minaRegistry, store );
             }
@@ -481,7 +490,8 @@
     }
 
 
-    private void startNTP(ServerStartupConfiguration cfg, Hashtable env) {
+    private void startNTP( ServerStartupConfiguration cfg, Hashtable env )
+    {
         if ( cfg.isEnableNtp() )
         {
             try
@@ -495,19 +505,20 @@
             }
         }
     }
-    
+
+
     private void stopLDAP0( Service service )
     {
         if ( ldapService != null )
         {
-            
+
             try
             {
                 // we should unbind the service before we begin sending the notice 
                 // of disconnect so new connections are not formed while we process
                 List writeFutures = new ArrayList();
                 IoAcceptor acceptor = minaRegistry.getAcceptor( service.getTransportType() );
-                
+
                 // If the socket has already been unbound as with a successful 
                 // GracefulShutdownRequest then this will complain that the service
                 // is not bound - this is ok because the GracefulShutdown has already
@@ -517,23 +528,23 @@
                 {
                     sessions = new ArrayList( acceptor.getManagedSessions( service.getAddress() ) );
                 }
-                catch( IllegalArgumentException e )
+                catch ( IllegalArgumentException e )
                 {
                     log.warn( "Seems like the LDAP service " + service + " has already been unbound." );
                     return;
                 }
-                
+
                 minaRegistry.unbind( service );
                 if ( log.isInfoEnabled() )
                 {
                     log.info( "Unbind of " + service.getName() + " Service complete: " + ldapService );
                     log.info( "Sending notice of disconnect to existing clients sessions." );
                 }
-                
+
                 // Send Notification of Disconnection messages to all connected clients.
-                if( sessions != null )
+                if ( sessions != null )
                 {
-                    for( Iterator i = sessions.iterator(); i.hasNext(); )
+                    for ( Iterator i = sessions.iterator(); i.hasNext(); )
                     {
                         IoSession session = ( IoSession ) i.next();
                         writeFutures.add( session.write( NoticeOfDisconnect.UNAVAILABLE ) );
@@ -542,14 +553,14 @@
 
                 // And close the connections when the NoDs are sent.
                 Iterator sessionIt = sessions.iterator();
-                for( Iterator i = writeFutures.iterator(); i.hasNext(); )
+                for ( Iterator i = writeFutures.iterator(); i.hasNext(); )
                 {
                     WriteFuture future = ( WriteFuture ) i.next();
                     future.join( 1000 );
                     ( ( IoSession ) sessionIt.next() ).close();
                 }
             }
-            catch( Exception e )
+            catch ( Exception e )
             {
                 log.warn( "Failed to sent NoD.", e );
             }

Propchange: directory/trunks/apacheds/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/server-main/log4j.properties
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-main/log4j.properties?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-main/log4j.properties (original)
+++ directory/trunks/apacheds/server-main/log4j.properties Sun Feb 19 19:57:02 2006
@@ -5,8 +5,8 @@
 log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n
 
 # with these we'll not get innundated when switching to DEBUG
-log4j.logger.org.apache.ldap.common.name=WARN
+log4j.logger.org.apache.directory.shared.ldap.name=WARN
 log4j.logger.org.springframework=WARN
-log4j.logger.org.apache.ldap.common.codec=WARN
-log4j.logger.org.apache.asn1=WARN
+log4j.logger.org.apache.directory.shared.codec=WARN
+log4j.logger.org.apache.directory.shared.asn1=WARN
 

Modified: directory/trunks/apacheds/server-main/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-main/pom.xml?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-main/pom.xml (original)
+++ directory/trunks/apacheds/server-main/pom.xml Sun Feb 19 19:57:02 2006
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
-    <version>1.0-RC1-SNAPSHOT</version>
+    <version>1.0-RC1</version>
   </parent>
   <artifactId>apacheds-server-main</artifactId>
   <name>ApacheDS Server Main</name>
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>org.apache.directory.daemon</groupId>
       <artifactId>daemon-bootstrappers</artifactId>
-      <version>0.9.4-SNAPSHOT</version>
+      <version>${pom.version}</version>
     </dependency>  
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: directory/trunks/apacheds/server-main/server.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-main/server.xml?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-main/server.xml (original)
+++ directory/trunks/apacheds/server-main/server.xml Sun Feb 19 19:57:02 2006
@@ -48,7 +48,7 @@
     </property>
     <property name="ldifFilters">
       <list>
-        <bean class="org.apache.protocol.common.store.Krb5KdcEntryFilter"/>
+        <bean class="org.apache.directory.server.protocol.shared.store.Krb5KdcEntryFilter"/>
       </list>
     </property>-->
 

Modified: directory/trunks/apacheds/server-main/src/main/java/org/apache/directory/server/Service.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-main/src/main/java/org/apache/directory/server/Service.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-main/src/main/java/org/apache/directory/server/Service.java (original)
+++ directory/trunks/apacheds/server-main/src/main/java/org/apache/directory/server/Service.java Sun Feb 19 19:57:02 2006
@@ -43,7 +43,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class Service implements DaemonApplication 
+public class Service implements DaemonApplication
 {
     private static final Logger log = LoggerFactory.getLogger( Service.class );
     private Properties env;
@@ -66,14 +66,14 @@
             cfg = ( MutableServerStartupConfiguration ) factory.getBean( "configuration" );
             env = ( Properties ) factory.getBean( "environment" );
         }
-        else if ( args.length > 0 && new File( args[0] ).exists() )  // hack that takes server.xml file argument
+        else if ( args.length > 0 && new File( args[0] ).exists() ) // hack that takes server.xml file argument
         {
             log.info( "server: loading settings from ", args[0] );
             ApplicationContext factory = null;
             factory = new FileSystemXmlApplicationContext( new File( args[0] ).toURL().toString() );
             cfg = ( MutableServerStartupConfiguration ) factory.getBean( "configuration" );
             env = ( Properties ) factory.getBean( "environment" );
-            }
+        }
         else
         {
             log.info( "server: using default settings ..." );
@@ -83,37 +83,37 @@
 
         env.setProperty( Context.PROVIDER_URL, "ou=system" );
         env.setProperty( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.class.getName() );
-        
+
         if ( install != null )
         {
             cfg.setWorkingDirectory( install.getPartitionsDirectory() );
         }
-        
+
         env.putAll( cfg.toJndiEnvironment() );
         new InitialDirContext( env );
 
         workerThread = new Thread( worker, "SynchWorkerThread" );
 
-        if (log.isInfoEnabled())
+        if ( log.isInfoEnabled() )
         {
-            log.info( "server: started in {} milliseconds", ( System.currentTimeMillis() - startTime ) + "");
+            log.info( "server: started in {} milliseconds", ( System.currentTimeMillis() - startTime ) + "" );
         }
     }
-    
-    
+
+
     public void synch() throws Exception
     {
         env.putAll( new SyncConfiguration().toJndiEnvironment() );
         new InitialDirContext( env );
     }
-    
+
 
     public void start()
     {
         workerThread.start();
         return;
     }
-    
+
 
     public void stop( String[] args ) throws Exception
     {
@@ -122,33 +122,33 @@
         {
             worker.lock.notify();
         }
-        
+
         while ( startNoWait && workerThread.isAlive() )
         {
             log.info( "Waiting for SynchWorkerThread to die." );
             workerThread.join( 500 );
         }
-        
+
         env.putAll( new ShutdownConfiguration().toJndiEnvironment() );
         new InitialDirContext( env );
     }
 
 
-    public void destroy() 
+    public void destroy()
     {
     }
 
-
     class SynchWorker implements Runnable
     {
         Object lock = new Object();
         boolean stop = false;
-        
+
+
         public void run()
         {
-            while ( ! stop )
+            while ( !stop )
             {
-                synchronized( lock )
+                synchronized ( lock )
                 {
                     try
                     {
@@ -159,7 +159,7 @@
                         log.warn( "SynchWorker failed to wait on lock.", e );
                     }
                 }
-                
+
                 try
                 {
                     synch();
@@ -171,15 +171,14 @@
             }
         }
     }
-    
-    
-    public static final String BANNER = 
-        "           _                     _          ____  ____   \n" +
-        "          / \\   _ __   __ _  ___| |__   ___|  _ \\/ ___|  \n" +
-        "         / _ \\ | '_ \\ / _` |/ __| '_ \\ / _ \\ | | \\___ \\   \n" +
-        "        / ___ \\| |_) | (_| | (__| | | |  __/ |_| |___) |  \n" +
-        "       /_/   \\_\\ .__/ \\__,_|\\___|_| |_|\\___|____/|____/   \n" +
-        "               |_|                                                               \n";
+
+    public static final String BANNER = "           _                     _          ____  ____   \n"
+        + "          / \\   _ __   __ _  ___| |__   ___|  _ \\/ ___|  \n"
+        + "         / _ \\ | '_ \\ / _` |/ __| '_ \\ / _ \\ | | \\___ \\   \n"
+        + "        / ___ \\| |_) | (_| | (__| | | |  __/ |_| |___) |  \n"
+        + "       /_/   \\_\\ .__/ \\__,_|\\___|_| |_|\\___|____/|____/   \n"
+        + "               |_|                                                               \n";
+
 
     public static void printBanner()
     {

Propchange: directory/trunks/apacheds/server-main/src/main/java/org/apache/directory/server/Service.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/trunks/apacheds/server-main/src/main/java/org/apache/directory/server/UberjarMain.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/server-main/src/main/java/org/apache/directory/server/UberjarMain.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/server-sar/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-sar/pom.xml?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-sar/pom.xml (original)
+++ directory/trunks/apacheds/server-sar/pom.xml Sun Feb 19 19:57:02 2006
@@ -4,10 +4,13 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
-    <version>1.0-RC1-SNAPSHOT</version>
+    <version>1.0-RC1</version>
   </parent>
   <artifactId>apacheds-server-sar</artifactId>
   <name>ApacheDS Server Sar (JBoss 3.x)</name>
+  <description>
+    A server archive file for ApacheDS to run within a JBoss 3.x instance
+  </description>
   <packaging>sar</packaging>  
   <dependencies>
     <dependency>
@@ -18,7 +21,7 @@
     <dependency>
       <groupId>org.apache.directory.daemon</groupId>
       <artifactId>daemon-bootstrappers</artifactId>
-      <version>0.9.4-SNAPSHOT</version>
+      <version>${pom.version}</version>
     </dependency>
     <dependency>
       <groupId>jboss</groupId>

Modified: directory/trunks/apacheds/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryService.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryService.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryService.java (original)
+++ directory/trunks/apacheds/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryService.java Sun Feb 19 19:57:02 2006
@@ -1,5 +1,5 @@
 /*
- *   @(#) $Id:  $
+ *   @(#) $Id$
  *   Copyright 2004 The Apache Software Foundation
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
@@ -63,7 +63,7 @@
  * JBoss 3.x Mbean for embedded and remote directory server support
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev: $, $Date: $
+ * @version $Rev$, $Date$
  */
 public class DirectoryService extends ServiceMBeanSupport implements DirectoryServiceMBean, MBeanRegistration
 {

Propchange: directory/trunks/apacheds/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryService.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryServiceMBean.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryServiceMBean.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryServiceMBean.java (original)
+++ directory/trunks/apacheds/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryServiceMBean.java Sun Feb 19 19:57:02 2006
@@ -1,5 +1,5 @@
 /*
- *   @(#) $Id:  $
+ *   @(#) $Id$
  *   Copyright 2004 The Apache Software Foundation
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +17,7 @@
  */
 package org.apache.directory.server.sar;
 
+
 import org.w3c.dom.Element;
 
 import javax.naming.NamingException;
@@ -28,7 +29,7 @@
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory
  *         Project</a>
- * @version $Rev:  $, $Date:  $
+ * @version $Rev$, $Date$
  */
 public interface DirectoryServiceMBean extends org.jboss.system.ServiceMBean
 {
@@ -39,7 +40,8 @@
      *
      * @return The root DOM element
      */
-    public Element getEmbeddedLDIFFilters(  );
+    public Element getEmbeddedLDIFFilters();
+
 
     /**
      * Sets the root element of the XML properties list of defined LDIF filters
@@ -48,13 +50,15 @@
      */
     public void setEmbeddedLDIFFilters( Element fil );
 
+
     /**
      * Gets the root element of the XML properties list of additional
      * environment properties
      *
      * @return The root DOM element
      */
-    public Element getEmbeddedAdditionalEnvProperties(  );
+    public Element getEmbeddedAdditionalEnvProperties();
+
 
     /**
      * Sets the root element of the XML properties list of additional
@@ -64,13 +68,15 @@
      */
     public void setEmbeddedAdditionalEnvProperties( Element env );
 
+
     /**
      * Gets the root element of the XML properties list of custom bootstrap
      * schema properties
      *
      * @return The root DOM element
      */
-    public Element getEmbeddedCustomBootstrapSchema(  );
+    public Element getEmbeddedCustomBootstrapSchema();
+
 
     /**
      * Sets the root element of the XML properties list of custom bootstrap
@@ -80,12 +86,14 @@
      */
     public void setEmbeddedCustomBootstrapSchema( Element cfg );
 
+
     /**
      * Test to see if the directory service to use is embedded in this VM
      *
      * @return True if embedded else false
      */
-    public boolean isEmbeddedServerEnabled(  );
+    public boolean isEmbeddedServerEnabled();
+
 
     /**
      * Set if the directory service to use is embedded in this VM
@@ -94,12 +102,14 @@
      */
     public void setEmbeddedServerEnabled( boolean enabled );
 
+
     /**
      * Gets the name-to-object binding for Context INITIAL_CONTEXT_FACTORY
      *
      * @return Context.INITIAL_CONTEXT_FACTORY
      */
-    public String getContextFactory(  );
+    public String getContextFactory();
+
 
     /**
      * Sets the name-to-object binding for Context INITIAL_CONTEXT_FACTORY
@@ -108,12 +118,14 @@
      */
     public void setContextFactory( String factoryClass );
 
+
     /**
      * Gets the name-to-object binding for Context PROVIDER_URL
      *
      * @return Context.PROVIDER_URL
      */
-    public String getContextProviderURL(  );
+    public String getContextProviderURL();
+
 
     /**
      * Sets the name-to-object binding for Context PROVIDER_URL
@@ -122,12 +134,14 @@
      */
     public void setContextProviderURL( String providerURL );
 
+
     /**
      * Gets the name-to-object binding for Context SECURITY_AUTHENTICATION
      *
      * @return Context.SECURITY_AUTHENTICATION
      */
-    public String getContextSecurityAuthentication(  );
+    public String getContextSecurityAuthentication();
+
 
     /**
      * Sets the name-to-object binding for Context SECURITY_AUTHENTICATION
@@ -136,12 +150,14 @@
      */
     public void setContextSecurityAuthentication( String securityAuthentication );
 
+
     /**
      * Gets the name-to-object binding for Context SECURITY_PRINCIPAL
      *
      * @return Context.SECURITY_PRINCIPAL
      */
-    public String getContextSecurityPrincipal(  );
+    public String getContextSecurityPrincipal();
+
 
     /**
      * Sets the name-to-object binding for Context SECURITY_PRINCIPAL
@@ -150,12 +166,14 @@
      */
     public void setContextSecurityPrincipal( String securityPrincipal );
 
+
     /**
      * Gets the name-to-object binding for Context SECURITY_CREDENTIALS
      *
      * @return Context.SECURITY_CREDENTIALS
      */
-    public String getContextSecurityCredentials(  );
+    public String getContextSecurityCredentials();
+
 
     /**
      * Sets the name-to-object binding for Context SECURITY_CREDENTIALS
@@ -164,20 +182,23 @@
      */
     public void setContextSecurityCredentials( String securityCredentials );
 
+
     /**
      * Opens a directory context based on the currently assigned name-to-object
      * bindings
      *
      * @return A valid directory context or null on error
      */
-    public DirContext openDirContext(  ) throws NamingException;
+    public DirContext openDirContext() throws NamingException;
+
 
     /**
      * Embedded server only - Flushes out any I/O buffer or write cache
      *
      * @return True if flush succeeded else false
      */
-    public boolean flushEmbeddedServerData(  );
+    public boolean flushEmbeddedServerData();
+
 
     /**
      * Embedded server only - Changes the current password of the uid=admin
@@ -188,15 +209,16 @@
      *
      * @return Confirmation message for UI display
      */
-    public String changedEmbeddedAdminPassword( String oldPassword,
-        String newPassword );
+    public String changedEmbeddedAdminPassword( String oldPassword, String newPassword );
+
 
     /**
      * Embedded server only - tests if anonymous access is permitted
      *
      * @return True if permitted else false
      */
-    public boolean isEmbeddedAnonymousAccess(  );
+    public boolean isEmbeddedAnonymousAccess();
+
 
     /**
      * Embedded server only - sests if anonymous access is permitted
@@ -205,13 +227,15 @@
      */
     public void setEmbeddedAnonymousAccess( boolean anonymousAccess );
 
+
     /**
      * Embedded server only - tests if LDAP wire protocol handler is to be
      * started
      *
      * @return True if LDAP wire protocol in use else false
      */
-    public boolean isEmbeddedLDAPNetworkingSupport(  );
+    public boolean isEmbeddedLDAPNetworkingSupport();
+
 
     /**
      * Embedded server only - sests if LDAP wire protocol handler is to be
@@ -221,12 +245,14 @@
      */
     public void setEmbeddedLDAPNetworkingSupport( boolean ldapNetworkingSupport );
 
+
     /**
      * Embedded server only - gets the LDAP listen port
      *
      * @return LDAP listen port
      */
-    public int getEmbeddedLDAPPort(  );
+    public int getEmbeddedLDAPPort();
+
 
     /**
      * Embedded server only - sets the LDAP listen port
@@ -235,13 +261,15 @@
      */
     public void setEmbeddedLDAPPort( int ldapPort );
 
+
     /**
      * Embedded server only - gets the LDAPSSL) listen port (!NOT YET
      * SUPPORTED!)
      *
      * @return LDAPS listen port
      */
-    public int getEmbeddedLDAPSPort(  );
+    public int getEmbeddedLDAPSPort();
+
 
     /**
      * Embedded server only - sets the LDAPS (SSL) listen port (!NOT YET
@@ -251,6 +279,7 @@
      */
     public void setEmbeddedLDAPSPort( int ldapsPort );
 
+
     /**
      * Embedded server only - Gets the name of the root partion which was
      * automatically created on server startup
@@ -258,7 +287,8 @@
      * @return The name of the custom root partition (null for no custom
      *         partition)
      */
-    public String getEmbeddedCustomRootPartitionName(  );
+    public String getEmbeddedCustomRootPartitionName();
+
 
     /**
      * Embedded server only - Sets the name of the root partion which is
@@ -269,13 +299,15 @@
      */
     public void setEmbeddedCustomRootPartitionName( String rootPartitianName );
 
+
     /**
      * Embedded server only - Gets the name of the workfile folder used by the
      * server
      *
      * @return Folder name
      */
-    public String getEmbeddedWkdir(  );
+    public String getEmbeddedWkdir();
+
 
     /**
      * Embedded server only - Sets the name of the workfile folder used by the
@@ -285,13 +317,15 @@
      */
     public void setEmbeddedWkdir( String wkdir );
 
+
     /**
      * Embedded server only - Gets the name of the LDIF import folder used by
      * the server
      *
      * @return LDIF import folder
      */
-    public String getEmbeddedLDIFdir(  );
+    public String getEmbeddedLDIFdir();
+
 
     /**
      * Embedded server only - Sets the name of the LDIF import folder used by
@@ -301,12 +335,14 @@
      */
     public void setEmbeddedLDIFdir( String LDIFdir );
 
+
     /**
      * Embedded server only - test if access control is enabled
      *
      * @return True is enabled else false
      */
-    public boolean isEmbeddedAccessControlEnabled(  );
+    public boolean isEmbeddedAccessControlEnabled();
+
 
     /**
      * Embedded server only - Set if access control is enabled
@@ -315,12 +351,14 @@
      */
     public void setEmbeddedAccessControlEnabled( boolean enabled );
 
+
     /**
      * Embedded server only - test if NTP wire protocol is enabled
      *
      * @return True is enabled else false
      */
-    public boolean isEmbeddedEnableNtp(  );
+    public boolean isEmbeddedEnableNtp();
+
 
     /**
      * Embedded server only - set if NTP wire protocol is enabled
@@ -329,12 +367,14 @@
      */
     public void setEmbeddedEnableNtp( boolean enabled );
 
+
     /**
      * Embedded server only - test if Kerberos wire protocol is enabled
      *
      * @return True is enabled else false
      */
-    public boolean isEmbeddedEnableKerberos(  );
+    public boolean isEmbeddedEnableKerberos();
+
 
     /**
      * Embedded server only - set if Kerberos wire protocol is enabled
@@ -343,12 +383,14 @@
      */
     public void setEmbeddedEnableKerberos( boolean enabled );
 
+
     /**
      * Embedded server only - test if Change Password wire protocol is enabled
      *
      * @return True is enabled else false
      */
-    public boolean isEmbeddedEnableChangePassword(  );
+    public boolean isEmbeddedEnableChangePassword();
+
 
     /**
      * Embedded server only - set if Change Password wire protocol is enabled

Propchange: directory/trunks/apacheds/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryServiceMBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryServiceMBean.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/server-ssl/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-ssl/pom.xml?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-ssl/pom.xml (original)
+++ directory/trunks/apacheds/server-ssl/pom.xml Sun Feb 19 19:57:02 2006
@@ -4,10 +4,13 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
-    <version>1.0-RC1-SNAPSHOT</version>
+    <version>1.0-RC1</version>
   </parent>
   <artifactId>apacheds-server-ssl</artifactId>
   <name>ApacheDS Server SSL</name>
+  <description>
+    An SSL support module for LDAPS with ApacheDS
+  </description>
   <packaging>jar</packaging>  
   <dependencies>
     <dependency>

Modified: directory/trunks/apacheds/server-ssl/src/main/java/org/apache/directory/server/ssl/LdapsInitializer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-ssl/src/main/java/org/apache/directory/server/ssl/LdapsInitializer.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-ssl/src/main/java/org/apache/directory/server/ssl/LdapsInitializer.java (original)
+++ directory/trunks/apacheds/server-ssl/src/main/java/org/apache/directory/server/ssl/LdapsInitializer.java Sun Feb 19 19:57:02 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.ssl;
 
+
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.security.KeyStore;
@@ -35,12 +36,13 @@
 import org.apache.mina.common.IoFilterChainBuilder;
 import org.apache.mina.filter.SSLFilter;
 
+
 /**
  * Loads the certificate file for LDAPS support and creates the appropriate
  * MINA filter chain.
  *
  * @author The Apache Directory Project (dev@directory.apache.org)
- * @version $Rev: 368358 $, $Date: 2006-01-12 12:50:40Z $
+ * @version $Rev$, $Date$
  *
  */
 public class LdapsInitializer
@@ -50,21 +52,22 @@
         // Load the certificate
         char[] certPasswdChars = cfg.getLdapsCertificatePassword().toCharArray();
         String storePath = cfg.getLdapsCertificateFile().getPath();
-        
+
         KeyStore ks = null;
         try
         {
             ks = loadKeyStore( storePath, "PKCS12" );
         }
-        catch( Exception e )
+        catch ( Exception e )
         {
             try
             {
                 ks = loadKeyStore( storePath, "JKS" );
             }
-            catch( Exception e2 )
+            catch ( Exception e2 )
             {
-                throw ( NamingException ) new NamingException( "Failed to load a certificate: " + storePath ).initCause( e );
+                throw ( NamingException ) new NamingException( "Failed to load a certificate: " + storePath )
+                    .initCause( e );
             }
         }
 
@@ -74,23 +77,25 @@
             // Set up key manager factory to use our key store
             KeyManagerFactory kmf = KeyManagerFactory.getInstance( "SunX509" );
             kmf.init( ks, certPasswdChars );
-    
+
             // Initialize the SSLContext to work with our key managers.
             sslCtx = SSLContext.getInstance( "TLS" );
-            sslCtx.init( kmf.getKeyManagers(),
-                    new TrustManager[] { new ServerX509TrustManager() }, new SecureRandom() );
+            sslCtx.init( kmf.getKeyManagers(), new TrustManager[]
+                { new ServerX509TrustManager() }, new SecureRandom() );
         }
-        catch( Exception e )
+        catch ( Exception e )
         {
             throw ( NamingException ) new NamingException( "Failed to create a SSL context." ).initCause( e );
         }
-        
+
         DefaultIoFilterChainBuilder chain = new DefaultIoFilterChainBuilder();
         chain.addLast( "SSL", new SSLFilter( sslCtx ) );
         return chain;
     }
-    
-    private static KeyStore loadKeyStore( String storePath, String storeType ) throws KeyStoreException, IOException, CertificateException, NoSuchAlgorithmException
+
+
+    private static KeyStore loadKeyStore( String storePath, String storeType ) throws KeyStoreException, IOException,
+        CertificateException, NoSuchAlgorithmException
     {
         FileInputStream in = null;
         // Create keystore
@@ -103,13 +108,13 @@
         }
         finally
         {
-            if( in != null )
+            if ( in != null )
             {
                 try
                 {
                     in.close();
                 }
-                catch( IOException ignored )
+                catch ( IOException ignored )
                 {
                 }
             }

Propchange: directory/trunks/apacheds/server-ssl/src/main/java/org/apache/directory/server/ssl/LdapsInitializer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/server-ssl/src/main/java/org/apache/directory/server/ssl/LdapsInitializer.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/server-ssl/src/main/java/org/apache/directory/server/ssl/support/ServerX509TrustManager.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-ssl/src/main/java/org/apache/directory/server/ssl/support/ServerX509TrustManager.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-ssl/src/main/java/org/apache/directory/server/ssl/support/ServerX509TrustManager.java (original)
+++ directory/trunks/apacheds/server-ssl/src/main/java/org/apache/directory/server/ssl/support/ServerX509TrustManager.java Sun Feb 19 19:57:02 2006
@@ -16,16 +16,18 @@
  */
 package org.apache.directory.server.ssl.support;
 
+
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 
 import javax.net.ssl.X509TrustManager;
 
+
 /**
  * An {@link X509TrustManager} for LDAP server.
  *
  * @author Trustin Lee
- * @version $Rev: 368356 $, $Date: 2006-01-12 12:35:14Z $
+ * @version $Rev$, $Date$
  */
 public class ServerX509TrustManager implements X509TrustManager
 {
@@ -33,16 +35,19 @@
     {
     }
 
+
     public void checkClientTrusted( X509Certificate[] arg0, String arg1 ) throws CertificateException
     {
         // We don't check clients at all right now.
         // XXX: Do we need a client-side certificates?
     }
 
+
     public void checkServerTrusted( X509Certificate[] arg0, String arg1 ) throws CertificateException
     {
         // It is server-side trust manager, so we don't need to check the server itself.
     }
+
 
     public X509Certificate[] getAcceptedIssuers()
     {

Propchange: directory/trunks/apacheds/server-ssl/src/main/java/org/apache/directory/server/ssl/support/ServerX509TrustManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/server-ssl/src/main/java/org/apache/directory/server/ssl/support/ServerX509TrustManager.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsTest.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsTest.java (original)
+++ directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsTest.java Sun Feb 19 19:57:02 2006
@@ -1,128 +1,128 @@
-/*
- *   Copyright 2004 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-package org.apache.directory.server.ssl;
-
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.util.Hashtable;
-
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.BasicAttributes;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.InitialDirContext;
-
-import org.apache.directory.server.ssl.support.SSLSocketFactory;
-import org.apache.directory.server.unit.AbstractServerTest;
-import org.apache.mina.util.AvailablePortFinder;
-
-
-/**
- * Test case to verify DIREVE-216.  Starts up the server binds via SUN JNDI provider
- * to perform add modify operations on entries.
- * 
- * @author szoerner
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev: 365899 $
- */
-public class LdapsTest extends AbstractServerTest
-{
-    private static final String RDN = "cn=The Person";
-
-    private DirContext ctx = null;
-
-
-    /**
-     * Create an entry for a person.
-     */
-    public void setUp() throws Exception
-    {
-        doDelete( configuration.getWorkingDirectory() );
-        
-        int ldapsPort = AvailablePortFinder.getNextAvailable( 8192 );
-        configuration.setEnableLdaps( true );
-        configuration.setLdapsCertificatePassword( "boguspw" );
-        configuration.setLdapsPort( ldapsPort );
-
-        // Copy the bogus certificate to the certificates directory.
-        InputStream in = getClass().getResourceAsStream( "/bogus.cert" );
-        configuration.getLdapsCertificateFile().getParentFile().mkdirs();
-
-        FileOutputStream out = new FileOutputStream(
-                configuration.getLdapsCertificateFile() );
-
-        for( ;; )
-        {
-            int c = in.read();
-            if( c < 0 )
-            {
-                break;
-            }
-            out.write( c );
-        }
-
-        in.close();
-        out.close();
-        
-        doDelete = false;
-        super.setUp();
-        doDelete = true;
-
-        Hashtable env = new Hashtable();
-        env.put( "java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory" );
-        env.put( "java.naming.provider.url", "ldap://localhost:" + ldapsPort + "/ou=system" );
-        env.put( "java.naming.ldap.factory.socket", SSLSocketFactory.class.getName() );
-        env.put( "java.naming.security.principal", "uid=admin,ou=system" );
-        env.put( "java.naming.security.credentials", "secret" );
-        env.put( "java.naming.security.authentication", "simple" );
-        ctx = new InitialDirContext( env );
-    }
-
-
-    /**
-     * Remove the person.
-     */
-    public void tearDown() throws Exception
-    {
-        ctx.unbind(RDN);
-        ctx.close();
-        ctx = null;
-        super.tearDown();
-    }
-
-
-    /**
-     * Just a little test to check if the connection is made successfully.
-     */
-    public void testSetUpTearDown() throws NamingException
-    {
-        // Create a person
-        Attributes attributes = new BasicAttributes( true );
-        Attribute attribute = new BasicAttribute( "objectClass" );
-        attribute.add( "top" );
-        attribute.add( "person" );
-        attributes.put( attribute );
-        attributes.put( "cn", "The Person" );
-        attributes.put( "sn", "Person" );
-        attributes.put( "description", "this is a person" );
-        DirContext person = ctx.createSubcontext( RDN, attributes );
-
-        assertNotNull( person );
-    }
-}
+/*
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+package org.apache.directory.server.ssl;
+
+
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.util.Hashtable;
+
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.InitialDirContext;
+
+import org.apache.directory.server.ssl.support.SSLSocketFactory;
+import org.apache.directory.server.unit.AbstractServerTest;
+import org.apache.mina.util.AvailablePortFinder;
+
+
+/**
+ * Test case to verify DIREVE-216.  Starts up the server binds via SUN JNDI provider
+ * to perform add modify operations on entries.
+ * 
+ * @author szoerner
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public class LdapsTest extends AbstractServerTest
+{
+    private static final String RDN = "cn=The Person";
+
+    private DirContext ctx = null;
+
+
+    /**
+     * Create an entry for a person.
+     */
+    public void setUp() throws Exception
+    {
+        doDelete( configuration.getWorkingDirectory() );
+
+        int ldapsPort = AvailablePortFinder.getNextAvailable( 8192 );
+        configuration.setEnableLdaps( true );
+        configuration.setLdapsCertificatePassword( "boguspw" );
+        configuration.setLdapsPort( ldapsPort );
+
+        // Copy the bogus certificate to the certificates directory.
+        InputStream in = getClass().getResourceAsStream( "/bogus.cert" );
+        configuration.getLdapsCertificateFile().getParentFile().mkdirs();
+
+        FileOutputStream out = new FileOutputStream( configuration.getLdapsCertificateFile() );
+
+        for ( ;; )
+        {
+            int c = in.read();
+            if ( c < 0 )
+            {
+                break;
+            }
+            out.write( c );
+        }
+
+        in.close();
+        out.close();
+
+        doDelete = false;
+        super.setUp();
+        doDelete = true;
+
+        Hashtable env = new Hashtable();
+        env.put( "java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory" );
+        env.put( "java.naming.provider.url", "ldap://localhost:" + ldapsPort + "/ou=system" );
+        env.put( "java.naming.ldap.factory.socket", SSLSocketFactory.class.getName() );
+        env.put( "java.naming.security.principal", "uid=admin,ou=system" );
+        env.put( "java.naming.security.credentials", "secret" );
+        env.put( "java.naming.security.authentication", "simple" );
+        ctx = new InitialDirContext( env );
+    }
+
+
+    /**
+     * Remove the person.
+     */
+    public void tearDown() throws Exception
+    {
+        ctx.unbind( RDN );
+        ctx.close();
+        ctx = null;
+        super.tearDown();
+    }
+
+
+    /**
+     * Just a little test to check if the connection is made successfully.
+     */
+    public void testSetUpTearDown() throws NamingException
+    {
+        // Create a person
+        Attributes attributes = new BasicAttributes( true );
+        Attribute attribute = new BasicAttribute( "objectClass" );
+        attribute.add( "top" );
+        attribute.add( "person" );
+        attributes.put( attribute );
+        attributes.put( "cn", "The Person" );
+        attributes.put( "sn", "Person" );
+        attributes.put( "description", "this is a person" );
+        DirContext person = ctx.createSubcontext( RDN, attributes );
+
+        assertNotNull( person );
+    }
+}

Propchange: directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/support/BogusSSLContextFactory.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/support/BogusSSLContextFactory.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/support/BogusSSLContextFactory.java (original)
+++ directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/support/BogusSSLContextFactory.java Sun Feb 19 19:57:02 2006
@@ -1,5 +1,5 @@
 /*
- *   @(#) $Id: BogusSSLContextFactory.java 365899 2006-01-04 12:24:30Z trustin $
+ *   @(#) $Id$
  *
  *   Copyright 2004 The Apache Software Foundation
  *
@@ -18,6 +18,7 @@
  */
 package org.apache.directory.server.ssl.support;
 
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.GeneralSecurityException;
@@ -26,11 +27,12 @@
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 
+
 /**
  * Factory to create a bougus SSLContext.
  *
  * @author The Apache Directory Project (dev@directory.apache.org)
- * @version $Rev: 365899 $, $Date: 2006-01-04 21:24:30 +0900 (수, 04  1월 2006) $
+ * @version $Rev$, $Date$
  */
 public class BogusSSLContextFactory
 {
@@ -54,13 +56,14 @@
     /**
      * Bougus keystore password.
      */
-    private static final char[] BOGUS_PW = { 'b', 'o', 'g', 'u', 's', 'p',
-                                            'w' };
+    private static final char[] BOGUS_PW =
+        { 'b', 'o', 'g', 'u', 's', 'p', 'w' };
 
     private static SSLContext serverInstance = null;
 
     private static SSLContext clientInstance = null;
 
+
     /**
      * Get SSLContext singleton.
      *
@@ -68,26 +71,24 @@
      * @throws java.security.GeneralSecurityException
      *
      */
-    public static SSLContext getInstance( boolean server )
-            throws GeneralSecurityException
+    public static SSLContext getInstance( boolean server ) throws GeneralSecurityException
     {
         SSLContext retInstance = null;
-        if( server )
+        if ( server )
         {
-            if( serverInstance == null )
+            if ( serverInstance == null )
             {
-                synchronized( BogusSSLContextFactory.class )
+                synchronized ( BogusSSLContextFactory.class )
                 {
-                    if( serverInstance == null )
+                    if ( serverInstance == null )
                     {
                         try
                         {
                             serverInstance = createBougusServerSSLContext();
                         }
-                        catch( Exception ioe )
+                        catch ( Exception ioe )
                         {
-                            throw new GeneralSecurityException(
-                                    "Can't create Server SSLContext:" + ioe );
+                            throw new GeneralSecurityException( "Can't create Server SSLContext:" + ioe );
                         }
                     }
                 }
@@ -96,11 +97,11 @@
         }
         else
         {
-            if( clientInstance == null )
+            if ( clientInstance == null )
             {
-                synchronized( BogusSSLContextFactory.class )
+                synchronized ( BogusSSLContextFactory.class )
                 {
-                    if( clientInstance == null )
+                    if ( clientInstance == null )
                     {
                         clientInstance = createBougusClientSSLContext();
                     }
@@ -111,27 +112,26 @@
         return retInstance;
     }
 
-    private static SSLContext createBougusServerSSLContext()
-            throws GeneralSecurityException, IOException
+
+    private static SSLContext createBougusServerSSLContext() throws GeneralSecurityException, IOException
     {
         // Create keystore
         KeyStore ks = KeyStore.getInstance( "JKS" );
         InputStream in = null;
         try
         {
-            in = BogusSSLContextFactory.class
-                    .getResourceAsStream( BOGUS_KEYSTORE );
+            in = BogusSSLContextFactory.class.getResourceAsStream( BOGUS_KEYSTORE );
             ks.load( in, BOGUS_PW );
         }
         finally
         {
-            if( in != null )
+            if ( in != null )
             {
                 try
                 {
                     in.close();
                 }
-                catch( IOException ignored )
+                catch ( IOException ignored )
                 {
                 }
             }
@@ -143,14 +143,13 @@
 
         // Initialize the SSLContext to work with our key managers.
         SSLContext sslContext = SSLContext.getInstance( PROTOCOL );
-        sslContext.init( kmf.getKeyManagers(),
-                BogusTrustManagerFactory.X509_MANAGERS, null );
+        sslContext.init( kmf.getKeyManagers(), BogusTrustManagerFactory.X509_MANAGERS, null );
 
         return sslContext;
     }
 
-    private static SSLContext createBougusClientSSLContext()
-            throws GeneralSecurityException
+
+    private static SSLContext createBougusClientSSLContext() throws GeneralSecurityException
     {
         SSLContext context = SSLContext.getInstance( PROTOCOL );
         context.init( null, BogusTrustManagerFactory.X509_MANAGERS, null );

Propchange: directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/support/BogusSSLContextFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/support/BogusSSLContextFactory.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/support/BogusTrustManagerFactory.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/support/BogusTrustManagerFactory.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/support/BogusTrustManagerFactory.java (original)
+++ directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/support/BogusTrustManagerFactory.java Sun Feb 19 19:57:02 2006
@@ -1,5 +1,5 @@
 /*
- *   @(#) $Id: BogusTrustManagerFactory.java 365899 2006-01-04 12:24:30Z trustin $
+ *   @(#) $Id$
  *
  *   Copyright 2004 The Apache Software Foundation
  *
@@ -18,6 +18,7 @@
  */
 package org.apache.directory.server.ssl.support;
 
+
 import java.security.InvalidAlgorithmParameterException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -29,52 +30,57 @@
 import javax.net.ssl.TrustManagerFactorySpi;
 import javax.net.ssl.X509TrustManager;
 
+
 /**
  * Bogus trust manager factory. Creates BogusX509TrustManager
  *
  * @author The Apache Directory Project (dev@directory.apache.org)
- * @version $Rev: 365899 $, $Date: 2006-01-04 21:24:30 +0900 (수, 04  1월 2006) $
+ * @version $Rev$, $Date$
  */
 class BogusTrustManagerFactory extends TrustManagerFactorySpi
 {
 
     static final X509TrustManager X509 = new X509TrustManager()
     {
-        public void checkClientTrusted( X509Certificate[] x509Certificates,
-                                       String s ) throws CertificateException
+        public void checkClientTrusted( X509Certificate[] x509Certificates, String s ) throws CertificateException
         {
         }
 
-        public void checkServerTrusted( X509Certificate[] x509Certificates,
-                                       String s ) throws CertificateException
+
+        public void checkServerTrusted( X509Certificate[] x509Certificates, String s ) throws CertificateException
         {
         }
 
+
         public X509Certificate[] getAcceptedIssuers()
         {
-            return new X509Certificate[ 0 ];
+            return new X509Certificate[0];
         }
     };
 
-    static final TrustManager[] X509_MANAGERS = new TrustManager[] { X509 };
+    static final TrustManager[] X509_MANAGERS = new TrustManager[]
+        { X509 };
+
 
     public BogusTrustManagerFactory()
     {
     }
 
+
     protected TrustManager[] engineGetTrustManagers()
     {
         return X509_MANAGERS;
     }
 
+
     protected void engineInit( KeyStore keystore ) throws KeyStoreException
     {
         // noop
     }
 
-    protected void engineInit(
-                              ManagerFactoryParameters managerFactoryParameters )
-            throws InvalidAlgorithmParameterException
+
+    protected void engineInit( ManagerFactoryParameters managerFactoryParameters )
+        throws InvalidAlgorithmParameterException
     {
         // noop
     }

Propchange: directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/support/BogusTrustManagerFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/support/BogusTrustManagerFactory.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/support/SSLSocketFactory.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/support/SSLSocketFactory.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/support/SSLSocketFactory.java (original)
+++ directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/support/SSLSocketFactory.java Sun Feb 19 19:57:02 2006
@@ -1,5 +1,5 @@
 /*
- *   @(#) $Id: SSLSocketFactory.java 365899 2006-01-04 12:24:30Z trustin $
+ *   @(#) $Id$
  *
  *   Copyright 2004 The Apache Software Foundation
  *
@@ -18,6 +18,7 @@
  */
 package org.apache.directory.server.ssl.support;
 
+
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.Socket;
@@ -26,11 +27,12 @@
 
 import javax.net.SocketFactory;
 
+
 /**
  * Simple Socket factory to create sockets with or without SSL enabled.
  * If SSL enabled a "bougus" SSL Context is used (suitable for test purposes)
  * 
- * @version $Rev: 365899 $, $Date: 2006-01-04 21:24:30 +0900 (수, 04  1월 2006) $
+ * @version $Rev$, $Date$
  */
 public class SSLSocketFactory extends SocketFactory
 {
@@ -40,20 +42,22 @@
 
     private static javax.net.SocketFactory factory = null;
 
+
     public static SocketFactory getDefault()
     {
         return new SSLSocketFactory();
     }
 
+
     public SSLSocketFactory()
     {
         super();
     }
 
-    public Socket createSocket( String arg1, int arg2 ) throws IOException,
-            UnknownHostException
+
+    public Socket createSocket( String arg1, int arg2 ) throws IOException, UnknownHostException
     {
-        if( isSslEnabled() )
+        if ( isSslEnabled() )
         {
             return getSSLFactory().createSocket( arg1, arg2 );
         }
@@ -63,11 +67,11 @@
         }
     }
 
-    public Socket createSocket( String arg1, int arg2, InetAddress arg3,
-                               int arg4 ) throws IOException,
-            UnknownHostException
+
+    public Socket createSocket( String arg1, int arg2, InetAddress arg3, int arg4 ) throws IOException,
+        UnknownHostException
     {
-        if( isSslEnabled() )
+        if ( isSslEnabled() )
         {
             return getSSLFactory().createSocket( arg1, arg2, arg3, arg4 );
         }
@@ -77,10 +81,10 @@
         }
     }
 
-    public Socket createSocket( InetAddress arg1, int arg2 )
-            throws IOException
+
+    public Socket createSocket( InetAddress arg1, int arg2 ) throws IOException
     {
-        if( isSslEnabled() )
+        if ( isSslEnabled() )
         {
             return getSSLFactory().createSocket( arg1, arg2 );
         }
@@ -90,10 +94,10 @@
         }
     }
 
-    public Socket createSocket( InetAddress arg1, int arg2, InetAddress arg3,
-                               int arg4 ) throws IOException
+
+    public Socket createSocket( InetAddress arg1, int arg2, InetAddress arg3, int arg4 ) throws IOException
     {
-        if( isSslEnabled() )
+        if ( isSslEnabled() )
         {
             return getSSLFactory().createSocket( arg1, arg2, arg3, arg4 );
         }
@@ -103,25 +107,26 @@
         }
     }
 
+
     public static javax.net.SocketFactory getSocketFactory()
     {
-        if( factory == null )
+        if ( factory == null )
         {
             factory = new SSLSocketFactory();
         }
         return factory;
     }
 
+
     private javax.net.ssl.SSLSocketFactory getSSLFactory()
     {
-        if( sslFactory == null )
+        if ( sslFactory == null )
         {
             try
             {
-                sslFactory = BogusSSLContextFactory.getInstance( false )
-                        .getSocketFactory();
+                sslFactory = BogusSSLContextFactory.getInstance( false ).getSocketFactory();
             }
-            catch( GeneralSecurityException e )
+            catch ( GeneralSecurityException e )
             {
                 throw new RuntimeException( "could not create SSL socket", e );
             }
@@ -129,10 +134,12 @@
         return sslFactory;
     }
 
+
     public static boolean isSslEnabled()
     {
         return sslEnabled;
     }
+
 
     public static void setSslEnabled( boolean newSslEnabled )
     {

Propchange: directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/support/SSLSocketFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/support/SSLSocketFactory.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/server-tools/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-tools/pom.xml?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-tools/pom.xml (original)
+++ directory/trunks/apacheds/server-tools/pom.xml Sun Feb 19 19:57:02 2006
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
-    <version>1.0-RC1-SNAPSHOT</version>
+    <version>1.0-RC1</version>
   </parent>
   <artifactId>apacheds-server-tools</artifactId>
   <name>ApacheDS Server Tools</name>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>org.apache.directory.daemon</groupId>
       <artifactId>daemon-bootstrappers</artifactId>
-      <version>0.9.4-SNAPSHOT</version>
+      <version>${pom.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-cli</groupId>



Mime
View raw message