[Neuclear-develop] neuclear-id/src/webapp/WEB-INF web.xml,1.7,1.8

[<pe...@us...>]

Update of /cvsroot/neuclear/neuclear-id/src/webapp/WEB-INF
In directory sc8-pr-cvs1:/tmp/cvs-serv26213/src/webapp/WEB-INF

Modified Files:
	web.xml 
Log Message:
added ServletTools.getInitParam() which first tries the ServletConfig, then the context config.
All the web.xml's have been updated to support this. Also various further generalizations have been done throughout
for getServiceid(), getTitle(), getSigner()

Index: web.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** web.xml	14 Dec 2003 20:53:04 -0000	1.7
--- web.xml	15 Dec 2003 23:33:05 -0000	1.8
***************
*** 1,19 ****
  <!DOCTYPE web-app
!     PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
!     "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
! 
  <web-app>
- 
      <display-name>NeuClear WebApp</display-name>
      <description>
  	Demo NeuClear Web app
      </description>
      <filter>
          <filter-name>authfilter</filter-name>
          <filter-class>org.neuclear.auth.AuthenticationFilter</filter-class>
-         <init-param>
-             <param-name>serviceid</param-name>
-             <param-value>neu://test</param-value>
-         </init-param>
      </filter>
      <filter-mapping>
--- 1,31 ----
+ <?xml version="1.0" encoding="ISO-8859-1"?>
  <!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>
      <display-name>NeuClear WebApp</display-name>
      <description>
  	Demo NeuClear Web app
      </description>
+      <context-param>
+              <param-name>serviceid</param-name>
+              <param-value>neu://test</param-value>
+              <description>NeuClear id of Service</description>
+      </context-param>
+      <context-param>
+               <param-name>title</param-name>
+               <param-value>NeuClear Sample Web Application</param-value>
+      </context-param>
+      <context-param>
+               <param-name>keystore</param-name>
+               <param-value>test</param-value>
+      </context-param>
+      <context-param>
+               <param-name>passphraseagent</param-name>
+               <param-value>test</param-value>
+      </context-param>
      <filter>
          <filter-name>authfilter</filter-name>
          <filter-class>org.neuclear.auth.AuthenticationFilter</filter-class>
      </filter>
      <filter-mapping>
***************
*** 22,42 ****
      </filter-mapping>
      <servlet>
-         <servlet-name>jcesigner</servlet-name>
-         <servlet-class>org.neuclear.signers.servlet.SigningServlet</servlet-class>
-         <init-param>
-             <param-name>title</param-name>
-             <param-value>NeuClear Local Signer</param-value>
-         </init-param>
-         <init-param>
-             <param-name>keeppassphrase</param-name>
-             <param-value>1</param-value>
-         </init-param>
-         <init-param>
-             <param-name>passphraseagent</param-name>
-             <param-value>gui</param-value>
-         </init-param>
-         <load-on-startup>1</load-on-startup>
-     </servlet>
-     <servlet>
          <servlet-name>demosigner</servlet-name>
          <servlet-class>org.neuclear.signers.servlet.DemoSigningServlet</servlet-class>
--- 34,37 ----
***************
*** 50,79 ****
          <servlet-name>authenticator</servlet-name>
          <servlet-class>org.neuclear.auth.AuthenticationServlet</servlet-class>
-         <init-param>
-             <param-name>title</param-name>
-             <param-value>NeuClear Example Application</param-value>
-         </init-param>
-         <init-param>
-             <param-name>serviceid</param-name>
-             <param-value>neu://test</param-value>
-         </init-param>
-         <init-param>
-             <param-name>keystore</param-name>
-             <param-value></param-value>
-         </init-param>
-         <init-param>
-             <param-name>keeppassphrase</param-name>
-             <param-value>1</param-value>
-         </init-param>
-         <init-param>
-             <param-name>passphraseagent</param-name>
-             <param-value>gui</param-value>
-         </init-param>
          <load-on-startup>1</load-on-startup>
      </servlet>
-     <servlet-mapping>
-         <servlet-name>jcesigner</servlet-name>
-         <url-pattern>/Signer</url-pattern>
-     </servlet-mapping>
      <servlet-mapping>
          <servlet-name>demosigner</servlet-name>
--- 45,50 ----