[Digir-cvs] java/org/calacademy/digir/presentation presentation.xml,1.15,1.16 presentation.xsd,1.12,1.13 presentation_default.xml,1.4,1.5 presentation_manis.xml,1.7,1.8

[<pee...@us...>]

Update of /cvsroot/digir/java/org/calacademy/digir/presentation
In directory sc8-pr-cvs1:/tmp/cvs-serv12630

Modified Files:
	presentation.xml presentation.xsd presentation_default.xml 
	presentation_manis.xml 
Log Message:
added maxUserSpecifiedTimeout element


Index: presentation.xml
===================================================================
RCS file: /cvsroot/digir/java/org/calacademy/digir/presentation/presentation.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** presentation.xml	31 Jul 2003 13:51:26 -0000	1.15
--- presentation.xml	2 Aug 2003 00:07:14 -0000	1.16
***************
*** 6,14 ****
  		<connectionWaitTime>10</connectionWaitTime>
  		<connectionEstablishmentTimeout>10</connectionEstablishmentTimeout>
! 		<connectionResponseTimeout>60</connectionResponseTimeout>
  		<connectionRetries>3</connectionRetries>
  	</http>
  	<configRefreshInterval>0</configRefreshInterval>
  	<providerListRefreshInterval>120</providerListRefreshInterval>
  	<display>
  		<color>#663366</color>
--- 6,15 ----
  		<connectionWaitTime>10</connectionWaitTime>
  		<connectionEstablishmentTimeout>10</connectionEstablishmentTimeout>
! 		<connectionResponseTimeout>90</connectionResponseTimeout>
  		<connectionRetries>3</connectionRetries>
  	</http>
  	<configRefreshInterval>0</configRefreshInterval>
  	<providerListRefreshInterval>120</providerListRefreshInterval>
+ 	<maxUserSpecifiedProviderTimeout>60</maxUserSpecifiedProviderTimeout>
  	<display>
  		<color>#663366</color>

Index: presentation.xsd
===================================================================
RCS file: /cvsroot/digir/java/org/calacademy/digir/presentation/presentation.xsd,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** presentation.xsd	31 Jul 2003 13:52:20 -0000	1.12
--- presentation.xsd	2 Aug 2003 00:07:14 -0000	1.13
***************
*** 1,4 ****
  <?xml version="1.0" encoding="UTF-8"?>
! <xsd:schema targetNamespace="http://www.calacademy.org/presentation" xmlns="http://www.calacademy.org/presentation" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
  	<xsd:element name="config">
  		<xsd:annotation>
--- 1,5 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <!-- edited with XMLSPY v5 rel. 3 U (http://www.xmlspy.com) by Stanley D Blum (California Academy of Sciences) -->
! <xsd:schema targetNamespace="http://www.calacademy.org/presentation" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.calacademy.org/presentation" elementFormDefault="qualified">
  	<xsd:element name="config">
  		<xsd:annotation>
***************
*** 54,57 ****
--- 55,63 ----
  					<xsd:annotation>
  						<xsd:documentation>The number of seconds to wait before refreshing the provider list from the dispatcher.  This value indicates the time for the provider list to live.  If a value is not provided, it defaults to 0, meaning to never refresh.</xsd:documentation>
+ 					</xsd:annotation>
+ 				</xsd:element>
+ 				<xsd:element name="maxUserSpecifiedProviderTimeout" type="xsd:positiveInteger" default="60" minOccurs="0">
+ 					<xsd:annotation>
+ 						<xsd:documentation>The maximum number of seconds to allow a user to enter as the Provider Timeout.  It should be less than the httpConnectionResponse Timeout specified aboved.</xsd:documentation>
  					</xsd:annotation>
  				</xsd:element>

Index: presentation_default.xml
===================================================================
RCS file: /cvsroot/digir/java/org/calacademy/digir/presentation/presentation_default.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** presentation_default.xml	31 Jul 2003 13:51:26 -0000	1.4
--- presentation_default.xml	2 Aug 2003 00:07:14 -0000	1.5
***************
*** 6,14 ****
  		<connectionWaitTime>10</connectionWaitTime>
  		<connectionEstablishmentTimeout>10</connectionEstablishmentTimeout>
! 		<connectionResponseTimeout>60</connectionResponseTimeout>
  		<connectionRetries>3</connectionRetries>
  	</http>
  	<configRefreshInterval>0</configRefreshInterval>
  	<providerListRefreshInterval>120</providerListRefreshInterval>
  	<display>
  		<color>#663366</color>
--- 6,15 ----
  		<connectionWaitTime>10</connectionWaitTime>
  		<connectionEstablishmentTimeout>10</connectionEstablishmentTimeout>
! 		<connectionResponseTimeout>90</connectionResponseTimeout>
  		<connectionRetries>3</connectionRetries>
  	</http>
  	<configRefreshInterval>0</configRefreshInterval>
  	<providerListRefreshInterval>120</providerListRefreshInterval>
+ 	<maxUserSpecifiedProviderTimeout>60</maxUserSpecifiedProviderTimeout>
  	<display>
  		<color>#663366</color>

Index: presentation_manis.xml
===================================================================
RCS file: /cvsroot/digir/java/org/calacademy/digir/presentation/presentation_manis.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** presentation_manis.xml	1 Aug 2003 00:38:21 -0000	1.7
--- presentation_manis.xml	2 Aug 2003 00:07:14 -0000	1.8
***************
*** 6,14 ****
  		<connectionWaitTime>10</connectionWaitTime>
  		<connectionEstablishmentTimeout>10</connectionEstablishmentTimeout>
! 		<connectionResponseTimeout>60</connectionResponseTimeout>
  		<connectionRetries>3</connectionRetries>
  	</http>
  	<configRefreshInterval>0</configRefreshInterval>
  	<providerListRefreshInterval>120</providerListRefreshInterval>
  	<display>
  		<color>#663366</color>
--- 6,15 ----
  		<connectionWaitTime>10</connectionWaitTime>
  		<connectionEstablishmentTimeout>10</connectionEstablishmentTimeout>
! 		<connectionResponseTimeout>90</connectionResponseTimeout>
  		<connectionRetries>3</connectionRetries>
  	</http>
  	<configRefreshInterval>0</configRefreshInterval>
  	<providerListRefreshInterval>120</providerListRefreshInterval>
+ 	<maxUserSpecifiedProviderTimeout>60</maxUserSpecifiedProviderTimeout>
  	<display>
  		<color>#663366</color>
***************
*** 31,35 ****
  			<reorder>../webapps/WEB-INF/classes/org/calacademy/digir/presentation/darwin2taxongeog_reorder_manis.xml</reorder>
  			<reorder>../webapps/WEB-INF/classes/org/calacademy/digir/presentation/darwin2taxon_reorder_manis.xml</reorder>
- 
  		</reorders>
  	</display>
--- 32,35 ----