directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1042051 - in /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src: main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/ main/java/org/apache/directory/shared/kerberos/components/ main/java/org/apach...
Date Fri, 03 Dec 2010 23:34:43 GMT
Author: elecharny
Date: Fri Dec  3 23:34:43 2010
New Revision: 1042051

URL: http://svn.apache.org/viewvc?rev=1042051&view=rev
Log:
Some renaming and constructor addition

Modified:
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreCName.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreCRealm.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreCTime.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreEText.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreSName.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreSTime.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbErrorDecoderTest.java

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreCName.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreCName.java?rev=1042051&r1=1042050&r2=1042051&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreCName.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreCName.java
Fri Dec  3 23:34:43 2010
@@ -49,6 +49,6 @@ public class StoreCName extends Abstract
     protected void setPrincipalName( PrincipalName principalName, Asn1Container container
)
     {
         KrbErrorContainer krbErrContainer = ( KrbErrorContainer ) container;
-        krbErrContainer.getKrbError().setcName( principalName );
+        krbErrContainer.getKrbError().setCName( principalName );
     }
 }

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreCRealm.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreCRealm.java?rev=1042051&r1=1042050&r2=1042051&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreCRealm.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreCRealm.java
Fri Dec  3 23:34:43 2010
@@ -48,6 +48,6 @@ public class StoreCRealm extends Abstrac
     protected void setRealm( String realm, Asn1Container container )
     {
         KrbErrorContainer krbErrContainer = ( KrbErrorContainer ) container;
-        krbErrContainer.getKrbError().setcRealm( realm );
+        krbErrContainer.getKrbError().setCRealm( realm );
     }
 }

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreCTime.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreCTime.java?rev=1042051&r1=1042050&r2=1042051&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreCTime.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreCTime.java
Fri Dec  3 23:34:43 2010
@@ -50,6 +50,6 @@ public class StoreCTime extends Abstract
     protected void setKerberosTime( KerberosTime krbtime, Asn1Container container )
     {
         KrbErrorContainer krbErrContainer = ( KrbErrorContainer ) container;
-        krbErrContainer.getKrbError().setcTime( krbtime );
+        krbErrContainer.getKrbError().setCTime( krbtime );
     }
 }

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreEText.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreEText.java?rev=1042051&r1=1042050&r2=1042051&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreEText.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreEText.java
Fri Dec  3 23:34:43 2010
@@ -79,7 +79,7 @@ public class StoreEText extends GrammarA
         String eText = StringTools.utf8ToString( value.getData() );
 
         KrbError krbError = krbErrContainer.getKrbError();
