directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r1041759 - in /directory/apacheds/branches/apacheds-kerberos-codec-2.0: kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/ kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages...
Date Fri, 03 Dec 2010 10:19:53 GMT
Author: kayyagari
Date: Fri Dec  3 10:19:52 2010
New Revision: 1041759

URL: http://svn.apache.org/viewvc?rev=1041759&view=rev
Log:
o removed KdcReqBody/Modifier

Removed:
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/RequestBody.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/RequestBodyModifier.java
Modified:
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/KdcRequestDecoder.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/KdcRequest.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingEncryptionTypeTest.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/KdcRequestDecoder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/KdcRequestDecoder.java?rev=1041759&r1=1041758&r2=1041759&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/KdcRequestDecoder.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/KdcRequestDecoder.java
Fri Dec  3 10:19:52 2010
@@ -27,7 +27,7 @@ import java.util.Enumeration;
 import org.apache.directory.server.kerberos.shared.KerberosConstants;
 import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
 import org.apache.directory.server.kerberos.shared.messages.value.KdcOptions;
-import org.apache.directory.server.kerberos.shared.messages.value.RequestBody;
+import org.apache.directory.shared.kerberos.components.KdcReqBody;
 import org.apache.directory.server.kerberos.shared.messages.value.RequestBodyModifier;
 import org.apache.directory.shared.asn1.der.ASN1InputStream;
 import org.apache.directory.shared.asn1.der.DERApplicationSpecific;
@@ -82,7 +82,7 @@ public class KdcRequestDecoder
         KerberosMessageType msgType = null;
 
         PaData[] paData = null;
-        RequestBody requestBody = null;
+        KdcReqBody requestBody = null;
         byte[] bodyBytes = null;
 
         for ( Enumeration<DEREncodable> e = sequence.getObjects(); e.hasMoreElements();
)
@@ -146,9 +146,9 @@ public class KdcRequestDecoder
      -- Encrypted AuthorizationData encoding
      additional-tickets[11]       SEQUENCE OF Ticket OPTIONAL
      }*/
