[Neuclear-develop] neuclear-pay/src/webapp/WEB-INF web.xml,1.3,1.4

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

Update of /cvsroot/neuclear/neuclear-pay/src/webapp/WEB-INF
In directory sc8-pr-cvs1:/tmp/cvs-serv26037/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-pay/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** web.xml	28 Nov 2003 00:11:51 -0000	1.3
--- web.xml	15 Dec 2003 23:31:54 -0000	1.4
***************
*** 1,5 ****
  <!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 Pay WebApp</display-name>
--- 1,6 ----
+ <?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 Pay WebApp</display-name>
***************
*** 7,17 ****
  	AssetController 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/bux</param-value>
-         </init-param>
      </filter>
      <filter-mapping>
--- 8,31 ----
  	AssetController App
      </description>
+     <context-param>
+             <param-name>serviceid</param-name>
+             <param-value>neu://test/bux</param-value>
+             <description>NeuClear id of Service</description>
+     </context-param>
+     <context-param>
+              <param-name>title</param-name>
+              <param-value>NeuClear Sample E-Currency 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>
***************
*** 23,34 ****
          <servlet-class>org.neuclear.asset.receiver.servlet.AssetControllerServlet</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/bux</param-value>
-         </init-param>
-         <init-param>
              <param-name>datasource</param-name>
              <param-value>jdbc/AssetDS</param-value>
--- 37,40 ----
***************
*** 36,62 ****
          <load-on-startup>1</load-on-startup>
      </servlet>
!     <servlet>
!         <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/bux</param-value>
!         </init-param>
!         <load-on-startup>1</load-on-startup>
!     </servlet>
      <servlet-mapping>
          <servlet-name>assetcontroller</servlet-name>
!         <url-pattern>/Asset</url-pattern>
      </servlet-mapping>
      <servlet-mapping>
          <servlet-name>authenticator</servlet-name>
!         <url-pattern>/Authorize</url-pattern>
      </servlet-mapping>
      <welcome-file-list>
          <welcome-file>index.jsp</welcome-file>
      </welcome-file-list>
! </web-app>
--- 42,60 ----
          <load-on-startup>1</load-on-startup>
      </servlet>
!      <servlet>
!          <servlet-name>authenticator</servlet-name>
!          <servlet-class>org.neuclear.auth.AuthenticationServlet</servlet-class>
!          <load-on-startup>1</load-on-startup>
!      </servlet>
      <servlet-mapping>
          <servlet-name>assetcontroller</servlet-name>
!         <url-pattern>Asset</url-pattern>
      </servlet-mapping>
      <servlet-mapping>
          <servlet-name>authenticator</servlet-name>
!         <url-pattern>Authorize</url-pattern>
      </servlet-mapping>
      <welcome-file-list>
          <welcome-file>index.jsp</welcome-file>
      </welcome-file-list>
! </web-app>
\ No newline at end of file