-        krbError.seteText( eText );
+        krbError.setEText( eText );
         
         if ( IS_DEBUG )
         {

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreSName.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreSName.java?rev=1042051&r1=1042050&r2=1042051&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreSName.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreSName.java
Fri Dec  3 23:34:43 2010
@@ -49,7 +49,7 @@ public class StoreSName extends Abstract
     protected void setPrincipalName( PrincipalName principalName, Asn1Container container
)
     {
         KrbErrorContainer krbErrContainer = ( KrbErrorContainer ) container;
-        krbErrContainer.getKrbError().setsName( principalName );
+        krbErrContainer.getKrbError().setSName( principalName );
         container.setGrammarEndAllowed( true );
     }
 }

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreSTime.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreSTime.java?rev=1042051&r1=1042050&r2=1042051&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreSTime.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreSTime.java
Fri Dec  3 23:34:43 2010
@@ -50,6 +50,6 @@ public class StoreSTime extends Abstract
     protected void setKerberosTime( KerberosTime krbtime, Asn1Container container )
     {
         KrbErrorContainer krbErrContainer = ( KrbErrorContainer ) container;
-        krbErrContainer.getKrbError().setsTime( krbtime );
+        krbErrContainer.getKrbError().setSTime( krbtime );
     }
 }

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java?rev=1042051&r1=1042050&r2=1042051&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java
Fri Dec  3 23:34:43 2010
@@ -69,6 +69,19 @@ public class ETypeInfoEntry extends Abst
 
     /**
      * Creates a new instance of ETypeInfoEntry.
+     * 
+     * @param etype the Encryption type
+     * @param salt the salt
+     */
+    public ETypeInfoEntry( EncryptionType etype, byte[] salt )
+    {
+        this.etype = etype;
+        this.salt = salt;
+    }
+
+
+    /**
+     * Creates a new instance of ETypeInfoEntry.
      */
     public ETypeInfoEntry()
     {

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java?rev=1042051&r1=1042050&r2=1042051&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
Fri Dec  3 23:34:43 2010
@@ -135,7 +135,7 @@ public class KrbError extends KerberosMe
     /**
      * @return the cTime
      */
-    public KerberosTime getcTime()
+    public KerberosTime getCTime()
     {
         return cTime;
     }
@@ -144,7 +144,7 @@ public class KrbError extends KerberosMe
     /**
      * @param cTime the cTime to set
      */
-    public void setcTime( KerberosTime cTime )
+    public void setCTime( KerberosTime cTime )
     {
         this.cTime = cTime;
     }
@@ -176,7 +176,7 @@ public class KrbError extends KerberosMe
     /**
      * @return the sTime
      */
-    public KerberosTime getsTime()
+    public KerberosTime getSTime()
     {
         return sTime;
     }
@@ -185,7 +185,7 @@ public class KrbError extends KerberosMe
     /**
      * @param sTime the sTime to set
      */
-    public void setsTime( KerberosTime sTime )
+    public void setSTime( KerberosTime sTime )
     {
         this.sTime = sTime;
     }
@@ -230,7 +230,7 @@ public class KrbError extends KerberosMe
     /**
      * @return the cRealm
      */
-    public String getcRealm()
+    public String getCRealm()
     {
         return cRealm;
     }
@@ -239,7 +239,7 @@ public class KrbError extends KerberosMe
     /**
      * @param cRealm the cRealm to set
      */
-    public void setcRealm( String cRealm )
+    public void setCRealm( String cRealm )
     {
         this.cRealm = cRealm;
     }
@@ -248,7 +248,7 @@ public class KrbError extends KerberosMe
     /**
      * @return the cName
      */
-    public PrincipalName getcName()
+    public PrincipalName getCName()
     {
         return cName;
     }
@@ -257,7 +257,7 @@ public class KrbError extends KerberosMe
     /**
      * @param cName the cName to set
      */
-    public void setcName( PrincipalName cName )
+    public void setCName( PrincipalName cName )
     {
         this.cName = cName;
     }
@@ -284,7 +284,7 @@ public class KrbError extends KerberosMe
     /**
      * @return the sName
      */
-    public PrincipalName getsName()
+    public PrincipalName getSName()
     {
         return sName;
     }
@@ -293,7 +293,7 @@ public class KrbError extends KerberosMe
     /**
      * @param sName the sName to set
      */
-    public void setsName( PrincipalName sName )
+    public void setSName( PrincipalName sName )
     {
         this.sName = sName;
     }
@@ -302,7 +302,7 @@ public class KrbError extends KerberosMe
     /**
      * @return the eText
      */
-    public String geteText()
+    public String getEText()
     {
         return eText;
     }
@@ -311,7 +311,7 @@ public class KrbError extends KerberosMe
     /**
      * @param eText the eText to set
      */
-    public void seteText( String eText )
+    public void setEText( String eText )
     {
         this.eText = eText;
     }
@@ -320,7 +320,7 @@ public class KrbError extends KerberosMe
     /**
      * @return the eData
      */
-    public byte[] geteData()
+    public byte[] getEData()
     {
         return eData;
     }

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbErrorDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbErrorDecoderTest.java?rev=1042051&r1=1042050&r2=1042051&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbErrorDecoderTest.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbErrorDecoderTest.java
Fri Dec  3 23:34:43 2010
@@ -115,17 +115,17 @@ public class KrbErrorDecoderTest
         String time = "20101119080043Z";
         assertEquals( 5, krbError.getProtocolVersionNumber() );
         assertEquals( KerberosMessageType.KRB_ERROR, krbError.getMessageType() );
-        assertEquals( time, krbError.getcTime().getDate() );
+        assertEquals( time, krbError.getCTime().getDate() );
         assertEquals( 1, krbError.getCusec() );
-        assertEquals( time, krbError.getsTime().getDate() );
+        assertEquals( time, krbError.getSTime().getDate() );
         assertEquals( 2, krbError.getSusec() );
         assertEquals( ErrorType.KDC_ERR_NONE, krbError.getErrorCode() );
-        assertEquals( "crealm", krbError.getcRealm() );
-        assertEquals( "cname", krbError.getcName().getNameString() );
+        assertEquals( "crealm", krbError.getCRealm() );
+        assertEquals( "cname", krbError.getCName().getNameString() );
         assertEquals( "realm", krbError.getRealm() );
-        assertEquals( "sname", krbError.getsName().getNameString() );
-        assertEquals( "etext", krbError.geteText() );
-        assertTrue( Arrays.equals( new byte[]{0,1}, krbError.geteData() ) );
+        assertEquals( "sname", krbError.getSName().getNameString() );
+        assertEquals( "etext", krbError.getEText() );
+        assertTrue( Arrays.equals( new byte[]{0,1}, krbError.getEData() ) );
         
         int encodedLen = krbError.computeLength();
         
@@ -213,7 +213,7 @@ public class KrbErrorDecoderTest
         
         KrbError krbError = container.getKrbError();
         
-        assertNull( krbError.getcTime() );
+        assertNull( krbError.getCTime() );
         
         int encodedLen = krbError.computeLength();
         
@@ -384,7 +384,7 @@ public class KrbErrorDecoderTest
         
         KrbError krbError = container.getKrbError();
         
-        assertNull( krbError.getcTime() );
+        assertNull( krbError.getCTime() );
         assertEquals( 0, krbError.getCusec() );
         
         int encodedLen = krbError.computeLength();
@@ -471,7 +471,7 @@ public class KrbErrorDecoderTest
         
         KrbError krbError = container.getKrbError();
         
-        assertNull( krbError.getcRealm() );
+        assertNull( krbError.getCRealm() );
         
         int encodedLen = krbError.computeLength();
         
@@ -552,7 +552,7 @@ public class KrbErrorDecoderTest
         
         KrbError krbError = container.getKrbError();
         
-        assertNull( krbError.getcName() );
+        assertNull( krbError.getCName() );
         
         int encodedLen = krbError.computeLength();
         
@@ -631,8 +631,8 @@ public class KrbErrorDecoderTest
         
         KrbError krbError = container.getKrbError();
         
-        assertNull( krbError.getcRealm() );
-        assertNull( krbError.getcName() );
+        assertNull( krbError.getCRealm() );
+        assertNull( krbError.getCName() );
         
         int encodedLen = krbError.computeLength();
         
@@ -718,7 +718,7 @@ public class KrbErrorDecoderTest
         
         KrbError krbError = container.getKrbError();
         
-        assertNull( krbError.geteText() );
+        assertNull( krbError.getEText() );
         
         int encodedLen = krbError.computeLength();
         
@@ -802,7 +802,7 @@ public class KrbErrorDecoderTest
         
         KrbError krbError = container.getKrbError();
         
-        assertNull( krbError.geteData() );
+        assertNull( krbError.getEData() );
         
         int encodedLen = krbError.computeLength();
         
@@ -885,8 +885,8 @@ public class KrbErrorDecoderTest
         
         KrbError krbError = container.getKrbError();
         
-        assertNull( krbError.geteText() );
-        assertNull( krbError.geteData() );
+        assertNull( krbError.getEText() );
+        assertNull( krbError.getEData() );
         
         int encodedLen = krbError.computeLength();
         
@@ -955,12 +955,12 @@ public class KrbErrorDecoderTest
         
         KrbError krbError = container.getKrbError();
         
-        assertNull( krbError.getcTime() );
+        assertNull( krbError.getCTime() );
         assertEquals( 0, krbError.getCusec() );
-        assertNull( krbError.getcRealm() );
-        assertNull( krbError.getcName() );
-        assertNull( krbError.geteText() );
-        assertNull( krbError.geteData() );
+        assertNull( krbError.getCRealm() );
+        assertNull( krbError.getCName() );
+        assertNull( krbError.getEText() );
+        assertNull( krbError.getEData() );
         
         int encodedLen = krbError.computeLength();
         



Mime
View raw message