-    private RequestBody decodeRequestBody( DERSequence sequence ) throws IOException
+    private KdcReqBody decodeRequestBody( DERSequence sequence ) throws IOException
     {
-        RequestBodyModifier modifier = new RequestBodyModifier();
+        KdcReqBody kdcReqBody = new KdcReqBody();
 
         for ( Enumeration<DEREncodable> e = sequence.getObjects(); e.hasMoreElements();
)
         {
@@ -160,56 +160,56 @@ public class KdcRequestDecoder
             {
                 case 0:
                     DERBitString kdcOptions = ( DERBitString ) derObject;
-                    modifier.setKdcOptions( new KdcOptions( kdcOptions.getOctets() ) );
+                    kdcReqBody.setKdcOptions( new KdcOptions( kdcOptions.getOctets() ) );
                     break;
                 case 1:
                     DERSequence cName = ( DERSequence ) derObject;
-                    modifier.setClientName( PrincipalNameDecoder.decode( cName ) );
+                    kdcReqBody.setClientName( PrincipalNameDecoder.decode( cName ) );
                     break;
                 case 2:
                     DERGeneralString realm = ( DERGeneralString ) derObject;
-                    modifier.setRealm( realm.getString() );
+                    kdcReqBody.setRealm( realm.getString() );
                     break;
                 case 3:
                     DERSequence sname = ( DERSequence ) derObject;
-                    modifier.setServerName( PrincipalNameDecoder.decode( sname ) );
+                    kdcReqBody.setServerName( PrincipalNameDecoder.decode( sname ) );
                     break;
                 case 4:
                     DERGeneralizedTime from = ( DERGeneralizedTime ) derObject;
-                    modifier.setFrom( KerberosTimeDecoder.decode( from ) );
+                    kdcReqBody.setFrom( KerberosTimeDecoder.decode( from ) );
                     break;
                 case 5:
                     DERGeneralizedTime till = ( DERGeneralizedTime ) derObject;
-                    modifier.setTill( KerberosTimeDecoder.decode( till ) );
+                    kdcReqBody.setTill( KerberosTimeDecoder.decode( till ) );
                     break;
                 case 6:
                     DERGeneralizedTime rtime = ( DERGeneralizedTime ) derObject;
-                    modifier.setRtime( KerberosTimeDecoder.decode( rtime ) );
+                    kdcReqBody.setRtime( KerberosTimeDecoder.decode( rtime ) );
                     break;
                 case 7:
                     DERInteger nonce = ( DERInteger ) derObject;
-                    modifier.setNonce( nonce.intValue() );
+                    kdcReqBody.setNonce( nonce.intValue() );
                     break;
                 case 8:
                     DERSequence etype = ( DERSequence ) derObject;
-                    modifier.setEType( EncryptionTypeDecoder.decode( etype ) );
+                    kdcReqBody.setEType( EncryptionTypeDecoder.decode( etype ) );
                     break;
                     
                 case 9:
                     DERSequence hostAddresses = ( DERSequence ) derObject;
-                    modifier.setAddresses( HostAddressDecoder.decodeSequence( hostAddresses
) );
+                    kdcReqBody.setAddresses( HostAddressDecoder.decodeSequence( hostAddresses
) );
                     break;
                 case 10:
                     DERSequence encryptedData = ( DERSequence ) derObject;
-                    modifier.setEncAuthorizationData( EncryptedDataDecoder.decode( encryptedData
) );
+                    kdcReqBody.setEncAuthorizationData( EncryptedDataDecoder.decode( encryptedData
) );
                     break;
                 case 11:
                     DERSequence tag11 = ( DERSequence ) derObject;
-                    modifier.setAdditionalTickets( TicketDecoder.decodeSequence( tag11 )
);
+                    kdcReqBody.setAdditionalTickets( TicketDecoder.decodeSequence( tag11
) );
                     break;
             }
         }
 
-        return modifier.getRequestBody();
+        return kdcReqBody.getRequestBody();
     }
 }

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/KdcRequest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/KdcRequest.java?rev=1041759&r1=1041758&r2=1041759&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/KdcRequest.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/KdcRequest.java
Fri Dec  3 10:19:52 2010
@@ -25,7 +25,7 @@ import java.util.Set;
 import javax.security.auth.kerberos.KerberosPrincipal;
 
 import org.apache.directory.server.kerberos.shared.messages.value.KdcOptions;
-import org.apache.directory.server.kerberos.shared.messages.value.RequestBody;
+import org.apache.directory.shared.kerberos.components.KdcReqBody;
 import org.apache.directory.shared.kerberos.KerberosMessageType;
 import org.apache.directory.shared.kerberos.KerberosTime;
 import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
