[jboss-cvs] JBossAS SVN: r73380 - in projects/security/security-negotiation/trunk: jboss-negotiation-toolkit/src/main/java/org/jboss/security/negotiation/toolkit and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue May 13 17:38:01 EDT 2008 

Author: darran.lofthouse at jboss.com
Date: 2008-05-13 17:38:01 -0400 (Tue, 13 May 2008)
New Revision: 73380

Added:
   projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.classpath
   projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.project
Removed:
   projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/src/main/webapp/index.jsp
Modified:
   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/parent/pom.xml
Log:
Configure classpath and dependencies for negotiation-toolkit.

Added: projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.classpath
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.classpath	                        (rev 0)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.classpath	2008-05-13 21:38:01 UTC (rev 73380)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<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/jboss/web/servlet-api/2.1.0.GA/servlet-api-2.1.0.GA.jar"/>
+	<classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jboss-negotiation"/>
+	<classpathentry kind="var" path="M2_REPO/jboss/jbosssx/4.2.2.GA/jbosssx-4.2.2.GA.jar"/>
+	<classpathentry kind="output" path="target/eclipse-classes"/>
+</classpath>

Added: projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.project
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.project	                        (rev 0)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.project	2008-05-13 21:38:01 UTC (rev 73380)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>jboss-negotiation-toolkit</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-toolkit/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/pom.xml	2008-05-13 21:20:20 UTC (rev 73379)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/pom.xml	2008-05-13 21:38:01 UTC (rev 73380)
@@ -28,56 +28,30 @@
     </plugins>
   </build>
 
-<!--  <dependencies>
+  <!-- Do not add version information here, use ../parent/pom.xml instead -->
+  <dependencies>
+    <!-- Local Dependencies -->
     <dependency>
       <groupId>org.jboss.security</groupId>
-      <artifactId>jboss-sunxacml</artifactId>
-      <version>${xacml.version}</version>
+      <artifactId>jboss-negotiation</artifactId>
     </dependency>
+    
+    <!-- Global dependencies -->
     <dependency>
-      <groupId>apache-xerces</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>2.7.1</version>
-    </dependency>
+      <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>
-    </dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jbosssx</artifactId>
+    </dependency>    
     <dependency>
-      <groupId>sun-jaxb</groupId>
-      <artifactId>jaxb-xjc</artifactId>
-      <version>2.1.4</version>
-    </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> -->
+      <groupId>jboss.web</groupId>
+      <artifactId>servlet-api</artifactId>
+    </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	2008-05-13 21:20:20 UTC (rev 73379)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/src/main/java/org/jboss/security/negotiation/toolkit/BasicNegotiationServlet.java	2008-05-13 21:38:01 UTC (rev 73380)
@@ -31,7 +31,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.codec.binary.Base64;
+import org.jboss.util.Base64;
 import org.apache.log4j.Logger;
 import org.ietf.jgss.GSSException;
 import org.ietf.jgss.Oid;
@@ -130,7 +130,7 @@
 
       // Drop the 'Negotiate ' from the header.
       String requestHeader = authHeader.substring(10);
-      byte[] reqToken = Base64.decodeBase64(requestHeader.getBytes());
+      byte[] reqToken = Base64.decode(requestHeader);
 
       if (reqToken[0] == 0x60)
       {
@@ -163,7 +163,7 @@
          byte[] mechToken = negTokenInit.getMechToken();
          if (mechToken != null && mechToken.length > 0)
          {
-            writer.print(new String(Base64.encodeBase64(mechToken)));
+            writer.print(new String(Base64.encodeBytes(mechToken)));
          }
          writer.println("<br>");
 
@@ -171,7 +171,7 @@
          byte[] mechTokenMic = negTokenInit.getMechListMIC();
          if (mechTokenMic != null && mechTokenMic.length > 0)
          {
-            writer.print(new String(Base64.encodeBase64(mechTokenMic)));
+            writer.print(new String(Base64.encodeBytes(mechTokenMic)));
          }
          writer.println("<br>");
       }

Deleted: projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/src/main/webapp/index.jsp
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/src/main/webapp/index.jsp	2008-05-13 21:20:20 UTC (rev 73379)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/src/main/webapp/index.jsp	2008-05-13 21:38:01 UTC (rev 73380)
@@ -1,5 +0,0 @@
-<html>
-<body>
-<h2>Hello World!</h2>
-</body>
-</html>

Modified: projects/security/security-negotiation/trunk/parent/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/parent/pom.xml	2008-05-13 21:20:20 UTC (rev 73379)
+++ projects/security/security-negotiation/trunk/parent/pom.xml	2008-05-13 21:38:01 UTC (rev 73380)
@@ -92,8 +92,17 @@
 
   <dependencyManagement>
     <!-- The parent pom manages the inter-dependencies of the modules. -->
+    
     <dependencies>
+      <!-- Local Dependencies -->
       <dependency>
+        <groupId>org.jboss.security</groupId>
+        <artifactId>jboss-negotiation</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+    
+      <!-- External Dependencies -->
+      <dependency>
         <groupId>apache-codec</groupId>
         <artifactId>commons-codec</artifactId>
         <version>${version.apache-codec.commons-codec}</version>

More information about the jboss-cvs-commits mailing list