You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2014/03/18 18:08:35 UTC
svn commit: r1578968 [1/2] - in /directory:
apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/
apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/
apac...
Author: elecharny
Date: Tue Mar 18 17:08:34 2014
New Revision: 1578968
URL: http://svn.apache.org/r1578968
Log:
o Removed the AbstractAsn1Object class
o Renamed the CertGenerationObject class to CertGeneration
Added:
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequestImpl.java
- copied unchanged from r1578548, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequestImpl.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyResponseImpl.java
- copied unchanged from r1578361, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyResponseImpl.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequestImpl.java
- copied, changed from r1578548, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequestImpl.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureResponseImpl.java
- copied, changed from r1578361, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureResponseImpl.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGeneration.java
- copied, changed from r1578361, directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationObject.java
Removed:
directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/api/asn1/AbstractAsn1Object.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationObject.java
Modified:
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosEncoder.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddresses.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbSafeBody.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReq.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/MethodData.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TransitedEncoding.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TypedData.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ChangePasswdData.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KerberosMessage.java
directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/codec/MinaKerberosEncoder.java
directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/api/asn1/Asn1Object.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ControlDecorator.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/MessageDecorator.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonRequestDecorator.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/Cancel.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationDecoder.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulAction.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnect.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdown.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequest.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponse.java
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosEncoder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosEncoder.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosEncoder.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosEncoder.java Tue Mar 18 17:08:34 2014
@@ -23,7 +23,7 @@ package org.apache.directory.server.kerb
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
@@ -32,26 +32,26 @@ import org.apache.directory.api.asn1.Enc
*/
public class KerberosEncoder
{
- public static ByteBuffer encode( AbstractAsn1Object asn1Obj, boolean isTcp ) throws IOException
+ public static ByteBuffer encode( Asn1Object asn1Obj, boolean isTcp ) throws IOException
{
ByteBuffer kerberosMessage = null;
int responseLength = asn1Obj.computeLength();
-
+
int bufferLen = responseLength;
-
+
if ( isTcp )
{
bufferLen += 4;
}
-
+
kerberosMessage = ByteBuffer.allocate( bufferLen );
- if( isTcp )
+ if ( isTcp )
{
kerberosMessage.putInt( responseLength );
}
-
+
try
{
asn1Obj.encode( kerberosMessage );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java Tue Mar 18 17:08:34 2014
@@ -26,7 +26,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
@@ -76,7 +76,7 @@ public class CipherTextHandler
* @return The Kerberos EncryptedData.
* @throws KerberosException
*/
- public EncryptedData seal( EncryptionKey key, AbstractAsn1Object message, KeyUsage usage ) throws KerberosException
+ public EncryptedData seal( EncryptionKey key, Asn1Object message, KeyUsage usage ) throws KerberosException
{
try
{
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java Tue Mar 18 17:08:34 2014
@@ -23,7 +23,7 @@ package org.apache.directory.shared.kerb
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class AdAndOr extends AbstractAsn1Object
+public class AdAndOr implements Asn1Object
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( AdAndOr.class );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java Tue Mar 18 17:08:34 2014
@@ -23,7 +23,7 @@ package org.apache.directory.shared.kerb
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class AdKdcIssued extends AbstractAsn1Object
+public class AdKdcIssued implements Asn1Object
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( AdKdcIssued.class );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java Tue Mar 18 17:08:34 2014
@@ -26,7 +26,7 @@ import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
*</pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class AuthorizationData extends AbstractAsn1Object
+public class AuthorizationData implements Asn1Object
{
/** The list of AuthorizationData elements */
private List<AuthorizationDataEntry> authorizationData = new ArrayList<AuthorizationDataEntry>();
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java Tue Mar 18 17:08:34 2014
@@ -24,7 +24,7 @@ import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
import java.util.Arrays;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class Checksum extends AbstractAsn1Object
+public class Checksum implements Asn1Object
{
/** The logger */
private static final Logger log = LoggerFactory.getLogger( Checksum.class );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java Tue Mar 18 17:08:34 2014
@@ -26,7 +26,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
*</pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ETypeInfo extends AbstractAsn1Object
+public class ETypeInfo implements Asn1Object
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( ETypeInfo.class );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java Tue Mar 18 17:08:34 2014
@@ -26,7 +26,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
*</pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ETypeInfo2 extends AbstractAsn1Object
+public class ETypeInfo2 implements Asn1Object
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( ETypeInfo2.class );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java Tue Mar 18 17:08:34 2014
@@ -23,7 +23,7 @@ package org.apache.directory.shared.kerb
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ETypeInfo2Entry extends AbstractAsn1Object
+public class ETypeInfo2Entry implements Asn1Object
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( ETypeInfo2Entry.class );
@@ -81,12 +81,13 @@ public class ETypeInfo2Entry extends Abs
{
}
-
+
public ETypeInfo2Entry( EncryptionType etype )
{
this.etype = etype;
}
+
/**
* Returns the salt.
*
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java Tue Mar 18 17:08:34 2014
@@ -23,7 +23,7 @@ package org.apache.directory.shared.kerb
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ETypeInfoEntry extends AbstractAsn1Object
+public class ETypeInfoEntry implements Asn1Object
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( ETypeInfoEntry.class );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java Tue Mar 18 17:08:34 2014
@@ -23,7 +23,7 @@ package org.apache.directory.shared.kerb
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class EncKdcRepPart extends AbstractAsn1Object
+public class EncKdcRepPart implements Asn1Object
{
/** The logger */
private static final Logger log = LoggerFactory.getLogger( EncKdcRepPart.class );
@@ -548,7 +548,7 @@ public class EncKdcRepPart extends Abstr
buffer.put( ( byte ) KerberosConstants.ENC_KDC_REP_PART_KEY_EXPIRATION_TAG );
buffer.put( TLV.getBytes( 0x11 ) );
- buffer.put( ( byte ) UniversalTag.GENERALIZED_TIME.getValue() );
+ buffer.put( UniversalTag.GENERALIZED_TIME.getValue() );
buffer.put( ( byte ) 0x0F );
buffer.put( keyExpiration.getBytes() );
}
@@ -561,7 +561,7 @@ public class EncKdcRepPart extends Abstr
// The authtime
buffer.put( ( byte ) KerberosConstants.ENC_KDC_REP_PART_AUTH_TIME_TAG );
buffer.put( TLV.getBytes( 0x11 ) );
- buffer.put( ( byte ) UniversalTag.GENERALIZED_TIME.getValue() );
+ buffer.put( UniversalTag.GENERALIZED_TIME.getValue() );
buffer.put( ( byte ) 0x0F );
buffer.put( authTime.getBytes() );
@@ -570,7 +570,7 @@ public class EncKdcRepPart extends Abstr
{
buffer.put( ( byte ) KerberosConstants.ENC_KDC_REP_PART_START_TIME_TAG );
buffer.put( TLV.getBytes( 0x11 ) );
- buffer.put( ( byte ) UniversalTag.GENERALIZED_TIME.getValue() );
+ buffer.put( UniversalTag.GENERALIZED_TIME.getValue() );
buffer.put( ( byte ) 0x0F );
buffer.put( startTime.getBytes() );
}
@@ -578,7 +578,7 @@ public class EncKdcRepPart extends Abstr
// The endtime
buffer.put( ( byte ) KerberosConstants.ENC_KDC_REP_PART_END_TIME_TAG );
buffer.put( TLV.getBytes( 0x11 ) );
- buffer.put( ( byte ) UniversalTag.GENERALIZED_TIME.getValue() );
+ buffer.put( UniversalTag.GENERALIZED_TIME.getValue() );
buffer.put( ( byte ) 0x0F );
buffer.put( endTime.getBytes() );
@@ -587,7 +587,7 @@ public class EncKdcRepPart extends Abstr
{
buffer.put( ( byte ) KerberosConstants.ENC_KDC_REP_PART_RENEW_TILL_TAG );
buffer.put( TLV.getBytes( 0x11 ) );
- buffer.put( ( byte ) UniversalTag.GENERALIZED_TIME.getValue() );
+ buffer.put( UniversalTag.GENERALIZED_TIME.getValue() );
buffer.put( ( byte ) 0x0F );
buffer.put( renewTill.getBytes() );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java Tue Mar 18 17:08:34 2014
@@ -26,7 +26,7 @@ import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class EncKrbCredPart extends AbstractAsn1Object
+public class EncKrbCredPart implements Asn1Object
{
/** The logger */
private static final Logger log = LoggerFactory.getLogger( EncKrbCredPart.class );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java Tue Mar 18 17:08:34 2014
@@ -24,7 +24,7 @@ package org.apache.directory.shared.kerb
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
//NOTE: this ASN.1 structure is quite identical to KrbSafeBody
-public class EncKrbPrivPart extends AbstractAsn1Object
+public class EncKrbPrivPart implements Asn1Object
{
/** The logger */
private static final Logger log = LoggerFactory.getLogger( EncKrbPrivPart.class );
@@ -316,7 +316,7 @@ public class EncKrbPrivPart extends Abst
buffer.put( TLV.getBytes( timestampLen ) );
// timestamp value
- buffer.put( ( byte ) UniversalTag.GENERALIZED_TIME.getValue() );
+ buffer.put( UniversalTag.GENERALIZED_TIME.getValue() );
buffer.put( ( byte ) 0x0F );
buffer.put( timestamp.getBytes() );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java Tue Mar 18 17:08:34 2014
@@ -24,7 +24,7 @@ package org.apache.directory.shared.kerb
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class EncTicketPart extends AbstractAsn1Object
+public class EncTicketPart implements Asn1Object
{
/** The logger */
private static final Logger log = LoggerFactory.getLogger( EncTicketPart.class );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java Tue Mar 18 17:08:34 2014
@@ -24,7 +24,7 @@ import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
import java.util.Arrays;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
*</pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class EncryptedData extends AbstractAsn1Object
+public class EncryptedData implements Asn1Object
{
/** The logger */
private static final Logger log = LoggerFactory.getLogger( EncryptedData.class );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java Tue Mar 18 17:08:34 2014
@@ -24,7 +24,7 @@ import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
import java.util.Arrays;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class EncryptionKey extends AbstractAsn1Object
+public class EncryptionKey implements Asn1Object
{
/** The logger */
private static final Logger log = LoggerFactory.getLogger( EncryptionKey.class );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java Tue Mar 18 17:08:34 2014
@@ -26,7 +26,7 @@ import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
import java.util.Arrays;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class HostAddress extends AbstractAsn1Object
+public class HostAddress implements Asn1Object
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( HostAddress.class );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddresses.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddresses.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddresses.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddresses.java Tue Mar 18 17:08:34 2014
@@ -26,7 +26,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
*</pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class HostAddresses extends AbstractAsn1Object
+public class HostAddresses implements Asn1Object
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( HostAddresses.class );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java Tue Mar 18 17:08:34 2014
@@ -26,7 +26,7 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -66,7 +66,7 @@ import org.apache.directory.shared.kerbe
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class KdcReqBody extends AbstractAsn1Object
+public class KdcReqBody implements Asn1Object
{
/** The KDC options */
private KdcOptions kdcOptions;
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java Tue Mar 18 17:08:34 2014
@@ -24,7 +24,7 @@ package org.apache.directory.shared.kerb
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class KrbCredInfo extends AbstractAsn1Object
+public class KrbCredInfo implements Asn1Object
{
/** The logger */
private static final Logger log = LoggerFactory.getLogger( KrbCredInfo.class );
@@ -299,7 +299,7 @@ public class KrbCredInfo extends Abstrac
buffer.put( ( byte ) KerberosConstants.KRB_CRED_INFO_AUTHTIME_TAG );
buffer.put( TLV.getBytes( authTimeLen ) );
- buffer.put( ( byte ) UniversalTag.GENERALIZED_TIME.getValue() );
+ buffer.put( UniversalTag.GENERALIZED_TIME.getValue() );
buffer.put( ( byte ) 0x0F );
buffer.put( authTimeBytes );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbSafeBody.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbSafeBody.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbSafeBody.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbSafeBody.java Tue Mar 18 17:08:34 2014
@@ -24,7 +24,7 @@ package org.apache.directory.shared.kerb
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory;
*</pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class KrbSafeBody extends AbstractAsn1Object
+public class KrbSafeBody implements Asn1Object
{
/** The logger */
private static final Logger log = LoggerFactory.getLogger( KrbSafeBody.class );
@@ -313,7 +313,7 @@ public class KrbSafeBody extends Abstrac
buffer.put( TLV.getBytes( timestampLen ) );
// timestamp value
- buffer.put( ( byte ) UniversalTag.GENERALIZED_TIME.getValue() );
+ buffer.put( UniversalTag.GENERALIZED_TIME.getValue() );
buffer.put( ( byte ) 0x0F );
buffer.put( timestamp.getBytes() );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReq.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReq.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReq.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReq.java Tue Mar 18 17:08:34 2014
@@ -25,7 +25,7 @@ import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class LastReq extends AbstractAsn1Object
+public class LastReq implements Asn1Object
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( LastReq.class );
@@ -247,7 +247,7 @@ public class LastReq extends AbstractAsn
buffer.put( TLV.getBytes( lrValueTagLen[i] ) );
// the lrValue value
- buffer.put( ( byte ) UniversalTag.GENERALIZED_TIME.getValue() );
+ buffer.put( UniversalTag.GENERALIZED_TIME.getValue() );
buffer.put( ( byte ) 0x0F );
buffer.put( lre.getLrValue().getBytes() );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/MethodData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/MethodData.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/MethodData.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/MethodData.java Tue Mar 18 17:08:34 2014
@@ -25,7 +25,7 @@ import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
*</pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class MethodData extends AbstractAsn1Object
+public class MethodData implements Asn1Object
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( MethodData.class );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java Tue Mar 18 17:08:34 2014
@@ -23,7 +23,7 @@ package org.apache.directory.shared.kerb
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class PaData extends AbstractAsn1Object
+public class PaData implements Asn1Object
{
/** The logger */
private static final Logger log = LoggerFactory.getLogger( PaData.class );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java Tue Mar 18 17:08:34 2014
@@ -23,7 +23,7 @@ package org.apache.directory.shared.kerb
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class PaEncTsEnc extends AbstractAsn1Object
+public class PaEncTsEnc implements Asn1Object
{
/** The logger */
private static final Logger log = LoggerFactory.getLogger( PaEncTsEnc.class );
@@ -201,7 +201,7 @@ public class PaEncTsEnc extends Abstract
buffer.put( ( byte ) KerberosConstants.PA_ENC_TS_ENC_PA_TIMESTAMP_TAG );
buffer.put( ( byte ) 0x11 );
- buffer.put( ( byte ) UniversalTag.GENERALIZED_TIME.getValue() );
+ buffer.put( UniversalTag.GENERALIZED_TIME.getValue() );
buffer.put( ( byte ) 0x0F );
buffer.put( patimestamp.getBytes() );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java Tue Mar 18 17:08:34 2014
@@ -93,7 +93,7 @@ import java.util.List;
import javax.security.auth.kerberos.KerberosPrincipal;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -117,7 +117,7 @@ import org.slf4j.LoggerFactory;
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class PrincipalName extends AbstractAsn1Object
+public class PrincipalName implements Asn1Object
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( PrincipalName.class );
@@ -190,7 +190,7 @@ public class PrincipalName extends Abstr
this.nameType = nameType;
}
-
+
/**
* Creates a new instance of PrincipalName given a String[] and an
* principal type.
@@ -200,22 +200,22 @@ public class PrincipalName extends Abstr
*/
public PrincipalName( String[] nameParts, int nameType )
{
- if ( nameParts == null || nameParts.length == 0 )
- {
- throw new IllegalArgumentException("Empty name parts");
- }
-
- List<String> nameComponents = new ArrayList<String>();
- for ( String np : nameParts )
- {
- nameComponents.add( np );
- }
-
+ if ( nameParts == null || nameParts.length == 0 )
+ {
+ throw new IllegalArgumentException( "Empty name parts" );
+ }
+
+ List<String> nameComponents = new ArrayList<String>();
+ for ( String np : nameParts )
+ {
+ nameComponents.add( np );
+ }
+
this.nameString = nameComponents;
this.nameType = PrincipalNameType.getTypeByValue( nameType );;
}
-
-
+
+
/**
* Creates a new instance of PrincipalName.
*
@@ -267,24 +267,27 @@ public class PrincipalName extends Abstr
this.nameType = PrincipalNameType.getTypeByValue( nameType );
}
+
/**
* Set the realm for the principal
* @param realm the realm of the principal
*/
public void setRealm( String realm )
{
- this.realm = realm;
+ this.realm = realm;
}
-
+
+
/**
* Get the realm for the principal
* @return realm the realm of the principal
*/
public String getRealm()
{
- return realm;
+ return realm;
}
-
+
+
/**
* Returns the name components.
*
@@ -535,11 +538,11 @@ public class PrincipalName extends Abstr
if ( realm != null )
{
- sb.append( "realm: " ).append( realm );
+ sb.append( "realm: " ).append( realm );
}
-
+
sb.append( " }" );
-
+
return sb.toString();
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TransitedEncoding.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TransitedEncoding.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TransitedEncoding.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TransitedEncoding.java Tue Mar 18 17:08:34 2014
@@ -24,7 +24,7 @@ import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
import java.util.Arrays;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class TransitedEncoding extends AbstractAsn1Object
+public class TransitedEncoding implements Asn1Object
{
/** The logger */
private static final Logger log = LoggerFactory.getLogger( TransitedEncoding.class );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TypedData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TypedData.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TypedData.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TypedData.java Tue Mar 18 17:08:34 2014
@@ -26,7 +26,7 @@ import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class TypedData extends AbstractAsn1Object
+public class TypedData implements Asn1Object
{
// The inner class storing the individual TDs
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ChangePasswdData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ChangePasswdData.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ChangePasswdData.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ChangePasswdData.java Tue Mar 18 17:08:34 2014
@@ -22,7 +22,7 @@ package org.apache.directory.shared.kerb
import java.nio.ByteBuffer;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -43,7 +43,7 @@ import org.apache.directory.shared.kerbe
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ChangePasswdData extends AbstractAsn1Object
+public class ChangePasswdData implements Asn1Object
{
/** the new password */
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KerberosMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KerberosMessage.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KerberosMessage.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KerberosMessage.java Tue Mar 18 17:08:34 2014
@@ -20,7 +20,7 @@
package org.apache.directory.shared.kerberos.messages;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
@@ -28,7 +28,7 @@ import org.apache.directory.shared.kerbe
/**
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class KerberosMessage extends AbstractAsn1Object
+public abstract class KerberosMessage implements Asn1Object
{
/** The protocol version (should be 5) */
private int protocolVersionNumber = KerberosConstants.KERBEROS_V5;
Modified: directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/codec/MinaKerberosEncoder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/codec/MinaKerberosEncoder.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/codec/MinaKerberosEncoder.java (original)
+++ directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/codec/MinaKerberosEncoder.java Tue Mar 18 17:08:34 2014
@@ -22,7 +22,7 @@ package org.apache.directory.server.kerb
import java.nio.ByteBuffer;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
@@ -38,7 +38,7 @@ public class MinaKerberosEncoder extends
@Override
public void encode( IoSession session, Object message, ProtocolEncoderOutput out ) throws Exception
{
- AbstractAsn1Object asn1Obj = ( AbstractAsn1Object ) message;
+ Asn1Object asn1Obj = ( Asn1Object ) message;
boolean isTcp = !session.getTransportMetadata().isConnectionless();
ByteBuffer encodedByteBuf = KerberosEncoder.encode( asn1Obj, isTcp );
Modified: directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/api/asn1/Asn1Object.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/api/asn1/Asn1Object.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/api/asn1/Asn1Object.java (original)
+++ directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/api/asn1/Asn1Object.java Tue Mar 18 17:08:34 2014
@@ -31,15 +31,6 @@ import java.nio.ByteBuffer;
public interface Asn1Object
{
/**
- * Add a length to the object
- *
- * @param length The length to add.
- * @throws DecoderException Thrown if the current length exceed the expected length
- */
- void addLength( int length ) throws DecoderException;
-
-
- /**
* Compute the object length, which is the sum of all inner length.
*
* @return The object's computed length
@@ -55,45 +46,4 @@ public interface Asn1Object
* @throws EncoderException if the buffer can't be encoded
*/
ByteBuffer encode( ByteBuffer buffer ) throws EncoderException;
-
-
- /**
- * Get the current object length, which is the sum of all inner length
- * already decoded.
- *
- * @return The current object's length
- */
- int getCurrentLength();
-
-
- /**
- * Get the expected object length.
- *
- * @return The expected object's length
- */
- int getExpectedLength();
-
-
- /**
- * Get the parent
- *
- * @return Returns the parent.
- */
- Asn1Object getParent();
-
-
- /**
- * Set the current length
- *
- * @param currentLength The currentLength to set.
- */
- void setCurrentLength( int currentLength );
-
-
- /**
- * Set the expected length
- *
- * @param expectedLength The expectedLength to set.
- */
- void setExpectedLength( int expectedLength );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ControlDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ControlDecorator.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ControlDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ControlDecorator.java Tue Mar 18 17:08:34 2014
@@ -20,7 +20,7 @@
package org.apache.directory.api.ldap.codec.api;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.ldap.model.message.Control;
@@ -32,7 +32,7 @@ import org.apache.directory.api.ldap.mod
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @param <E>
*/
-public abstract class ControlDecorator<E extends Control> extends AbstractAsn1Object implements CodecControl<E>
+public abstract class ControlDecorator<E extends Control> implements CodecControl<E>, Asn1Object
{
/** The decorated Control */
private E decorated;
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/MessageDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/MessageDecorator.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/MessageDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/MessageDecorator.java Tue Mar 18 17:08:34 2014
@@ -23,6 +23,7 @@ package org.apache.directory.api.ldap.co
import java.util.HashMap;
import java.util.Map;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.ldap.codec.decorators.AbandonRequestDecorator;
import org.apache.directory.api.ldap.codec.decorators.AddRequestDecorator;
import org.apache.directory.api.ldap.codec.decorators.AddResponseDecorator;
@@ -74,7 +75,7 @@ import org.apache.directory.api.ldap.mod
* @TODO make this class abstract, after finishing switch and all types and make default blow an EncoderException
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class MessageDecorator<E extends Message> implements Message, Decorator<E>
+public abstract class MessageDecorator<E extends Message> implements Message, Decorator<E>, Asn1Object
{
/** The decorated Control */
private final E decoratedMessage;
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonRequestDecorator.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonRequestDecorator.java Tue Mar 18 17:08:34 2014
@@ -37,8 +37,7 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public final class AbandonRequestDecorator extends RequestDecorator<AbandonRequest>
- implements AbandonRequest
+public final class AbandonRequestDecorator extends RequestDecorator<AbandonRequest> implements AbandonRequest
{
/**
* Makes a AddRequest a MessageDecorator.
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java Tue Mar 18 17:08:34 2014
@@ -40,8 +40,7 @@ import org.apache.directory.api.util.Str
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class BindRequestDecorator extends SingleReplyRequestDecorator<BindRequest>
- implements BindRequest
+public class BindRequestDecorator extends SingleReplyRequestDecorator<BindRequest> implements BindRequest
{
/** The bind request length */
private int bindRequestLength;
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java Tue Mar 18 17:08:34 2014
@@ -496,8 +496,7 @@ public class DefaultLdapCodecService imp
}
else
{
- req = new ExtendedRequestDecorator<ExtendedRequest>( this,
- decoratedMessage );
+ req = new ExtendedRequestDecorator<ExtendedRequest>( this, decoratedMessage );
}
return req;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequestImpl.java (from r1578548, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequestImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequestImpl.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequestImpl.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequestImpl.java&r1=1578548&r2=1578968&rev=1578968&view=diff
==============================================================================
(empty)
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureResponseImpl.java (from r1578361, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureResponseImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureResponseImpl.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureResponseImpl.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureResponseImpl.java&r1=1578361&r2=1578968&rev=1578968&view=diff
==============================================================================
(empty)
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/Cancel.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/Cancel.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/Cancel.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/Cancel.java Tue Mar 18 17:08:34 2014
@@ -22,7 +22,7 @@ package org.apache.directory.api.ldap.ex
import java.nio.ByteBuffer;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
@@ -44,7 +44,7 @@ import org.apache.directory.api.ldap.ext
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class Cancel extends AbstractAsn1Object
+public class Cancel implements Asn1Object
{
/** The Id of the the message to cancel */
private CancelRequest cancelRequest;
@@ -115,15 +115,29 @@ public class Cancel extends AbstractAsn1
/**
+ * {@inheritDoc}
+ */
+ public ByteBuffer encode() throws EncoderException
+ {
+ // Allocate the bytes buffer.
+ ByteBuffer bb = ByteBuffer.allocate( computeLength() );
+
+ return encode( bb );
+ }
+
+
+ /**
* Encodes the cancel extended operation.
*
* @return A ByteBuffer that contains the encoded PDU
* @throws org.apache.directory.api.asn1.EncoderException If anything goes wrong.
*/
- public ByteBuffer encode() throws EncoderException
+ public ByteBuffer encode( ByteBuffer bb ) throws EncoderException
{
- // Allocate the bytes buffer.
- ByteBuffer bb = ByteBuffer.allocate( computeLength() );
+ if ( bb == null )
+ {
+ throw new EncoderException( "Null ByteBuffer, cannot encode " + this );
+ }
// The sequence
bb.put( UniversalTag.SEQUENCE.getValue() );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java Tue Mar 18 17:08:34 2014
@@ -20,8 +20,14 @@
package org.apache.directory.api.ldap.extras.extended.ads_impl.cancel;
+import java.nio.ByteBuffer;
+
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.asn1.EncoderException;
+import org.apache.directory.api.asn1.ber.tlv.BerValue;
+import org.apache.directory.api.asn1.ber.tlv.TLV;
+import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
@@ -36,32 +42,39 @@ import org.slf4j.LoggerFactory;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CancelRequestDecorator extends ExtendedRequestDecorator<CancelRequest> implements
- CancelRequest
+ CancelRequest, Asn1Object
{
private static final Logger LOG = LoggerFactory.getLogger( CancelRequestDecorator.class );
+ /** The Id of the the message to cancel */
+ private CancelRequest cancelRequest;
+
+ /** Length of the sequence */
+ private int cancelSequenceLength;
+
public CancelRequestDecorator( LdapApiService codec, CancelRequest decoratedMessage )
{
super( codec, decoratedMessage );
+ this.cancelRequest = decoratedMessage;
}
public int getCancelId()
{
- return getDecorated().getCancelId();
+ return cancelRequest.getCancelId();
}
public void setCancelId( int cancelId )
{
- if ( cancelId == getCancelId() )
+ if ( cancelId == cancelRequest.getCancelId() )
{
return;
}
this.requestValue = null;
- getDecorated().setCancelId( cancelId );
+ cancelRequest.setCancelId( cancelId );
}
@@ -75,10 +88,7 @@ public class CancelRequestDecorator exte
{
try
{
- Cancel cancel = new Cancel();
- cancel.setCancelId( getDecorated().getCancelId() );
-
- requestValue = cancel.encode().array();
+ requestValue = encode().array();
}
catch ( EncoderException e )
{
@@ -115,7 +125,7 @@ public class CancelRequestDecorator exte
this.requestValue = null;
}
- getDecorated().setCancelId( cancel.getCancelId() );
+ cancelRequest.setCancelId( cancel.getCancelId() );
}
catch ( DecoderException e )
{
@@ -123,4 +133,43 @@ public class CancelRequestDecorator exte
throw new RuntimeException( e );
}
}
+
+
+ /**
+ * Compute the Cancel length
+ *
+ * 0x30 L1
+ * |
+ * +--> 0x02 0x0(1-4) [0..2^31-1]
+ */
+ public int computeLength()
+ {
+ // The messageId length
+ cancelSequenceLength = 1 + 1 + BerValue.getNbBytes( cancelRequest.getCancelId() );
+
+ // Add the sequence and the length
+ return 1 + 1 + cancelSequenceLength;
+ }
+
+
+ /**
+ * Encodes the cancel extended operation.
+ *
+ * @return A ByteBuffer that contains the encoded PDU
+ * @throws org.apache.directory.api.asn1.EncoderException If anything goes wrong.
+ */
+ public ByteBuffer encode() throws EncoderException
+ {
+ // Allocate the bytes buffer.
+ ByteBuffer bb = ByteBuffer.allocate( computeLength() );
+
+ // The sequence
+ bb.put( UniversalTag.SEQUENCE.getValue() );
+ bb.put( TLV.getBytes( cancelSequenceLength ) );
+
+ // The messageId
+ BerValue.encode( bb, cancelRequest.getCancelId() );
+
+ return bb;
+ }
}
Copied: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGeneration.java (from r1578361, directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationObject.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGeneration.java?p2=directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGeneration.java&p1=directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationObject.java&r1=1578361&r2=1578968&rev=1578968&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationObject.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGeneration.java Tue Mar 18 17:08:34 2014
@@ -22,7 +22,7 @@ package org.apache.directory.api.ldap.ex
import java.nio.ByteBuffer;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
@@ -45,12 +45,12 @@ import org.apache.directory.api.util.Str
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class CertGenerationObject extends AbstractAsn1Object
+public class CertGeneration implements Asn1Object
{
private CertGenerationRequest request;
- public CertGenerationObject( CertGenerationRequest request )
+ public CertGeneration( CertGenerationRequest request )
{
this.request = request;
}
@@ -80,10 +80,25 @@ public class CertGenerationObject extend
}
+ /**
+ * {@inheritDoc}
+ */
public ByteBuffer encode() throws EncoderException
{
+ // Allocate the bytes buffer.
ByteBuffer bb = ByteBuffer.allocate( computeLength() );
+ return encode( bb );
+ }
+
+
+ public ByteBuffer encode( ByteBuffer bb ) throws EncoderException
+ {
+ if ( bb == null )
+ {
+ throw new EncoderException( "Null ByteBuffer, cannot encode " + this );
+ }
+
bb.put( UniversalTag.SEQUENCE.getValue() );
bb.put( BerValue.getBytes( requestLength ) );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationDecoder.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationDecoder.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationDecoder.java Tue Mar 18 17:08:34 2014
@@ -28,7 +28,6 @@ import org.apache.directory.api.asn1.ber
/**
- *
* A decoder for CertGenerationObject.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java Tue Mar 18 17:08:34 2014
@@ -42,17 +42,17 @@ public class CertGenerationRequestDecora
{
private static final Logger LOG = LoggerFactory.getLogger( CertGenerationRequestDecorator.class );
- private CertGenerationObject certGenObj;
+ private CertGeneration certGenObj;
public CertGenerationRequestDecorator( LdapApiService codec, CertGenerationRequest decoratedMessage )
{
super( codec, decoratedMessage );
- certGenObj = new CertGenerationObject( decoratedMessage );
+ certGenObj = new CertGeneration( decoratedMessage );
}
- public CertGenerationObject getCertGenerationObject()
+ public CertGeneration getCertGenerationObject()
{
return certGenObj;
}
@@ -68,7 +68,7 @@ public class CertGenerationRequestDecora
try
{
- certGenObj = ( CertGenerationObject ) decoder.decode( requestValue );
+ certGenObj = ( CertGeneration ) decoder.decode( requestValue );
if ( requestValue != null )
{
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulAction.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulAction.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulAction.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulAction.java Tue Mar 18 17:08:34 2014
@@ -21,7 +21,7 @@
package org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect;
-import org.apache.directory.api.asn1.AbstractAsn1Object;
+import org.apache.directory.api.asn1.Asn1Object;
/**
@@ -29,7 +29,7 @@ import org.apache.directory.api.asn1.Abs
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class GracefulAction extends AbstractAsn1Object
+public abstract class GracefulAction implements Asn1Object
{
/** Undetermined value used for timeOffline */
public static final int UNDETERMINED = 0;
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnect.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnect.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnect.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnect.java Tue Mar 18 17:08:34 2014
@@ -146,15 +146,29 @@ public class GracefulDisconnect extends
/**
+ * {@inheritDoc}
+ */
+ public ByteBuffer encode() throws EncoderException
+ {
+ // Allocate the bytes buffer.
+ ByteBuffer bb = ByteBuffer.allocate( computeLength() );
+
+ return encode( bb );
+ }
+
+
+ /**
* Encodes the gracefulDisconnect extended operation.
*
* @return A ByteBuffer that contains the encoded PDU
* @throws org.apache.directory.api.asn1.EncoderException If anything goes wrong.
*/
- public ByteBuffer encode() throws EncoderException
+ public ByteBuffer encode( ByteBuffer bb ) throws EncoderException
{
- // Allocate the bytes buffer.
- ByteBuffer bb = ByteBuffer.allocate( computeLength() );
+ if ( bb == null )
+ {
+ throw new EncoderException( "Null ByteBuffer, cannot encode " + this );
+ }
bb.put( UniversalTag.SEQUENCE.getValue() );
bb.put( TLV.getBytes( gracefulDisconnectSequenceLength ) );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdown.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdown.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdown.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdown.java Tue Mar 18 17:08:34 2014
@@ -89,15 +89,29 @@ public class GracefulShutdown extends Gr
/**
+ * {@inheritDoc}
+ */
+ public ByteBuffer encode() throws EncoderException
+ {
+ // Allocate the bytes buffer.
+ ByteBuffer bb = ByteBuffer.allocate( computeLength() );
+
+ return encode( bb );
+ }
+
+
+ /**
* Encodes the gracefulShutdown extended operation.
*
* @return A ByteBuffer that contains the encoded PDU
* @throws org.apache.directory.api.asn1.EncoderException If anything goes wrong.
*/
- public ByteBuffer encode() throws EncoderException
+ public ByteBuffer encode( ByteBuffer bb ) throws EncoderException
{
- // Allocate the bytes buffer.
- ByteBuffer bb = ByteBuffer.allocate( computeLength() );
+ if ( bb == null )
+ {
+ throw new EncoderException( "Null ByteBuffer, cannot encode " + this );
+ }
bb.put( UniversalTag.SEQUENCE.getValue() );
bb.put( TLV.getBytes( gracefulSequenceLength ) );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java?rev=1578968&r1=1578967&r2=1578968&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java Tue Mar 18 17:08:34 2014
@@ -35,8 +35,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class GracefulShutdownRequestDecorator extends
- ExtendedRequestDecorator<GracefulShutdownRequest>
+public class GracefulShutdownRequestDecorator extends ExtendedRequestDecorator<GracefulShutdownRequest>
implements GracefulShutdownRequest
{
private static final Logger LOG = LoggerFactory.getLogger( GracefulShutdownRequestDecorator.class );