[jboss-cvs] JBossAS SVN: r70969 - projects/security/security-negotiation/trunk/NegotiationToolkit/src/main/org/jboss/security/negotiation/toolkit.

[jboss-cvs-commits at lists.jboss.org]

Author: darran.lofthouse at jboss.com
Date: 2008-03-18 17:55:03 -0400 (Tue, 18 Mar 2008)
New Revision: 70969

Modified:
   projects/security/security-negotiation/trunk/NegotiationToolkit/src/main/org/jboss/security/negotiation/toolkit/BasicNegotiationServlet.java
   projects/security/security-negotiation/trunk/NegotiationToolkit/src/main/org/jboss/security/negotiation/toolkit/SecuredServlet.java
Log:
[SECURITY-65] Java 5.0 type safety.

Modified: projects/security/security-negotiation/trunk/NegotiationToolkit/src/main/org/jboss/security/negotiation/toolkit/BasicNegotiationServlet.java
===================================================================
--- projects/security/security-negotiation/trunk/NegotiationToolkit/src/main/org/jboss/security/negotiation/toolkit/BasicNegotiationServlet.java	2008-03-18 21:51:47 UTC (rev 70968)
+++ projects/security/security-negotiation/trunk/NegotiationToolkit/src/main/org/jboss/security/negotiation/toolkit/BasicNegotiationServlet.java	2008-03-18 21:55:03 UTC (rev 70969)
@@ -36,11 +36,10 @@
 import org.ietf.jgss.GSSException;
 import org.ietf.jgss.Oid;
 import org.jboss.security.negotiation.OidNameUtil;
+import org.jboss.security.negotiation.spnego.encoding.DebugHelper;
+import org.jboss.security.negotiation.spnego.encoding.NegTokenInit;
+import org.jboss.security.negotiation.spnego.encoding.NegTokenInitDecoder;
 
-import com.darranl.spnego.DebugHelper;
-import com.darranl.spnego.NegTokenInit;
-import com.darranl.spnego.NegTokenInitDecoder;
-
 /**
  * A basic servlet to test that if prompted the client browser will return a SPNEGO
  * header rather than an NTLM header.
@@ -142,12 +141,12 @@
          writer.print(OidNameUtil.getName(negTokenInit.getMessageOid()));
          writer.println("<br>");
 
-         List mechTypes = negTokenInit.getMechTypes();
+         List<Oid> mechTypes = negTokenInit.getMechTypes();
          writer.print("<b>Mech Types -</b>");
-         for (Object current : mechTypes)
+         for (Oid current : mechTypes)
          {
             writer.print(" {");
-            writer.print(OidNameUtil.getName((Oid) current));
+            writer.print(OidNameUtil.getName(current));
             writer.print("}");
          }
          writer.println("<br>");

Modified: projects/security/security-negotiation/trunk/NegotiationToolkit/src/main/org/jboss/security/negotiation/toolkit/SecuredServlet.java
===================================================================
--- projects/security/security-negotiation/trunk/NegotiationToolkit/src/main/org/jboss/security/negotiation/toolkit/SecuredServlet.java	2008-03-18 21:51:47 UTC (rev 70968)
+++ projects/security/security-negotiation/trunk/NegotiationToolkit/src/main/org/jboss/security/negotiation/toolkit/SecuredServlet.java	2008-03-18 21:55:03 UTC (rev 70969)
@@ -28,9 +28,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
-import java.security.Principal;
 
-import javax.security.auth.Subject;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;