[jboss-cvs] JBossAS SVN: r111912 - in projects/security/security-negotiation/trunk: jboss-negotiation-common and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 3 08:01:04 EDT 2011
Author: darran.lofthouse at jboss.com
Date: 2011-08-03 08:01:03 -0400 (Wed, 03 Aug 2011)
New Revision: 111912
Modified:
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/NegotiationAuthenticator.java
projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationMessage.java
projects/security/security-negotiation/trunk/jboss-negotiation-extras/pom.xml
projects/security/security-negotiation/trunk/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation/AdvancedADLoginModule.java
projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/pom.xml
projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/main/java/org/jboss/security/negotiation/ntlm/encoding/NegotiateMessage.java
projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/tests/java/org/jboss/security/negotiation/ntlm/encoding/NegotiationMessageDecoderTest.java
projects/security/security-negotiation/trunk/jboss-negotiation-spnego/pom.xml
projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenInit.java
projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/tests/java/org/jboss/security/negotiation/spnego/encoding/Security439TestCase.java
projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/pom.xml
projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/src/main/java/org/jboss/security/negotiation/toolkit/BasicNegotiationServlet.java
projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/src/main/java/org/jboss/security/negotiation/toolkit/NTLMNegotiationServlet.java
projects/security/security-negotiation/trunk/parent/pom.xml
projects/security/security-negotiation/trunk/pom.xml
Log:
SECURITY-608 - Switch to the PicketBox Base65 implementation.
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-common/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-common/pom.xml 2011-08-03 10:45:47 UTC (rev 111911)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-common/pom.xml 2011-08-03 12:01:03 UTC (rev 111912)
@@ -35,10 +35,6 @@
<!-- Global dependencies -->
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
@@ -54,6 +50,10 @@
<groupId>org.picketbox</groupId>
<artifactId>picketbox</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.picketbox</groupId>
+ <artifactId>picketbox-commons</artifactId>
+ </dependency>
</dependencies>
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java 2011-08-03 10:45:47 UTC (rev 111911)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java 2011-08-03 12:01:03 UTC (rev 111912)
@@ -48,8 +48,9 @@
import org.jboss.logging.Logger;
import org.jboss.security.negotiation.common.MessageTrace;
import org.jboss.security.negotiation.common.NegotiationContext;
-import org.jboss.util.Base64;
+import org.picketbox.commons.cipher.Base64;
+
/**
* An authenticator to manage Negotiation based authentication in connection with the
* Negotiation login module.
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationMessage.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationMessage.java 2011-08-03 10:45:47 UTC (rev 111911)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationMessage.java 2011-08-03 12:01:03 UTC (rev 111912)
@@ -20,7 +20,7 @@
import java.io.IOException;
import java.io.OutputStream;
-import org.jboss.util.Base64;
+import org.picketbox.commons.cipher.Base64;
/**
* The common base type for all negotiation messages.
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-extras/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-extras/pom.xml 2011-08-03 10:45:47 UTC (rev 111911)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-extras/pom.xml 2011-08-03 12:01:03 UTC (rev 111912)
@@ -39,10 +39,6 @@
<!-- Global dependencies -->
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
@@ -50,6 +46,10 @@
<groupId>org.picketbox</groupId>
<artifactId>picketbox</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.picketbox</groupId>
+ <artifactId>picketbox-commons</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation/AdvancedADLoginModule.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation/AdvancedADLoginModule.java 2011-08-03 10:45:47 UTC (rev 111911)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation/AdvancedADLoginModule.java 2011-08-03 12:01:03 UTC (rev 111912)
@@ -34,15 +34,8 @@
import javax.naming.ldap.LdapContext;
import javax.security.auth.login.LoginException;
-import org.jboss.util.Base64;
+import org.picketbox.commons.cipher.Base64;
-/**
- * An extension of the AdvancedLdapLoginModule to also query the primary group
- * of the user being authenticated - this is not discoverable using the usual
- * member and memberOf attributes.
- *
- * @author darran.lofthouse at jboss.com
- */
public class AdvancedADLoginModule extends AdvancedLdapLoginModule
{
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/pom.xml 2011-08-03 10:45:47 UTC (rev 111911)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/pom.xml 2011-08-03 12:01:03 UTC (rev 111912)
@@ -44,10 +44,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
+ <groupId>org.picketbox</groupId>
+ <artifactId>picketbox-commons</artifactId>
+ <scope>test</scope>
</dependency>
-
</dependencies>
</project>
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/main/java/org/jboss/security/negotiation/ntlm/encoding/NegotiateMessage.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/main/java/org/jboss/security/negotiation/ntlm/encoding/NegotiateMessage.java 2011-08-03 10:45:47 UTC (rev 111911)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/main/java/org/jboss/security/negotiation/ntlm/encoding/NegotiateMessage.java 2011-08-03 12:01:03 UTC (rev 111912)
@@ -20,7 +20,6 @@
import java.io.OutputStream;
import org.jboss.security.negotiation.NegotiationMessage;
-import org.jboss.util.NotImplementedException;
/**
* Representation of an NTLM NEGOTIATIE_MESSAGE
@@ -119,7 +118,7 @@
@Override
public void writeTo(OutputStream os) throws IOException
{
- throw new NotImplementedException();
+ throw new IllegalAccessError("Not Implemented");
}
@Override
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/tests/java/org/jboss/security/negotiation/ntlm/encoding/NegotiationMessageDecoderTest.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/tests/java/org/jboss/security/negotiation/ntlm/encoding/NegotiationMessageDecoderTest.java 2011-08-03 10:45:47 UTC (rev 111911)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/tests/java/org/jboss/security/negotiation/ntlm/encoding/NegotiationMessageDecoderTest.java 2011-08-03 12:01:03 UTC (rev 111912)
@@ -16,9 +16,7 @@
package org.jboss.security.negotiation.ntlm.encoding;
-import org.jboss.security.negotiation.ntlm.encoding.NegotiateMessage;
-import org.jboss.security.negotiation.ntlm.encoding.NegotiateMessageDecoder;
-import org.jboss.util.Base64;
+import org.picketbox.commons.cipher.Base64;
import junit.framework.TestCase;
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-spnego/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-spnego/pom.xml 2011-08-03 10:45:47 UTC (rev 111911)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-spnego/pom.xml 2011-08-03 12:01:03 UTC (rev 111912)
@@ -44,10 +44,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
@@ -59,6 +55,10 @@
<groupId>org.picketbox</groupId>
<artifactId>picketbox</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.picketbox</groupId>
+ <artifactId>picketbox-commons</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenInit.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenInit.java 2011-08-03 10:45:47 UTC (rev 111911)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenInit.java 2011-08-03 12:01:03 UTC (rev 111912)
@@ -22,7 +22,6 @@
import java.util.List;
import org.ietf.jgss.Oid;
-import org.jboss.util.NotImplementedException;
/**
* Representation of NegTokenInit.
@@ -84,7 +83,7 @@
@Override
public void writeTo(OutputStream os) throws IOException
{
- throw new NotImplementedException();
+ throw new IllegalAccessError("Not Implemented");
}
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/tests/java/org/jboss/security/negotiation/spnego/encoding/Security439TestCase.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/tests/java/org/jboss/security/negotiation/spnego/encoding/Security439TestCase.java 2011-08-03 10:45:47 UTC (rev 111911)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/tests/java/org/jboss/security/negotiation/spnego/encoding/Security439TestCase.java 2011-08-03 12:01:03 UTC (rev 111912)
@@ -6,7 +6,7 @@
import org.jboss.security.negotiation.MessageFactory;
import org.jboss.security.negotiation.common.DebugHelper;
-import org.jboss.util.Base64;
+import org.picketbox.commons.cipher.Base64;
public class Security439TestCase extends TestCase
{
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/pom.xml 2011-08-03 10:45:47 UTC (rev 111911)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/pom.xml 2011-08-03 12:01:03 UTC (rev 111912)
@@ -76,11 +76,6 @@
<!-- -->
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
@@ -91,10 +86,15 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.picketbox</groupId>
- <artifactId>picketbox</artifactId>
+ <groupId>org.picketbox</groupId>
+ <artifactId>picketbox</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.picketbox</groupId>
+ <artifactId>picketbox-commons</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/src/main/java/org/jboss/security/negotiation/toolkit/BasicNegotiationServlet.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/src/main/java/org/jboss/security/negotiation/toolkit/BasicNegotiationServlet.java 2011-08-03 10:45:47 UTC (rev 111911)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/src/main/java/org/jboss/security/negotiation/toolkit/BasicNegotiationServlet.java 2011-08-03 12:01:03 UTC (rev 111912)
@@ -43,7 +43,7 @@
import org.jboss.security.negotiation.ntlm.encoding.NegotiateMessage;
import org.jboss.security.negotiation.spnego.encoding.NegTokenInit;
import org.jboss.security.negotiation.spnego.encoding.NegTokenTarg;
-import org.jboss.util.Base64;
+import org.picketbox.commons.cipher.Base64;
/**
* A basic servlet to test that if prompted the client browser will return a SPNEGO
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/src/main/java/org/jboss/security/negotiation/toolkit/NTLMNegotiationServlet.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/src/main/java/org/jboss/security/negotiation/toolkit/NTLMNegotiationServlet.java 2011-08-03 10:45:47 UTC (rev 111911)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/src/main/java/org/jboss/security/negotiation/toolkit/NTLMNegotiationServlet.java 2011-08-03 12:01:03 UTC (rev 111912)
@@ -37,7 +37,7 @@
import org.jboss.security.negotiation.NegotiationMessage;
import org.jboss.security.negotiation.ntlm.encoding.NTLMField;
import org.jboss.security.negotiation.ntlm.encoding.NegotiateMessage;
-import org.jboss.util.Base64;
+import org.picketbox.commons.cipher.Base64;
/**
* A basic servlet to specifically test the NTLM negotiation.
Modified: projects/security/security-negotiation/trunk/parent/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/parent/pom.xml 2011-08-03 10:45:47 UTC (rev 111911)
+++ projects/security/security-negotiation/trunk/parent/pom.xml 2011-08-03 12:01:03 UTC (rev 111912)
@@ -21,16 +21,16 @@
</scm>
<properties>
<version.junit>4.8.2</version.junit>
- <version.org.jboss.jboss-common-core>2.2.17.GA</version.org.jboss.jboss-common-core>
<version.org.jboss.logging.jboss-logging>3.0.0.Beta5</version.org.jboss.logging.jboss-logging>
<version.org.jboss.spec.javax.servlet.jboss-servlet-api_3.0_spec>1.0.0.Final</version.org.jboss.spec.javax.servlet.jboss-servlet-api_3.0_spec>
<version.org.jboss.web>7.0.0.CR2</version.org.jboss.web>
<version.org.picketbox>4.0.0.Beta4</version.org.picketbox>
+ <version.org.picketbox.picketbox-commons>1.0.0.CR1</version.org.picketbox.picketbox-commons>
</properties>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<testSourceDirectory>src/tests/java</testSourceDirectory>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<resources>
<resource>
<directory>src/resources</directory>
@@ -103,17 +103,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>${version.org.jboss.jboss-common-core}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>${version.org.jboss.logging.jboss-logging}</version>
@@ -133,7 +122,11 @@
<artifactId>picketbox</artifactId>
<version>${version.org.picketbox}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.picketbox</groupId>
+ <artifactId>picketbox-commons</artifactId>
+ <version>${version.org.picketbox.picketbox-commons}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: projects/security/security-negotiation/trunk/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/pom.xml 2011-08-03 10:45:47 UTC (rev 111911)
+++ projects/security/security-negotiation/trunk/pom.xml 2011-08-03 12:01:03 UTC (rev 111912)
@@ -4,7 +4,7 @@
<groupId>org.jboss.security</groupId>
<artifactId>jboss-negotiation-project</artifactId>
<version>2.2.0.SNAPSHOT</version>
- <relativePath>parent/pom.xml</relativePath>
+
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.security</groupId>
More information about the jboss-cvs-commits
mailing list