geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r351555 - in /geronimo/trunk/modules/system/src: java/org/apache/geronimo/system/configuration/ServerOverride.java schema/local-attribute.xsd
Date Fri, 02 Dec 2005 02:11:14 GMT
Author: dain
Date: Thu Dec  1 18:11:11 2005
New Revision: 351555

URL: http://svn.apache.org/viewcvs?rev=351555&view=rev
Log:
Updated schema to include new gbeanInfo attribute and references element.
Fixed a bunch of schema errors.
Added comment to generated config.xml files.

Modified:
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/ServerOverride.java
    geronimo/trunk/modules/system/src/schema/local-attribute.xsd

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/ServerOverride.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/ServerOverride.java?rev=351555&r1=351554&r2=351555&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/ServerOverride.java
(original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/ServerOverride.java
Thu Dec  1 18:11:11 2005
@@ -71,6 +71,12 @@
     public void writeXml(PrintWriter out) {
         out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
         out.println();
+        out.println("<!-- ======================================================== -->");
+        out.println("<!-- Warning - This XML file is re-generated by Geronimo when -->");
+        out.println("<!-- changes are made to Geronimo's configuration, therefore  -->");
+        out.println("<!-- therefore any comments added to this file will be lost.  -->");
+        out.println("<!-- ======================================================== -->");
+        out.println();
         out.println("<attributes xmlns=\"http://geronimo.apache.org/xml/ns/attributes\">");
         for (Iterator it = configurations.entrySet().iterator(); it.hasNext();) {
             Map.Entry entry = (Map.Entry) it.next();

Modified: geronimo/trunk/modules/system/src/schema/local-attribute.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/schema/local-attribute.xsd?rev=351555&r1=351554&r2=351555&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/schema/local-attribute.xsd (original)
+++ geronimo/trunk/modules/system/src/schema/local-attribute.xsd Thu Dec  1 18:11:11 2005
@@ -50,16 +50,16 @@
 
     <xsd:complexType name="attributesType">
         <xsd:sequence>
-            <xsd:element name="configuration" type="atts:configurationType" minOccurs="0"
maxOccurs="unlimited" />
+            <xsd:element name="configuration" type="atts:configurationType" minOccurs="0"
maxOccurs="unbounded" />
         </xsd:sequence>
     </xsd:complexType>
 
     <xsd:complexType name="configurationType">
         <xsd:sequence>
-            <xsd:element name="gbean" type="atts:gbeanType" minOccurs="0" maxOccurs="unlimited"
/>
+            <xsd:element name="gbean" type="atts:gbeanType" minOccurs="0" maxOccurs="unbounded"
/>
         </xsd:sequence>
-        <xsd:attribute name="name" type="xs:string" use="required"/>
-        <xsd:attribute name="load" type="xs:boolean" use="optional" default="true"/>
+        <xsd:attribute name="name" type="xsd:string" use="required"/>
+        <xsd:attribute name="load" type="xsd:boolean" use="optional" default="true"/>
     </xsd:complexType>
 
     <xsd:complexType name="gbeanType">
@@ -75,11 +75,13 @@
                 ]]>
             </xsd:documentation>
         </xsd:annotation>
-        <xsd:sequence>
-            <xsd:element name="attribute" type="atts:attributeType" minOccurs="0" maxOccurs="unlimited"
/>
-        </xsd:sequence>
-        <xsd:attribute name="name" type="xs:string" use="required"/>
-        <xsd:attribute name="load" type="xs:boolean" use="optional" default="true"/>
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="attribute" type="atts:attributeType"/>
+            <xsd:element name="reference" type="atts:referenceType"/>
+        </xsd:choice>
+        <xsd:attribute name="name" type="xsd:string" use="required"/>
+        <xsd:attribute name="gbeanInfo" type="xsd:string" use="optional"/>
+        <xsd:attribute name="load" type="xsd:boolean" use="optional" default="true"/>
     </xsd:complexType>
 
     <xsd:complexType name="attributeType">
@@ -89,4 +91,17 @@
             </xsd:extension>
         </xsd:simpleContent>
     </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
+
+    <xsd:complexType name="referenceType">
+        <xsd:sequence>
+            <xsd:element name="pattern" minOccurs="1" maxOccurs="unbounded">
+              <xsd:complexType>
+                  <xsd:sequence>
+                      <xsd:element name="gbean-name" type="xsd:string"/>
+                  </xsd:sequence>
+              </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="name" type="xsd:string"/>
+    </xsd:complexType>
+  </xsd:schema>
\ No newline at end of file



Mime
View raw message