[jboss-cvs] JBossAS SVN: r73319 - in projects/security/security-negotiation/trunk: jboss-negotiation and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 12 19:12:23 EDT 2008
Author: darran.lofthouse at jboss.com
Date: 2008-05-12 19:12:23 -0400 (Mon, 12 May 2008)
New Revision: 73319
Added:
projects/security/security-negotiation/trunk/jboss-negotiation/.classpath
projects/security/security-negotiation/trunk/jboss-negotiation/.project
projects/security/security-negotiation/trunk/jboss-negotiation/src/resources/
projects/security/security-negotiation/trunk/parent/.project
Modified:
projects/security/security-negotiation/trunk/
projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/
projects/security/security-negotiation/trunk/jboss-negotiation/
projects/security/security-negotiation/trunk/jboss-negotiation/pom.xml
projects/security/security-negotiation/trunk/jboss-negotiation/src/main/java/org/jboss/security/negotiation/MessageTrace.java
projects/security/security-negotiation/trunk/jboss-negotiation/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java
projects/security/security-negotiation/trunk/jboss-negotiation/src/main/java/org/jboss/security/negotiation/spnego/encoding/DebugHelper.java
projects/security/security-negotiation/trunk/parent/pom.xml
Log:
Improved Maven Build.
Property changes on: projects/security/security-negotiation/trunk
___________________________________________________________________
Name: svn:ignore
+ .metadata
Property changes on: projects/security/security-negotiation/trunk/jboss-negotiation
___________________________________________________________________
Name: svn:ignore
+ target
Added: projects/security/security-negotiation/trunk/jboss-negotiation/.classpath
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation/.classpath (rev 0)
+++ projects/security/security-negotiation/trunk/jboss-negotiation/.classpath 2008-05-12 23:12:23 UTC (rev 73319)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/resources"/>
+ <classpathentry kind="src" path="src/tests/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbosssx/4.2.2.GA/jbosssx-4.2.2.GA.jar"/>
+ <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/apache-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
+ <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="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="output" path="target/eclipse-classes"/>
+</classpath>
Added: projects/security/security-negotiation/trunk/jboss-negotiation/.project
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation/.project (rev 0)
+++ projects/security/security-negotiation/trunk/jboss-negotiation/.project 2008-05-12 23:12:23 UTC (rev 73319)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-negotiation</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Modified: projects/security/security-negotiation/trunk/jboss-negotiation/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation/pom.xml 2008-05-12 22:04:26 UTC (rev 73318)
+++ projects/security/security-negotiation/trunk/jboss-negotiation/pom.xml 2008-05-12 23:12:23 UTC (rev 73319)
@@ -28,56 +28,37 @@
</plugins>
</build>
-<!-- <dependencies>
+ <!-- Do not add version information here, use ../parent/pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
<dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jboss-sunxacml</artifactId>
- <version>${xacml.version}</version>
+ <groupId>apache-codec</groupId>
+ <artifactId>commons-codec</artifactId>
</dependency>
<dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- <version>2.7.1</version>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1.4</version>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common</artifactId>
</dependency>
<dependency>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.4</version>
+ <groupId>jboss</groupId>
+ <artifactId>jbosssx</artifactId>
</dependency>
<dependency>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <version>2.1.4</version>
+ <groupId>jboss.web</groupId>
+ <artifactId>jbossweb</artifactId>
</dependency>
<dependency>
+ <groupId>jboss.web</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
</dependency>
- <dependency>
- <groupId>sun-jaf</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>codehaus-stax</groupId>
- <artifactId>stax</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jaxs-api</artifactId>
- <version>1.2.0.20070913080910</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-servlet-api</artifactId>
- <version>2.5.0.20070913080910</version>
- </dependency>
- </dependencies> -->
+ </dependencies>
+
</project>
Modified: projects/security/security-negotiation/trunk/jboss-negotiation/src/main/java/org/jboss/security/negotiation/MessageTrace.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation/src/main/java/org/jboss/security/negotiation/MessageTrace.java 2008-05-12 22:04:26 UTC (rev 73318)
+++ projects/security/security-negotiation/trunk/jboss-negotiation/src/main/java/org/jboss/security/negotiation/MessageTrace.java 2008-05-12 23:12:23 UTC (rev 73319)
@@ -22,7 +22,7 @@
*/
package org.jboss.security.negotiation;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.security.negotiation.spnego.encoding.DebugHelper;
/**
Modified: projects/security/security-negotiation/trunk/jboss-negotiation/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java 2008-05-12 22:04:26 UTC (rev 73318)
+++ projects/security/security-negotiation/trunk/jboss-negotiation/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java 2008-05-12 23:12:23 UTC (rev 73319)
@@ -35,7 +35,7 @@
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
-import org.apache.commons.codec.binary.Base64;
+import org.jboss.util.Base64;
import org.ietf.jgss.GSSContext;
import org.ietf.jgss.GSSCredential;
import org.ietf.jgss.GSSException;
@@ -206,7 +206,7 @@
try
{
String requestHeader = spnegoContext.getRequestHeader();
- byte[] reqToken = Base64.decodeBase64(requestHeader.getBytes());
+ byte[] reqToken = Base64.decode(requestHeader);
MessageTrace.logRequestBase64(spnegoContext.getRequestHeader());
MessageTrace.logRequestHex(reqToken);
@@ -245,7 +245,7 @@
}
byte[] respSpnego = NegTokenTargEncoder.encode(negTokenTarg);
- String respEncoded = new String(Base64.encodeBase64(respSpnego));
+ String respEncoded = Base64.encodeBytes(respSpnego);
MessageTrace.logResponseBase64(respEncoded);
MessageTrace.logResponseHex(respSpnego);
@@ -300,7 +300,7 @@
negTokenTarg.setResponseToken(respToken);
byte[] respSpnego = NegTokenTargEncoder.encode(negTokenTarg);
- String respEncoded = new String(Base64.encodeBase64(respSpnego));
+ String respEncoded = Base64.encodeBytes(respSpnego);
MessageTrace.logResponseBase64(respEncoded);
MessageTrace.logResponseHex(respSpnego);
Modified: projects/security/security-negotiation/trunk/jboss-negotiation/src/main/java/org/jboss/security/negotiation/spnego/encoding/DebugHelper.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation/src/main/java/org/jboss/security/negotiation/spnego/encoding/DebugHelper.java 2008-05-12 22:04:26 UTC (rev 73318)
+++ projects/security/security-negotiation/trunk/jboss-negotiation/src/main/java/org/jboss/security/negotiation/spnego/encoding/DebugHelper.java 2008-05-12 23:12:23 UTC (rev 73319)
@@ -29,6 +29,7 @@
public static String convertToHex(final byte[] message)
{
StringBuffer sb = new StringBuffer(message.length * 5);
+
char[] hex = Hex.encodeHex(message);
for (int i = 0; i < hex.length; i++)
Property changes on: projects/security/security-negotiation/trunk/jboss-negotiation-toolkit
___________________________________________________________________
Name: svn:ignore
+ target
Added: projects/security/security-negotiation/trunk/parent/.project
===================================================================
--- projects/security/security-negotiation/trunk/parent/.project (rev 0)
+++ projects/security/security-negotiation/trunk/parent/.project 2008-05-12 23:12:23 UTC (rev 73319)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>parent</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Modified: projects/security/security-negotiation/trunk/parent/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/parent/pom.xml 2008-05-12 22:04:26 UTC (rev 73318)
+++ projects/security/security-negotiation/trunk/parent/pom.xml 2008-05-12 23:12:23 UTC (rev 73319)
@@ -18,6 +18,14 @@
<connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/security/security-negotiation/trunk</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/security/security-negotiation/trunk</developerConnection>
</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-web>2.1.0.GA</version.jboss-web>
+ <version.junit>3.8.1</version.junit>
+ </properties>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<testSourceDirectory>src/tests</testSourceDirectory>
@@ -81,4 +89,46 @@
</snapshots>
</repository>
</repositories>
+
+ <dependencyManagement>
+ <!-- The parent pom manages the inter-dependencies of the modules. -->
+ <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>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common</artifactId>
+ <version>${version.jboss.jboss-common}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jbosssx</artifactId>
+ <version>${version.jboss.jbosssx}</version>
+ </dependency>
+ <dependency>
+ <groupId>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>
+ </dependencies>
+ </dependencyManagement>
+
</project>
More information about the jboss-cvs-commits
mailing list