[jboss-cvs] JBossAS SVN: r83683 - in projects/security/security-negotiation/branches/Branch_2_0: jboss-negotiation-toolkit/src/main/webapp/WEB-INF and 1 other directory.

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

Author: darran.lofthouse at jboss.com
Date: 2009-01-30 09:24:30 -0500 (Fri, 30 Jan 2009)
New Revision: 83683

Modified:
   projects/security/security-negotiation/branches/Branch_2_0/docs/userguide/en/modules/general_installation.xml
   projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-toolkit/src/main/webapp/WEB-INF/web.xml
Log:
[SECURITY-279] Documentation updates - add JBoss 5.0.x

Modified: projects/security/security-negotiation/branches/Branch_2_0/docs/userguide/en/modules/general_installation.xml
===================================================================
--- projects/security/security-negotiation/branches/Branch_2_0/docs/userguide/en/modules/general_installation.xml	2009-01-30 13:52:42 UTC (rev 83682)
+++ projects/security/security-negotiation/branches/Branch_2_0/docs/userguide/en/modules/general_installation.xml	2009-01-30 14:24:30 UTC (rev 83683)
@@ -62,28 +62,66 @@
       </para>
 
       <para>
-        After copying the jar to the above location you will need to add
-        the authenticator itself to the following descriptor -
-        <code>
-          {jboss.home}/server/{configuration}/deploy/jboss-web.deployer/META-INF/jboss-service.xml
-        </code>
+        The locations to define the authenticator are slightly different
+        between JBoss AS 4.2.x and JBoss AS 5.0.x.
       </para>
 
-      <para>
-        Within this descriptor you should see a set of authenticators,
-        to add SPNEGO you should add the following entry: -
-      </para>
+      <section>
+        <title>JBoss AS 4.2.x</title>
 
-      <programlisting>
-        <![CDATA[
+        <para>
+          After copying the jar to the above location you will need to
+          add the authenticator itself to the following descriptor -
+          <code>
+            {jboss.home}/server/{configuration}/deploy/jboss-web.deployer/META-INF/jboss-service.xml
+          </code>
+        </para>
+
+        <para>
+          Within this descriptor you should see a set of authenticators,
+          to add negotiation you should add the following entry: -
+        </para>
+
+        <programlisting>
+          <![CDATA[
 <java:property>
   <java:key>SPNEGO</java:key>
   <java:value>org.jboss.security.negotiation.NegotiationAuthenticator</java:value>
 </java:property>
       ]]>
-      </programlisting>
+        </programlisting>
 
+      </section>
 
+      <section>
+        <title>JBoss AS 5.0.x</title>
+
+        <para>
+          After copying the jar to the above location you will need to
+          add the authenticator itself to the following descriptor -
+          <code>
+            {jboss.home}/server/{configuration}/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
+          </code>
+        </para>
+
+        <para>
+          Within this descriptor you should see a set of authenticators
+          defined using a property called "authenticators", you should
+          add the following entry: -
+        </para>
+
+        <programlisting>
+          <![CDATA[
+<entry>
+  <key>SPNEGO</key>
+  <value>org.jboss.security.negotiation.NegotiationAuthenticator</value>
+</entry>
+      ]]>
+        </programlisting>
+
+      </section>
+
+
       <tip>
         <para>
           Ensure that there is no white space around the classname as

Modified: projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-toolkit/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-toolkit/src/main/webapp/WEB-INF/web.xml	2009-01-30 13:52:42 UTC (rev 83682)
+++ projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-toolkit/src/main/webapp/WEB-INF/web.xml	2009-01-30 14:24:30 UTC (rev 83683)
@@ -1,8 +1,10 @@
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-	version="2.4">
+<?xml version="1.0"?>
+<!DOCTYPE web-app PUBLIC
+   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+   "http://java.sun.com/dtd/web-app_2_3.dtd">
 
+<web-app>
+
 	<servlet>
 		<servlet-name>BasicNegotiation</servlet-name>
 		<servlet-class>