@@ -41,7 +41,7 @@ import org.apache.directory.shared.kerbe
 public class KdcRequest extends KerberosMessage
 {
     private PaData[] preAuthData; //optional
-    private RequestBody requestBody;
+    private KdcReqBody requestBody;
     private byte[] bodyBytes;
 
 
@@ -53,7 +53,7 @@ public class KdcRequest extends Kerberos
      * @param preAuthData
      * @param requestBody
      */
-    public KdcRequest( int pvno, KerberosMessageType messageType, PaData[] preAuthData, RequestBody
requestBody )
+    public KdcRequest( int pvno, KerberosMessageType messageType, PaData[] preAuthData, KdcReqBody
requestBody )
     {
         super( pvno, messageType );
         this.preAuthData = preAuthData;
@@ -70,7 +70,7 @@ public class KdcRequest extends Kerberos
      * @param requestBody
      * @param bodyBytes
      */
-    public KdcRequest( int pvno, KerberosMessageType messageType, PaData[] preAuthData, RequestBody
requestBody,
+    public KdcRequest( int pvno, KerberosMessageType messageType, PaData[] preAuthData, KdcReqBody
requestBody,
         byte[] bodyBytes )
     {
         this( pvno, messageType, preAuthData, requestBody );
@@ -94,7 +94,7 @@ public class KdcRequest extends Kerberos
      * 
      * @return The request body.
      */
-    public RequestBody getRequestBody()
+    public KdcReqBody getRequestBody()
     {
         return requestBody;
     }
@@ -112,7 +112,7 @@ public class KdcRequest extends Kerberos
     }
 
 
-    // RequestBody delegate methods
+    // KdcReqBody delegate methods
 
     /**
      * Returns additional {@link Ticket}s.
@@ -246,7 +246,7 @@ public class KdcRequest extends Kerberos
     }
 
 
-    // RequestBody KdcOptions delegate accesors
+    // KdcReqBody KdcOptions delegate accesors
 
     /**
      * Returns the option at the specified index.

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java?rev=1041759&r1=1041758&r2=1041759&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java
Fri Dec  3 10:19:52 2010
@@ -36,7 +36,7 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
 import org.apache.directory.server.kerberos.shared.messages.components.EncTicketPartModifier;
 import org.apache.directory.server.kerberos.shared.messages.value.ApOptions;
-import org.apache.directory.server.kerberos.shared.messages.value.RequestBody;
+import org.apache.directory.shared.kerberos.components.KdcReqBody;
 import org.apache.directory.server.kerberos.shared.messages.value.flags.TicketFlag;
 import org.apache.directory.server.kerberos.shared.messages.value.flags.TicketFlags;
 import org.apache.directory.shared.kerberos.KerberosMessageType;

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java?rev=1041759&r1=1041758&r2=1041759&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java
Fri Dec  3 10:19:52 2010
@@ -31,7 +31,7 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
 import org.apache.directory.server.kerberos.shared.messages.components.EncTicketPartModifier;
 import org.apache.directory.server.kerberos.shared.messages.value.KdcOptions;
-import org.apache.directory.server.kerberos.shared.messages.value.RequestBody;
+import org.apache.directory.shared.kerberos.components.KdcReqBody;
 import org.apache.directory.server.kerberos.shared.messages.value.RequestBodyModifier;
 import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
 import org.apache.directory.shared.kerberos.KerberosTime;

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingEncryptionTypeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingEncryptionTypeTest.java?rev=1041759&r1=1041758&r2=1041759&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingEncryptionTypeTest.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingEncryptionTypeTest.java
Fri Dec  3 10:19:52 2010
@@ -37,7 +37,7 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.kerberos.shared.messages.TicketGrantReply;
 import org.apache.directory.server.kerberos.shared.messages.components.EncTicketPartModifier;
 import org.apache.directory.server.kerberos.shared.messages.value.KdcOptions;
-import org.apache.directory.server.kerberos.shared.messages.value.RequestBody;
+import org.apache.directory.shared.kerberos.components.KdcReqBody;
 import org.apache.directory.server.kerberos.shared.messages.value.RequestBodyModifier;
 import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
 import org.apache.directory.shared.kerberos.KerberosTime;

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java?rev=1041759&r1=1041758&r2=1041759&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java
Fri Dec  3 10:19:52 2010
@@ -34,7 +34,7 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
 import org.apache.directory.server.kerberos.shared.messages.components.EncTicketPartModifier;
 import org.apache.directory.server.kerberos.shared.messages.value.KdcOptions;
-import org.apache.directory.server.kerberos.shared.messages.value.RequestBody;
+import org.apache.directory.shared.kerberos.components.KdcReqBody;
 import org.apache.directory.server.kerberos.shared.messages.value.RequestBodyModifier;
 import org.apache.directory.server.kerberos.shared.messages.value.flags.TicketFlag;
 import org.apache.directory.server.kerberos.shared.store.PrincipalStore;

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java?rev=1041759&r1=1041758&r2=1041759&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java
Fri Dec  3 10:19:52 2010
@@ -41,7 +41,7 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.kerberos.shared.messages.TicketGrantReply;
 import org.apache.directory.server.kerberos.shared.messages.components.EncTicketPartModifier;
 import org.apache.directory.server.kerberos.shared.messages.value.KdcOptions;
-import org.apache.directory.server.kerberos.shared.messages.value.RequestBody;
+import org.apache.directory.shared.kerberos.components.KdcReqBody;
 import org.apache.directory.server.kerberos.shared.messages.value.RequestBodyModifier;
 import org.apache.directory.server.kerberos.shared.messages.value.flags.TicketFlag;
 import org.apache.directory.server.kerberos.shared.store.PrincipalStore;



Mime
View raw message