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 2010/11/30 21:38:02 UTC
svn commit: r1040767 - in
/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec:
paEncTsEnc/ padata/ principalName/ tgsRep/ tgsRep/actions/ tgsReq/
tgsReq/actions/ ticket/ ticket/actions/ transitedEncoding/ t...
Author: elecharny
Date: Tue Nov 30 20:38:01 2010
New Revision: 1040767
URL: http://svn.apache.org/viewvc?rev=1040767&view=rev
Log:
Some more fixes
Modified:
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/paEncTsEnc/PaEncTsEncStatesEnum.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/padata/PaDataStatesEnum.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/principalName/PrincipalNameStatesEnum.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsRep/TgsRepStatesEnum.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsRep/actions/StoreKdcRep.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/TgsReqStatesEnum.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/actions/StoreKdcReq.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/TicketStatesEnum.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/actions/TicketInit.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/transitedEncoding/TransitedEncodingStatesEnum.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/typedData/TypedDataStatesEnum.java
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/paEncTsEnc/PaEncTsEncStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/paEncTsEnc/PaEncTsEncStatesEnum.java?rev=1040767&r1=1040766&r2=1040767&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/paEncTsEnc/PaEncTsEncStatesEnum.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/paEncTsEnc/PaEncTsEncStatesEnum.java Tue Nov 30 20:38:01 2010
@@ -22,7 +22,6 @@ package org.apache.directory.shared.kerb
import org.apache.directory.shared.asn1.ber.grammar.Grammar;
import org.apache.directory.shared.asn1.ber.grammar.States;
-import org.apache.directory.shared.kerberos.codec.KerberosMessageGrammar;
/**
@@ -69,7 +68,7 @@ public enum PaEncTsEncStatesEnum impleme
*/
public String getGrammarName( Grammar grammar )
{
- if ( grammar instanceof KerberosMessageGrammar )
+ if ( grammar instanceof PaEncTsEncGrammar )
{
return "PA_ENC_TS_ENC_GRAMMAR";
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/padata/PaDataStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/padata/PaDataStatesEnum.java?rev=1040767&r1=1040766&r2=1040767&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/padata/PaDataStatesEnum.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/padata/PaDataStatesEnum.java Tue Nov 30 20:38:01 2010
@@ -22,7 +22,6 @@ package org.apache.directory.shared.kerb
import org.apache.directory.shared.asn1.ber.grammar.Grammar;
import org.apache.directory.shared.asn1.ber.grammar.States;
-import org.apache.directory.shared.kerberos.codec.KerberosMessageGrammar;
/**
@@ -70,7 +69,7 @@ public enum PaDataStatesEnum implements
*/
public String getGrammarName( Grammar grammar )
{
- if ( grammar instanceof KerberosMessageGrammar )
+ if ( grammar instanceof PaDataGrammar )
{
return "PADATA_GRAMMAR";
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/principalName/PrincipalNameStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/principalName/PrincipalNameStatesEnum.java?rev=1040767&r1=1040766&r2=1040767&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/principalName/PrincipalNameStatesEnum.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/principalName/PrincipalNameStatesEnum.java Tue Nov 30 20:38:01 2010
@@ -22,7 +22,6 @@ package org.apache.directory.shared.kerb
import org.apache.directory.shared.asn1.ber.grammar.Grammar;
import org.apache.directory.shared.asn1.ber.grammar.States;
-import org.apache.directory.shared.kerberos.codec.KerberosMessageGrammar;
/**
@@ -71,7 +70,7 @@ public enum PrincipalNameStatesEnum impl
*/
public String getGrammarName( Grammar grammar )
{
- if ( grammar instanceof KerberosMessageGrammar )
+ if ( grammar instanceof PrincipalNameGrammar )
{
return "PRINCIPAL_NAME_GRAMMAR";
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsRep/TgsRepStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsRep/TgsRepStatesEnum.java?rev=1040767&r1=1040766&r2=1040767&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsRep/TgsRepStatesEnum.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsRep/TgsRepStatesEnum.java Tue Nov 30 20:38:01 2010
@@ -22,7 +22,6 @@ package org.apache.directory.shared.kerb
import org.apache.directory.shared.asn1.ber.grammar.Grammar;
import org.apache.directory.shared.asn1.ber.grammar.States;
-import org.apache.directory.shared.kerberos.codec.KerberosMessageGrammar;
/**
@@ -63,7 +62,7 @@ public enum TgsRepStatesEnum implements
*/
public String getGrammarName( Grammar grammar )
{
- if ( grammar instanceof KerberosMessageGrammar )
+ if ( grammar instanceof TgsRepGrammar )
{
return "TGS_REP_GRAMMAR";
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsRep/actions/StoreKdcRep.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsRep/actions/StoreKdcRep.java?rev=1040767&r1=1040766&r2=1040767&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsRep/actions/StoreKdcRep.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsRep/actions/StoreKdcRep.java Tue Nov 30 20:38:01 2010
@@ -27,7 +27,6 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.codec.DecoderException;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.kerberos.KerberosMessageType;
-import org.apache.directory.shared.kerberos.codec.KerberosMessageGrammar;
import org.apache.directory.shared.kerberos.codec.kdcRep.KdcRepContainer;
import org.apache.directory.shared.kerberos.codec.tgsRep.TgsRepContainer;
import org.apache.directory.shared.kerberos.messages.TgsRep;
@@ -43,7 +42,7 @@ import org.slf4j.LoggerFactory;
public class StoreKdcRep extends GrammarAction
{
/** The logger */
- private static final Logger LOG = LoggerFactory.getLogger( KerberosMessageGrammar.class );
+ private static final Logger LOG = LoggerFactory.getLogger( StoreKdcRep.class );
/** Speedup for logs */
private static final boolean IS_DEBUG = LOG.isDebugEnabled();
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/TgsReqStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/TgsReqStatesEnum.java?rev=1040767&r1=1040766&r2=1040767&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/TgsReqStatesEnum.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/TgsReqStatesEnum.java Tue Nov 30 20:38:01 2010
@@ -22,7 +22,7 @@ package org.apache.directory.shared.kerb
import org.apache.directory.shared.asn1.ber.grammar.Grammar;
import org.apache.directory.shared.asn1.ber.grammar.States;
-import org.apache.directory.shared.kerberos.codec.KerberosMessageGrammar;
+import org.apache.directory.shared.kerberos.codec.tgsRep.TgsRepGrammar;
/**
@@ -34,9 +34,9 @@ import org.apache.directory.shared.kerbe
public enum TgsReqStatesEnum implements States
{
// Start
- START_STATE, // 0
+ START_STATE, // 0
- // ----- HostAddresses message --------------------------------------
+ // ----- TGS-REQ message --------------------------------------
TGS_REQ_STATE, // 1
// End
@@ -63,7 +63,7 @@ public enum TgsReqStatesEnum implements
*/
public String getGrammarName( Grammar grammar )
{
- if ( grammar instanceof KerberosMessageGrammar )
+ if ( grammar instanceof TgsRepGrammar )
{
return "TGS_REQ_GRAMMAR";
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/actions/StoreKdcReq.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/actions/StoreKdcReq.java?rev=1040767&r1=1040766&r2=1040767&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/actions/StoreKdcReq.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/actions/StoreKdcReq.java Tue Nov 30 20:38:01 2010
@@ -27,7 +27,6 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.codec.DecoderException;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.kerberos.KerberosMessageType;
-import org.apache.directory.shared.kerberos.codec.KerberosMessageGrammar;
import org.apache.directory.shared.kerberos.codec.kdcReq.KdcReqContainer;
import org.apache.directory.shared.kerberos.codec.tgsReq.TgsReqContainer;
import org.apache.directory.shared.kerberos.messages.TgsReq;
@@ -43,7 +42,7 @@ import org.slf4j.LoggerFactory;
public class StoreKdcReq extends GrammarAction
{
/** The logger */
- private static final Logger LOG = LoggerFactory.getLogger( KerberosMessageGrammar.class );
+ private static final Logger LOG = LoggerFactory.getLogger( StoreKdcReq.class );
/** Speedup for logs */
private static final boolean IS_DEBUG = LOG.isDebugEnabled();
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/TicketStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/TicketStatesEnum.java?rev=1040767&r1=1040766&r2=1040767&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/TicketStatesEnum.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/TicketStatesEnum.java Tue Nov 30 20:38:01 2010
@@ -22,7 +22,6 @@ package org.apache.directory.shared.kerb
import org.apache.directory.shared.asn1.ber.grammar.Grammar;
import org.apache.directory.shared.asn1.ber.grammar.States;
-import org.apache.directory.shared.kerberos.codec.KerberosMessageGrammar;
/**
@@ -74,7 +73,7 @@ public enum TicketStatesEnum implements
*/
public String getGrammarName( Grammar grammar )
{
- if ( grammar instanceof KerberosMessageGrammar )
+ if ( grammar instanceof TicketGrammar )
{
return "TICKET_GRAMMAR";
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/actions/TicketInit.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/actions/TicketInit.java?rev=1040767&r1=1040766&r2=1040767&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/actions/TicketInit.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/actions/TicketInit.java Tue Nov 30 20:38:01 2010
@@ -25,7 +25,6 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.codec.DecoderException;
-import org.apache.directory.shared.kerberos.codec.KerberosMessageGrammar;
import org.apache.directory.shared.kerberos.codec.ticket.TicketContainer;
import org.apache.directory.shared.kerberos.messages.Ticket;
import org.slf4j.Logger;
@@ -40,7 +39,7 @@ import org.slf4j.LoggerFactory;
public class TicketInit extends GrammarAction
{
/** The logger */
- private static final Logger LOG = LoggerFactory.getLogger( KerberosMessageGrammar.class );
+ private static final Logger LOG = LoggerFactory.getLogger( TicketInit.class );
/**
* Instantiates a new TicketInit action.
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/transitedEncoding/TransitedEncodingStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/transitedEncoding/TransitedEncodingStatesEnum.java?rev=1040767&r1=1040766&r2=1040767&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/transitedEncoding/TransitedEncodingStatesEnum.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/transitedEncoding/TransitedEncodingStatesEnum.java Tue Nov 30 20:38:01 2010
@@ -22,7 +22,6 @@ package org.apache.directory.shared.kerb
import org.apache.directory.shared.asn1.ber.grammar.Grammar;
import org.apache.directory.shared.asn1.ber.grammar.States;
-import org.apache.directory.shared.kerberos.codec.KerberosMessageGrammar;
/**
@@ -69,7 +68,7 @@ public enum TransitedEncodingStatesEnum
*/
public String getGrammarName( Grammar grammar )
{
- if ( grammar instanceof KerberosMessageGrammar )
+ if ( grammar instanceof TransitedEncodingGrammar )
{
return "TRANSITED_ENCODING_GRAMMAR";
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/typedData/TypedDataStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/typedData/TypedDataStatesEnum.java?rev=1040767&r1=1040766&r2=1040767&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/typedData/TypedDataStatesEnum.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/typedData/TypedDataStatesEnum.java Tue Nov 30 20:38:01 2010
@@ -22,7 +22,6 @@ package org.apache.directory.shared.kerb
import org.apache.directory.shared.asn1.ber.grammar.Grammar;
import org.apache.directory.shared.asn1.ber.grammar.States;
-import org.apache.directory.shared.kerberos.codec.KerberosMessageGrammar;
/**
@@ -70,7 +69,7 @@ public enum TypedDataStatesEnum implemen
*/
public String getGrammarName( Grammar grammar )
{
- if ( grammar instanceof KerberosMessageGrammar )
+ if ( grammar instanceof TypedDataGrammar )
{
return "TYPED_DATA_GRAMMAR";
}