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/07 15:25:53 UTC
svn commit: r1032283 - in
/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData:
./ actions/
Author: elecharny
Date: Sun Nov 7 14:25:53 2010
New Revision: 1032283
URL: http://svn.apache.org/viewvc?rev=1032283&view=rev
Log:
Done some renaming
Added:
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedDataCipher.java
- copied, changed from r1032195, directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedPartCipher.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedDataEType.java
- copied, changed from r1032195, directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedPartEType.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedDataInit.java
- copied, changed from r1032195, directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedPartInit.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedDataKvno.java
- copied, changed from r1032195, directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedPartKvno.java
Removed:
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedPartCipher.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedPartEType.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedPartInit.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedPartKvno.java
Modified:
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/EncryptedDataGrammar.java
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/EncryptedDataGrammar.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/EncryptedDataGrammar.java?rev=1032283&r1=1032282&r2=1032283&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/EncryptedDataGrammar.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/EncryptedDataGrammar.java Sun Nov 7 14:25:53 2010
@@ -26,10 +26,10 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.codec.actions.CheckNotNullLength;
-import org.apache.directory.shared.kerberos.codec.encryptedData.actions.EncryptedPartCipher;
-import org.apache.directory.shared.kerberos.codec.encryptedData.actions.EncryptedPartEType;
-import org.apache.directory.shared.kerberos.codec.encryptedData.actions.EncryptedPartInit;
-import org.apache.directory.shared.kerberos.codec.encryptedData.actions.EncryptedPartKvno;
+import org.apache.directory.shared.kerberos.codec.encryptedData.actions.EncryptedDataCipher;
+import org.apache.directory.shared.kerberos.codec.encryptedData.actions.EncryptedDataEType;
+import org.apache.directory.shared.kerberos.codec.encryptedData.actions.EncryptedDataInit;
+import org.apache.directory.shared.kerberos.codec.encryptedData.actions.EncryptedDataKvno;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,7 +54,7 @@ public final class EncryptedDataGrammar
/**
- * Creates a new PrincipalNameGrammar object.
+ * Creates a new EncryptedDataGrammar object.
*/
private EncryptedDataGrammar()
{
@@ -72,7 +72,7 @@ public final class EncryptedDataGrammar
// EncryptedData ::= SEQUENCE
super.transitions[EncryptedDataStatesEnum.START_STATE.ordinal()][UniversalTag.SEQUENCE.getValue()] = new GrammarTransition(
EncryptedDataStatesEnum.START_STATE, EncryptedDataStatesEnum.ENCRYPTED_DATA_SEQ_STATE, UniversalTag.SEQUENCE.getValue(),
- new EncryptedPartInit() );
+ new EncryptedDataInit() );
// --------------------------------------------------------------------------------------------
// Transition from EncryptedData SEQ to etype tag
@@ -90,7 +90,7 @@ public final class EncryptedDataGrammar
// etype [0] Int32,
super.transitions[EncryptedDataStatesEnum.ENCRYPTED_DATA_ETYPE_TAG_STATE.ordinal()][UniversalTag.INTEGER.getValue()] = new GrammarTransition(
EncryptedDataStatesEnum.ENCRYPTED_DATA_ETYPE_TAG_STATE, EncryptedDataStatesEnum.ENCRYPTED_DATA_ETYPE_STATE, UniversalTag.INTEGER.getValue(),
- new EncryptedPartEType() );
+ new EncryptedDataEType() );
// --------------------------------------------------------------------------------------------
// Transition from etype value to kvno tag
@@ -120,7 +120,7 @@ public final class EncryptedDataGrammar
// kvno [1] UInt32
super.transitions[EncryptedDataStatesEnum.ENCRYPTED_DATA_KVNO_TAG_STATE.ordinal()][UniversalTag.INTEGER.getValue()] = new GrammarTransition(
EncryptedDataStatesEnum.ENCRYPTED_DATA_KVNO_TAG_STATE, EncryptedDataStatesEnum.ENCRYPTED_DATA_KVNO_STATE, UniversalTag.INTEGER.getValue(),
- new EncryptedPartKvno() );
+ new EncryptedDataKvno() );
// --------------------------------------------------------------------------------------------
// Transition from kvno value value to cipher tag
@@ -140,7 +140,7 @@ public final class EncryptedDataGrammar
// cipher [2] OCTET STRING
super.transitions[EncryptedDataStatesEnum.ENCRYPTED_DATA_CIPHER_TAG_STATE.ordinal()][UniversalTag.OCTET_STRING.getValue()] = new GrammarTransition(
EncryptedDataStatesEnum.ENCRYPTED_DATA_CIPHER_TAG_STATE, EncryptedDataStatesEnum.ENCRYPTED_DATA_CIPHER_STATE, UniversalTag.OCTET_STRING.getValue(),
- new EncryptedPartCipher() );
+ new EncryptedDataCipher() );
}
@@ -150,7 +150,7 @@ public final class EncryptedDataGrammar
/**
* Get the instance of this grammar
*
- * @return An instance on the PrincipalName Grammar
+ * @return An instance on the EncryptedData Grammar
*/
public static Grammar getInstance()
{
Copied: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedDataCipher.java (from r1032195, directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedPartCipher.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedDataCipher.java?p2=directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedDataCipher.java&p1=directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedPartCipher.java&r1=1032195&r2=1032283&rev=1032283&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedPartCipher.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedDataCipher.java Sun Nov 7 14:25:53 2010
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class EncryptedPartCipher extends GrammarAction
+public class EncryptedDataCipher extends GrammarAction
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( KerberosMessageGrammar.class );
@@ -51,7 +51,7 @@ public class EncryptedPartCipher extends
/**
* Instantiates a new EncryptedPartKvno action.
*/
- public EncryptedPartCipher()
+ public EncryptedDataCipher()
{
super( "EncryptedPart cipher" );
}
Copied: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedDataEType.java (from r1032195, directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedPartEType.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedDataEType.java?p2=directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedDataEType.java&p1=directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedPartEType.java&r1=1032195&r2=1032283&rev=1032283&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedPartEType.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedDataEType.java Sun Nov 7 14:25:53 2010
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class EncryptedPartEType extends GrammarAction
+public class EncryptedDataEType extends GrammarAction
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( KerberosMessageGrammar.class );
@@ -54,7 +54,7 @@ public class EncryptedPartEType extends
/**
* Instantiates a new EncryptedPartEType action.
*/
- public EncryptedPartEType()
+ public EncryptedDataEType()
{
super( "EncryptedPart Etype" );
}
@@ -104,10 +104,5 @@ public class EncryptedPartEType extends
// This will generate a PROTOCOL_ERROR
throw new DecoderException( ide.getMessage() );
}
-
- if ( IS_DEBUG )
- {
- LOG.debug( "EncryptionType : {}", encryptionType );
- }
}
}
Copied: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedDataInit.java (from r1032195, directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedPartInit.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedDataInit.java?p2=directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedDataInit.java&p1=directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedPartInit.java&r1=1032195&r2=1032283&rev=1032283&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedPartInit.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedDataInit.java Sun Nov 7 14:25:53 2010
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class EncryptedPartInit extends GrammarAction
+public class EncryptedDataInit extends GrammarAction
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( KerberosMessageGrammar.class );
@@ -49,7 +49,7 @@ public class EncryptedPartInit extends G
/**
* Instantiates a new EncryptedPartInit action.
*/
- public EncryptedPartInit()
+ public EncryptedDataInit()
{
super( "Creates a EncryptedPart instance" );
}
Copied: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedDataKvno.java (from r1032195, directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedPartKvno.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedDataKvno.java?p2=directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedDataKvno.java&p1=directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedPartKvno.java&r1=1032195&r2=1032283&rev=1032283&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedPartKvno.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encryptedData/actions/EncryptedDataKvno.java Sun Nov 7 14:25:53 2010
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class EncryptedPartKvno extends GrammarAction
+public class EncryptedDataKvno extends GrammarAction
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( KerberosMessageGrammar.class );
@@ -53,7 +53,7 @@ public class EncryptedPartKvno extends G
/**
* Instantiates a new EncryptedPartKvno action.
*/
- public EncryptedPartKvno()
+ public EncryptedDataKvno()
{
super( "EncryptedPart kvno" );
}