[jboss-cvs] JBossAS SVN: r109512 - in projects/security/security-negotiation/trunk: assembly/.settings and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Nov 27 10:09:01 EST 2010
Author: darran.lofthouse at jboss.com
Date: 2010-11-27 10:09:00 -0500 (Sat, 27 Nov 2010)
New Revision: 109512
Added:
projects/security/security-negotiation/trunk/assembly/.settings/
projects/security/security-negotiation/trunk/assembly/.settings/org.maven.ide.eclipse.prefs
Modified:
projects/security/security-negotiation/trunk/assembly/.project
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/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/.classpath
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/.classpath
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/.classpath
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/net/InitSPNEGOContextAction.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/.classpath
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
Log:
[SECURITY-544] Restore Dependencies and APIs to match libraries available within JBoss AS 6.
Modified: projects/security/security-negotiation/trunk/assembly/.project
===================================================================
--- projects/security/security-negotiation/trunk/assembly/.project 2010-11-27 15:02:11 UTC (rev 109511)
+++ projects/security/security-negotiation/trunk/assembly/.project 2010-11-27 15:09:00 UTC (rev 109512)
@@ -5,7 +5,13 @@
<projects>
</projects>
<buildSpec>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Added: projects/security/security-negotiation/trunk/assembly/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/security/security-negotiation/trunk/assembly/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/security/security-negotiation/trunk/assembly/.settings/org.maven.ide.eclipse.prefs 2010-11-27 15:09:00 UTC (rev 109512)
@@ -0,0 +1,9 @@
+#Sat Nov 27 14:06:51 GMT 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-common/.classpath
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-common/.classpath 2010-11-27 15:02:11 UTC (rev 109511)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-common/.classpath 2010-11-27 15:09:00 UTC (rev 109512)
@@ -3,7 +3,7 @@
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/tests/java"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-common/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-common/pom.xml 2010-11-27 15:02:11 UTC (rev 109511)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-common/pom.xml 2010-11-27 15:09:00 UTC (rev 109512)
@@ -42,17 +42,13 @@
<artifactId>jboss-common</artifactId>
</dependency>
<dependency>
- <groupId>jboss.web</groupId>
- <artifactId>jbossweb</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>jboss.web</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.web</groupId>
+ <artifactId>jbossweb</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 2010-11-27 15:02:11 UTC (rev 109511)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java 2010-11-27 15:09:00 UTC (rev 109512)
@@ -27,17 +27,22 @@
import java.io.IOException;
import java.security.Principal;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.catalina.Realm;
import org.apache.catalina.Session;
import org.apache.catalina.authenticator.AuthenticatorBase;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
+
import org.apache.catalina.deploy.LoginConfig;
import org.apache.log4j.Logger;
import org.jboss.security.negotiation.common.MessageTrace;
import org.jboss.security.negotiation.common.NegotiationContext;
-import org.picketbox.commons.cipher.Base64;
+import org.jboss.util.Base64;
+
+
/**
* An authenticator to manage Negotiation based authentication in connection with the
* Negotiation login module.
@@ -60,7 +65,7 @@
}
@Override
- protected boolean authenticate(final Request request, final Response response, final LoginConfig config)
+ public boolean authenticate(final Request request, final HttpServletResponse response, final LoginConfig config)
throws IOException
{
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 2010-11-27 15:02:11 UTC (rev 109511)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationMessage.java 2010-11-27 15:09:00 UTC (rev 109512)
@@ -20,7 +20,7 @@
import java.io.IOException;
import java.io.OutputStream;
-import org.picketbox.commons.cipher.Base64;
+import org.jboss.util.Base64;
/**
* The common base type for all negotiation messages.
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-extras/.classpath
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-extras/.classpath 2010-11-27 15:02:11 UTC (rev 109511)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-extras/.classpath 2010-11-27 15:09:00 UTC (rev 109512)
@@ -3,7 +3,7 @@
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/tests/java"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
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 2010-11-27 15:02:11 UTC (rev 109511)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation/AdvancedADLoginModule.java 2010-11-27 15:09:00 UTC (rev 109512)
@@ -34,7 +34,7 @@
import javax.naming.ldap.LdapContext;
import javax.security.auth.login.LoginException;
-import org.picketbox.commons.cipher.Base64;
+import org.jboss.util.Base64;
/**
* An extension of the AdvancedLdapLoginModule to also query the primary group
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/.classpath
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/.classpath 2010-11-27 15:02:11 UTC (rev 109511)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/.classpath 2010-11-27 15:09:00 UTC (rev 109512)
@@ -3,7 +3,7 @@
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/tests/java"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
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 2010-11-27 15:02:11 UTC (rev 109511)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/tests/java/org/jboss/security/negotiation/ntlm/encoding/NegotiationMessageDecoderTest.java 2010-11-27 15:09:00 UTC (rev 109512)
@@ -18,7 +18,7 @@
import org.jboss.security.negotiation.ntlm.encoding.NegotiateMessage;
import org.jboss.security.negotiation.ntlm.encoding.NegotiateMessageDecoder;
-import org.picketbox.commons.cipher.Base64;
+import org.jboss.util.Base64;
import junit.framework.TestCase;
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-spnego/.classpath
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-spnego/.classpath 2010-11-27 15:02:11 UTC (rev 109511)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-spnego/.classpath 2010-11-27 15:09:00 UTC (rev 109512)
@@ -3,7 +3,7 @@
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/tests/java"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-spnego/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-spnego/pom.xml 2010-11-27 15:02:11 UTC (rev 109511)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-spnego/pom.xml 2010-11-27 15:09:00 UTC (rev 109512)
@@ -46,10 +46,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
- <dependency>
- <groupId>org.picketbox</groupId>
- <artifactId>jboss-security-spi</artifactId>
- </dependency>
+
</dependencies>
</project>
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/InitSPNEGOContextAction.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/InitSPNEGOContextAction.java 2010-11-27 15:02:11 UTC (rev 109511)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/InitSPNEGOContextAction.java 2010-11-27 15:09:00 UTC (rev 109512)
@@ -106,7 +106,7 @@
if (DEBUG)
log.trace("GSSContext established");
Subject subject = lc.getSubject();
- Principal principal = subject.getPrincipals().iterator().next();
+ Principal principal = (Principal)subject.getPrincipals().iterator().next();
try
{
setSecurityContext(principal, null, subject, "CLIENT");
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 2010-11-27 15:02:11 UTC (rev 109511)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/tests/java/org/jboss/security/negotiation/spnego/encoding/Security439TestCase.java 2010-11-27 15:09:00 UTC (rev 109512)
@@ -5,9 +5,8 @@
import junit.framework.TestCase;
import org.jboss.security.negotiation.MessageFactory;
-import org.jboss.security.negotiation.NegotiationMessage;
import org.jboss.security.negotiation.common.DebugHelper;
-import org.picketbox.commons.cipher.Base64;
+import org.jboss.util.Base64;
public class Security439TestCase extends TestCase
{
@@ -29,12 +28,12 @@
private void decode(final String message) throws Exception
{
byte[] authToken = Base64.decode(message);
- String hex = DebugHelper.convertToHex(authToken);
+ DebugHelper.convertToHex(authToken);
ByteArrayInputStream authTokenIS = new ByteArrayInputStream(authToken);
MessageFactory mf = MessageFactory.newInstance();
- NegotiationMessage requestMessage = mf.createMessage(authTokenIS);
+ mf.createMessage(authTokenIS);
}
}
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.classpath
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.classpath 2010-11-27 15:02:11 UTC (rev 109511)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.classpath 2010-11-27 15:09:00 UTC (rev 109512)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/pom.xml 2010-11-27 15:02:11 UTC (rev 109511)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/pom.xml 2010-11-27 15:09:00 UTC (rev 109512)
@@ -69,8 +69,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>jboss.web</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
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 2010-11-27 15:02:11 UTC (rev 109511)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/src/main/java/org/jboss/security/negotiation/toolkit/BasicNegotiationServlet.java 2010-11-27 15:09:00 UTC (rev 109512)
@@ -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.picketbox.commons.cipher.Base64;
+import org.jboss.util.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 2010-11-27 15:02:11 UTC (rev 109511)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/src/main/java/org/jboss/security/negotiation/toolkit/NTLMNegotiationServlet.java 2010-11-27 15:09:00 UTC (rev 109512)
@@ -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.picketbox.commons.cipher.Base64;
+import org.jboss.util.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 2010-11-27 15:02:11 UTC (rev 109511)
+++ projects/security/security-negotiation/trunk/parent/pom.xml 2010-11-27 15:09:00 UTC (rev 109512)
@@ -24,10 +24,9 @@
<version.jboss.jbosssx>4.2.3.GA</version.jboss.jbosssx>
<version.jboss.jmx>4.2.3.GA</version.jboss.jmx>
<version.jboss.system>4.2.3.GA</version.jboss.system>
- <version.jboss-web>2.1.0.GA</version.jboss-web>
+ <version.jboss-web>3.0.0-beta-7</version.jboss-web>
<version.junit>3.8.1</version.junit>
- <version.picketbox-commons>1.0.0.CR1</version.picketbox-commons>
- <version.picketbox>3.0.0.CR2</version.picketbox>
+ <version.servlet.api>1.0.0.Final</version.servlet.api>
</properties>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
@@ -82,20 +81,6 @@
</plugins>
</build>
<repositories>
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Maven Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
<repository>
<id>jboss</id>
<name>JBoss Repository</name>
@@ -155,35 +140,25 @@
<version>${version.jboss.jbosssx}</version>
</dependency>
<dependency>
- <groupId>org.picketbox</groupId>
- <artifactId>jboss-security-spi</artifactId>
- <version>${version.picketbox}</version>
- </dependency>
- <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-system</artifactId>
<version>${version.jboss.system}</version>
- </dependency>
+ </dependency>
<dependency>
- <groupId>jboss.web</groupId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <version>${version.servlet.api}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.web</groupId>
<artifactId>jbossweb</artifactId>
<version>${version.jboss-web}</version>
</dependency>
<dependency>
- <groupId>jboss.web</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${version.jboss-web}</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
</dependency>
- <dependency>
- <groupId>org.picketbox</groupId>
- <artifactId>picketbox-commons</artifactId>
- <version>${version.picketbox-commons}</version>
- </dependency>
</dependencies>
</dependencyManagement>
More information about the jboss-cvs-commits
mailing list