[jboss-cvs] JBossAS SVN: r76851 - in projects/security/security-negotiation/trunk: jboss-negotiation-common and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Aug 9 07:37:23 EDT 2008
Author: darran.lofthouse at jboss.com
Date: 2008-08-09 07:37:23 -0400 (Sat, 09 Aug 2008)
New Revision: 76851
Modified:
projects/security/security-negotiation/trunk/jboss-negotiation-common/.classpath
projects/security/security-negotiation/trunk/jboss-negotiation-common/pom.xml
projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/common/DebugHelper.java
projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/.classpath
projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/main/java/org/jboss/security/negotiation/ntlm/encoding/NegotiateFlags.java
projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/main/java/org/jboss/security/negotiation/ntlm/encoding/NegotiateMessageDecoder.java
projects/security/security-negotiation/trunk/jboss-negotiation-spnego/.classpath
projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.classpath
projects/security/security-negotiation/trunk/jboss-negotiation/.classpath
projects/security/security-negotiation/trunk/parent/pom.xml
Log:
[SECURITY-153] Remove dependency on Apache commons-codec.
Modified: projects/security/security-negotiation/trunk/jboss-negotiation/.classpath
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation/.classpath 2008-08-09 11:32:34 UTC (rev 76850)
+++ projects/security/security-negotiation/trunk/jboss-negotiation/.classpath 2008-08-09 11:37:23 UTC (rev 76851)
@@ -12,7 +12,6 @@
<classpathentry kind="var" path="M2_REPO/jboss/web/jbossweb/2.1.0.GA/jbossweb-2.1.0.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/web/servlet-api/2.1.0.GA/servlet-api-2.1.0.GA.jar"/>
<classpathentry kind="src" path="/jboss-negotiation-common"/>
- <classpathentry kind="var" path="M2_REPO/apache-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
<classpathentry kind="src" path="/jboss-negotiation-ntlm"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
<classpathentry kind="src" path="/jboss-negotiation-spnego"/>
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-common/.classpath
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-common/.classpath 2008-08-09 11:32:34 UTC (rev 76850)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-common/.classpath 2008-08-09 11:37:23 UTC (rev 76851)
@@ -4,6 +4,5 @@
<classpathentry kind="src" path="src/tests/java" output="target/test-classes"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/apache-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
</classpath>
\ No newline at end of file
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-common/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-common/pom.xml 2008-08-09 11:32:34 UTC (rev 76850)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-common/pom.xml 2008-08-09 11:37:23 UTC (rev 76851)
@@ -32,12 +32,8 @@
<dependencies>
<!-- Local Dependencies -->
- <!-- Global dependencies -->
+ <!-- Global dependencies -->
<dependency>
- <groupId>apache-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
- <dependency>
<groupId>apache-log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/common/DebugHelper.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/common/DebugHelper.java 2008-08-09 11:32:34 UTC (rev 76850)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/common/DebugHelper.java 2008-08-09 11:37:23 UTC (rev 76851)
@@ -16,8 +16,6 @@
package org.jboss.security.negotiation.common;
-import org.apache.commons.codec.binary.Hex;
-
/**
* Utility class to assist debugging.
*
@@ -26,22 +24,27 @@
public class DebugHelper
{
+ private static final char[] HEX_VALUES = new char[]
+ {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+
public static String convertToHex(final byte[] message)
{
- StringBuffer sb = new StringBuffer(message.length * 5);
-
- char[] hex = Hex.encodeHex(message);
+ StringBuilder sb = new StringBuilder(message.length * 5);
- for (int i = 0; i < hex.length; i++)
+ for (byte current : message)
{
- if (i % 2 == 0)
- {
- sb.append(" 0x");
- }
-
- sb.append(hex[i]);
+ sb.append(" 0x").append(toHex(current));
}
return sb.toString();
}
+
+ private static String toHex(byte b)
+ {
+ char[] characters = new char[2];
+ characters[0] = HEX_VALUES[(b >>> 4) & 0x0F];
+ characters[1] = HEX_VALUES[b & 0x0F];
+ return new String(characters);
+ }
+
}
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/.classpath
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/.classpath 2008-08-09 11:32:34 UTC (rev 76850)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/.classpath 2008-08-09 11:37:23 UTC (rev 76851)
@@ -7,6 +7,5 @@
<classpathentry kind="var" path="M2_REPO/jboss/jboss-common/4.2.2.GA/jboss-common-4.2.2.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
<classpathentry kind="src" path="/jboss-negotiation-common"/>
- <classpathentry kind="var" path="M2_REPO/apache-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
</classpath>
\ No newline at end of file
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/main/java/org/jboss/security/negotiation/ntlm/encoding/NegotiateFlags.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/main/java/org/jboss/security/negotiation/ntlm/encoding/NegotiateFlags.java 2008-08-09 11:32:34 UTC (rev 76850)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/main/java/org/jboss/security/negotiation/ntlm/encoding/NegotiateFlags.java 2008-08-09 11:37:23 UTC (rev 76851)
@@ -306,7 +306,7 @@
@Override
public String toString()
{
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
Field[] fields = getClass().getDeclaredFields();
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/main/java/org/jboss/security/negotiation/ntlm/encoding/NegotiateMessageDecoder.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/main/java/org/jboss/security/negotiation/ntlm/encoding/NegotiateMessageDecoder.java 2008-08-09 11:32:34 UTC (rev 76850)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/main/java/org/jboss/security/negotiation/ntlm/encoding/NegotiateMessageDecoder.java 2008-08-09 11:37:23 UTC (rev 76851)
@@ -21,6 +21,7 @@
import java.io.InputStream;
import java.util.Arrays;
+import org.jboss.security.negotiation.common.DebugHelper;
import org.jboss.security.negotiation.ntlm.Constants;
/**
@@ -147,6 +148,8 @@
public static NegotiateMessage decode(final byte[] token) throws IOException
{
+ System.out.println(DebugHelper.convertToHex(token));
+
DecoderData data = new DecoderData();
ByteArrayInputStream bais = new ByteArrayInputStream(token);
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-spnego/.classpath
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-spnego/.classpath 2008-08-09 11:32:34 UTC (rev 76850)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-spnego/.classpath 2008-08-09 11:37:23 UTC (rev 76851)
@@ -8,6 +8,5 @@
<classpathentry kind="var" path="M2_REPO/jboss/jbosssx/4.2.2.GA/jbosssx-4.2.2.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
<classpathentry kind="src" path="/jboss-negotiation-common"/>
- <classpathentry kind="var" path="M2_REPO/apache-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
</classpath>
\ No newline at end of file
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.classpath
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.classpath 2008-08-09 11:32:34 UTC (rev 76850)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.classpath 2008-08-09 11:37:23 UTC (rev 76851)
@@ -8,7 +8,6 @@
<classpathentry kind="var" path="M2_REPO/jboss/web/servlet-api/2.1.0.GA/servlet-api-2.1.0.GA.jar"/>
<classpathentry kind="src" path="/jboss-negotiation"/>
<classpathentry kind="src" path="/jboss-negotiation-common"/>
- <classpathentry kind="var" path="M2_REPO/apache-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
<classpathentry kind="src" path="/jboss-negotiation-ntlm"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
<classpathentry kind="src" path="/jboss-negotiation-spnego"/>
Modified: projects/security/security-negotiation/trunk/parent/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/parent/pom.xml 2008-08-09 11:32:34 UTC (rev 76850)
+++ projects/security/security-negotiation/trunk/parent/pom.xml 2008-08-09 11:37:23 UTC (rev 76851)
@@ -20,7 +20,6 @@
</scm>
<properties>
<version.apache-log4j.log4j>1.2.14</version.apache-log4j.log4j>
- <version.apache-codec.commons-codec>1.2</version.apache-codec.commons-codec>
<version.jboss.jboss-common>4.2.2.GA</version.jboss.jboss-common>
<version.jboss.jbosssx>4.2.2.GA</version.jboss.jbosssx>
<version.jboss.jmx>4.2.2.GA</version.jboss.jmx>
@@ -120,11 +119,6 @@
<!-- External Dependencies -->
<dependency>
- <groupId>apache-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${version.apache-codec.commons-codec}</version>
- </dependency>
- <dependency>
<groupId>apache-log4j</groupId>
<artifactId>log4j</artifactId>
<version>${version.apache-log4j.log4j}</version>
More information about the jboss-cvs-commits
mailing list