directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r903719 - in /directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap: codec/ message/
Date Wed, 27 Jan 2010 16:38:47 GMT
Author: elecharny
Date: Wed Jan 27 16:38:47 2010
New Revision: 903719

URL: http://svn.apache.org/viewvc?rev=903719&view=rev
Log:
Renamed anything containing Twix

Added:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java
      - copied, changed from r903709, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapEncoder.java
      - copied, changed from r903704, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixEncoder.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapProvider.java
      - copied, changed from r903704, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixProvider.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java
      - copied, changed from r903704, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java
Removed:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixEncoder.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixProvider.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java
Modified:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageDecoder.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageEncoder.java

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java
(from r903709, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java&r1=903709&r2=903719&rev=903719&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java
Wed Jan 27 16:38:47 2010
@@ -38,15 +38,15 @@
 
 
 /**
- * The TwixDecoder decodes ASN.1 BER encoded PDUs.
+ * The LdapDecoder decodes ASN.1 BER encoded PDUs.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$, 
  */
-public class TwixDecoder implements ProviderDecoder
+public class LdapDecoder implements ProviderDecoder
 {
     /** The logger */
-    private static Logger log = LoggerFactory.getLogger( TwixDecoder.class );
+    private static Logger log = LoggerFactory.getLogger( LdapDecoder.class );
 
     /** A speedup for logger */
     private static final boolean IS_DEBUG = log.isDebugEnabled();
@@ -65,13 +65,13 @@
 
 
     /**
-     * Creates an instance of a Twix Decoder implementation.
+     * Creates an instance of a Ldap Decoder implementation.
      * 
      * @param provider the owning provider.
      * @param binaryAttributeDetector checks for binary attributes 
      * @param maxPDUSize the maximum size a PDU can be
      */
-    public TwixDecoder( Provider provider, BinaryAttributeDetector binaryAttributeDetector,
int maxPDUSize )
+    public LdapDecoder( Provider provider, BinaryAttributeDetector binaryAttributeDetector,
int maxPDUSize )
     {
         this.provider = provider;
         ldapMessageContainer = new LdapMessageContainer( binaryAttributeDetector );
@@ -182,8 +182,8 @@
         }
         catch ( Exception e )
         {
-            log.error( "Twix decoder failure : " + e.getMessage() );
-            ProviderException pe = new ProviderException( provider, "Twix decoder failure!"
);
+            log.error( "Ldap decoder failure : " + e.getMessage() );
+            ProviderException pe = new ProviderException( provider, "Ldap decoder failure!"
);
             pe.addThrowable( e );
             throw pe;
         }
@@ -215,8 +215,8 @@
             }
             else
             {
-                log.error( "Twix decoder failure, PDU does not contain enough data" );
-                ProviderException pe = new ProviderException( provider, "Twix decoder failure!"
);
+                log.error( "Ldap decoder failure, PDU does not contain enough data" );
+                ProviderException pe = new ProviderException( provider, "Ldap decoder failure!"
);
                 //noinspection ThrowableInstanceNeverThrown
                 pe.addThrowable( new DecoderException( "The input stream does not contain
a full PDU" ) );
                 throw pe;
@@ -238,8 +238,8 @@
             }
             catch ( Exception e )
             {
-                log.error( "Twix decoder failure : " + e.getMessage() );
-                ProviderException pe = new ProviderException( provider, "Twix decoder failure!"
);
+                log.error( "Ldap decoder failure : " + e.getMessage() );
+                ProviderException pe = new ProviderException( provider, "Ldap decoder failure!"
);
                 pe.addThrowable( e );
                 throw pe;
             }
@@ -255,8 +255,8 @@
             }
             else
             {
-                log.error( "Twix decoder failure : The input stream does not contain a full
PDU" );
-                ProviderException pe = new ProviderException( provider, "Twix decoder failure!"
);
+                log.error( "Ldap decoder failure : The input stream does not contain a full
PDU" );
+                ProviderException pe = new ProviderException( provider, "Ldap decoder failure!"
);
                 //noinspection ThrowableInstanceNeverThrown
                 pe.addThrowable( new DecoderException( "The input stream does not contain
a full PDU" ) );
                 throw pe;

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapEncoder.java
(from r903704, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixEncoder.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapEncoder.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapEncoder.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixEncoder.java&r1=903704&r2=903719&rev=903719&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixEncoder.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapEncoder.java
Wed Jan 27 16:38:47 2010
@@ -39,19 +39,19 @@
 
 
 /**
- * Twix LDAP BER provider's encoder.
+ * LDAP BER provider's encoder.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class TwixEncoder implements ProviderEncoder
+public class LdapEncoder implements ProviderEncoder
 {
     //TM private static long cumul = 0L;
     //TM private static long count = 0L;
     //TM private Object lock = new Object();
 
     /** The logger */
-    private static Logger log = LoggerFactory.getLogger( TwixEncoder.class );
+    private static Logger log = LoggerFactory.getLogger( LdapEncoder.class );
 
     /** A speedup for logger */
     private static final boolean IS_DEBUG = log.isDebugEnabled();
@@ -64,11 +64,11 @@
 
 
     /**
-     * Creates an instance of a Twix Encoder implementation.
+     * Creates an instance of a Ldap Encoder implementation.
      * 
      * @param provider The associated Provider
      */
-    public TwixEncoder( Provider provider )
+    public LdapEncoder( Provider provider )
     {
         this.provider = provider;
         encodeCallback = new OutputCallback();
@@ -97,8 +97,8 @@
         }
         catch ( EncoderException e )
         {
-            log.error( "Twix encoder failed to encode object: " + obj + ", error : " + e.getMessage()
);
-            ProviderException pe = new ProviderException( provider, "Twix encoder failed
to encode object: " + obj
+            log.error( "Ldap encoder failed to encode object: " + obj + ", error : " + e.getMessage()
);
+            ProviderException pe = new ProviderException( provider, "Ldap encoder failed
to encode object: " + obj
                 + ", error : " + e.getMessage() );
             throw pe;
         }
@@ -134,8 +134,8 @@
         }
         catch ( EncoderException e )
         {
-            log.error( "Twix encoder failed to encode object: " + obj + ", error : " + e.getMessage()
);
-            ProviderException pe = new ProviderException( provider, "Twix encoder failed
to encode object: " + obj
+            log.error( "Ldap encoder failed to encode object: " + obj + ", error : " + e.getMessage()
);
+            ProviderException pe = new ProviderException( provider, "Ldap encoder failed
to encode object: " + obj
                 + ", error : " + e.getMessage() );
             throw pe;
         }
@@ -170,8 +170,8 @@
         }
         catch ( EncoderException e )
         {
-            log.error( "Twix encoder failed to encode object: " + obj + ", error : " + e.getMessage()
);
-            ProviderException pe = new ProviderException( provider, "Twix encoder failed
to encode object: " + obj
+            log.error( "Ldap encoder failed to encode object: " + obj + ", error : " + e.getMessage()
);
+            ProviderException pe = new ProviderException( provider, "Ldap encoder failed
to encode object: " + obj
                 + ", error : " + e.getMessage() );
             throw pe;
         }
@@ -262,7 +262,7 @@
             catch ( IOException e )
             {
                 ProviderException pe = new ProviderException( provider,
-                    "Twix encoder failed to encode object, error : " + e.getMessage() );
+                    "Ldap encoder failed to encode object, error : " + e.getMessage() );
                 throw pe;
             }
         }

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapProvider.java
(from r903704, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixProvider.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapProvider.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapProvider.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixProvider.java&r1=903704&r2=903719&rev=903719&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixProvider.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapProvider.java
Wed Jan 27 16:38:47 2010
@@ -26,30 +26,28 @@
 import org.apache.directory.shared.ldap.message.spi.ProviderException;
 
 
-
-
 /**
- * The Twix specific BER provider for LDAP.
+ * The specific BER provider for LDAP.
  * 
  * @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
  *         $Rev$
  */
-public class TwixProvider extends Provider
+public class LdapProvider extends Provider
 {
     /**
-     * Creates an instance of a Twix based LDAP BER Provider.
+     * Creates an instance of a LDAP BER Provider.
      */
-    private TwixProvider()
+    private LdapProvider()
     {
-        super( "Twix LDAP BER Provider", "Apache Directory Project" );
+        super( "LDAP LDAP BER Provider", "Apache Directory Project" );
     }
 
-    /** the singleton TwixProvider instance */
-    private static TwixProvider singleton;
+    /** the singleton LdapProvider instance */
+    private static LdapProvider singleton;
 
 
     /**
-     * Gets a handle on the singleton TwixProvider. Only one instance should
+     * Gets a handle on the singleton LdapProvider. Only one instance should
      * have to be instantiated for the entire jvm.
      * 
      * @return the singleton SnaccProvider instance
@@ -58,7 +56,7 @@
     {
         if ( singleton == null )
         {
-            singleton = new TwixProvider();
+            singleton = new LdapProvider();
         }
 
         return singleton;
@@ -74,7 +72,7 @@
      */
     public ProviderEncoder getEncoder() throws ProviderException
     {
-        return new TwixEncoder( this );
+        return new LdapEncoder( this );
     }
 
 
@@ -87,6 +85,6 @@
      */
     public ProviderDecoder getDecoder( BinaryAttributeDetector binaryAttributeDetector, int
maxPDUSize ) throws ProviderException
     {
-        return new TwixDecoder( this, binaryAttributeDetector, maxPDUSize );
+        return new LdapDecoder( this, binaryAttributeDetector, maxPDUSize );
     }
 }

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java
(from r903704, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java&r1=903704&r2=903719&rev=903719&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java
Wed Jan 27 16:38:47 2010
@@ -138,10 +138,10 @@
  * @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
  * @version $Rev$, $Date$, 
  */
-public class TwixTransformer
+public class LdapTransformer
 {
     /** The logger */
-    private static Logger LOG = LoggerFactory.getLogger( TwixTransformer.class );
+    private static Logger LOG = LoggerFactory.getLogger( LdapTransformer.class );
 
     /** A speedup for logger */
     private static final boolean IS_DEBUG = LOG.isDebugEnabled();

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageDecoder.java?rev=903719&r1=903718&r2=903719&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageDecoder.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageDecoder.java
Wed Jan 27 16:38:47 2010
@@ -26,7 +26,7 @@
 import org.apache.directory.shared.asn1.codec.stateful.DecoderMonitor;
 import org.apache.directory.shared.asn1.codec.stateful.StatefulDecoder;
 import org.apache.directory.shared.ldap.codec.ResponseCarryingException;
-import org.apache.directory.shared.ldap.codec.TwixTransformer;
+import org.apache.directory.shared.ldap.codec.LdapTransformer;
 import org.apache.directory.shared.ldap.message.spi.BinaryAttributeDetector;
 import org.apache.directory.shared.ldap.message.spi.Provider;
 import org.apache.directory.shared.ldap.message.spi.ProviderDecoder;
@@ -88,7 +88,7 @@
             {
                 if ( decoded instanceof Asn1Object )
                 {
-                    cb.decodeOccurred( decoder, TwixTransformer.transform( decoded ) );
+                    cb.decodeOccurred( decoder, LdapTransformer.transform( decoded ) );
                 }
                 else
                 {
@@ -140,7 +140,7 @@
         }
 
         // Call on transformer to convert stub based PDU into Message based PDU
-        return TwixTransformer.transform( providerEnvelope );
+        return LdapTransformer.transform( providerEnvelope );
     }
 
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageEncoder.java?rev=903719&r1=903718&r2=903719&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageEncoder.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageEncoder.java
Wed Jan 27 16:38:47 2010
@@ -26,7 +26,7 @@
 import org.apache.directory.shared.asn1.codec.EncoderException;
 import org.apache.directory.shared.asn1.codec.stateful.EncoderCallback;
 import org.apache.directory.shared.asn1.codec.stateful.EncoderMonitor;
-import org.apache.directory.shared.ldap.codec.TwixTransformer;
+import org.apache.directory.shared.ldap.codec.LdapTransformer;
 import org.apache.directory.shared.ldap.message.spi.Provider;
 import org.apache.directory.shared.ldap.message.spi.ProviderEncoder;
 import org.apache.directory.shared.ldap.message.spi.ProviderException;
@@ -71,7 +71,7 @@
     public void encodeBlocking( Object lock, OutputStream out, Object obj ) throws ProviderException
     {
         // transform to build provider specific intermediate envelope
-        Object providerEnvelope = TwixTransformer.transform( ( InternalMessage ) obj );
+        Object providerEnvelope = LdapTransformer.transform( ( InternalMessage ) obj );
 
         // now encode provider's intermediate stub into a PDU onto stream
         this.encoder.encodeBlocking( lock, out, providerEnvelope );
@@ -84,7 +84,7 @@
     public ByteBuffer encodeBlocking( Object obj ) throws ProviderException
     {
         // transform to build provider specific intermediate envelope
-        Object providerEnvelope = TwixTransformer.transform( ( InternalMessage ) obj );
+        Object providerEnvelope = LdapTransformer.transform( ( InternalMessage ) obj );
 
         // now encode provider's intermediate stub into PDU in a byte buffer
         return this.encoder.encodeBlocking( providerEnvelope );
@@ -118,7 +118,7 @@
     public void encode( Object obj ) throws EncoderException
     {
         // transform to build provider specific intermediate envelope
-        Object providerEnvelope = TwixTransformer.transform( ( InternalMessage ) obj );
+        Object providerEnvelope = LdapTransformer.transform( ( InternalMessage ) obj );
 
         // now give intermediate envelope to provider's encoder
         this.encoder.encode( providerEnvelope );



Mime
View raw message