[Mulgara-svn] r1527 - trunk/conf

alexhall at mulgara.org alexhall at mulgara.org
Wed Feb 18 21:42:16 UTC 2009


Author: alexhall
Date: 2009-02-18 13:42:15 -0800 (Wed, 18 Feb 2009)
New Revision: 1527

Modified:
   trunk/conf/mulgara-embedded.dtd
   trunk/conf/mulgara-embedded.xsd
Log:
Make the "Port" parameter in the JettyConnector optional.  It doesn't make much sense to force the user to specify the port of a connector that is being disabled.  If the connector is enabled and no port is configured, it defaults to 8080 for private and 8081 for public.

Modified: trunk/conf/mulgara-embedded.dtd
===================================================================
--- trunk/conf/mulgara-embedded.dtd	2009-02-18 21:40:56 UTC (rev 1526)
+++ trunk/conf/mulgara-embedded.dtd	2009-02-18 21:42:15 UTC (rev 1527)
@@ -9,8 +9,8 @@
 
   <!ELEMENT Jetty (Connector, PublicConnector)>
 
-    <!ELEMENT Connector (Disabled?, Host?, Port, Acceptors?, MaxThreads?, MaxIdleTimeMs?, LowResourceMaxIdleTimeMs?)>
-    <!ELEMENT PublicConnector (Disabled?, Host?, Port, Acceptors?, MaxThreads?, MaxIdleTimeMs?, LowResourceMaxIdleTimeMs?)>
+    <!ELEMENT Connector (Disabled?, Host?, Port?, Acceptors?, MaxThreads?, MaxIdleTimeMs?, LowResourceMaxIdleTimeMs?)>
+    <!ELEMENT PublicConnector (Disabled?, Host?, Port?, Acceptors?, MaxThreads?, MaxIdleTimeMs?, LowResourceMaxIdleTimeMs?)>
 
       <!ELEMENT Host (#PCDATA)>
       <!ELEMENT Port (#PCDATA)>

Modified: trunk/conf/mulgara-embedded.xsd
===================================================================
--- trunk/conf/mulgara-embedded.xsd	2009-02-18 21:40:56 UTC (rev 1526)
+++ trunk/conf/mulgara-embedded.xsd	2009-02-18 21:42:15 UTC (rev 1527)
@@ -24,7 +24,7 @@
   	<xs:sequence>
   		<xs:element name="Disabled" type="xs:boolean" minOccurs="0" />
   		<xs:element ref="Host" minOccurs="0" />
-  		<xs:element ref="Port" />
+  		<xs:element ref="Port" minOccurs="0" />
   		<xs:element ref="Acceptors" minOccurs="0" />
   		<xs:element ref="MaxThreads" minOccurs="0" />
   		<xs:element ref="MaxIdleTimeMs" minOccurs="0" />




More information about the Mulgara-svn mailing list