Return-Path: 
 <commits-return-3165-apmail-commons-commits-archive=commons.apache.org@commons.apache.org>
Delivered-To: apmail-commons-commits-archive@locus.apache.org
Received: (qmail 28651 invoked from network); 15 May 2008 16:15:30 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 15 May 2008 16:15:30 -0000
Received: (qmail 33742 invoked by uid 500); 15 May 2008 16:15:30 -0000
Delivered-To: apmail-commons-commits-archive@commons.apache.org
Received: (qmail 33488 invoked by uid 500); 15 May 2008 16:15:29 -0000
Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@commons.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@commons.apache.org>
List-Post: <mailto:commits@commons.apache.org>
List-Id: <commits.commons.apache.org>
Reply-To: dev@commons.apache.org
Delivered-To: mailing list commits@commons.apache.org
Received: (qmail 33477 invoked by uid 99); 15 May 2008 16:15:29 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 May 2008 09:15:29 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 May 2008 16:14:44 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 02BDA2388990; Thu, 15 May 2008 09:15:02 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r656718 -
 /commons/proper/configuration/branches/configuration2_experimental/conf/CommonsConfiguration.xsd
Date: Thu, 15 May 2008 16:15:02 -0000
To: commits@commons.apache.org
From: ebourg@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080515161505.02BDA2388990@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ebourg
Date: Thu May 15 09:15:02 2008
New Revision: 656718

URL: http://svn.apache.org/viewvc?rev=656718&view=rev
Log:
Added the <database/> element to the schema validating the configuration descriptors

Modified:
    commons/proper/configuration/branches/configuration2_experimental/conf/CommonsConfiguration.xsd

Modified: commons/proper/configuration/branches/configuration2_experimental/conf/CommonsConfiguration.xsd
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/conf/CommonsConfiguration.xsd?rev=656718&r1=656717&r2=656718&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/conf/CommonsConfiguration.xsd (original)
+++ commons/proper/configuration/branches/configuration2_experimental/conf/CommonsConfiguration.xsd Thu May 15 09:15:02 2008
@@ -117,7 +117,19 @@
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
-	<xs:complexType name="sources">
+	<xs:complexType name="databaseConfiguration">
+		<xs:complexContent>
+			<xs:extension base="abstractConfiguration">
+				<xs:attribute name="jndi" type="xs:string" use="required"/>
+				<xs:attribute name="table" type="xs:string" use="required"/>
+				<xs:attribute name="keyColumn" type="xs:string" use="required"/>
+				<xs:attribute name="valueColumn" type="xs:string" use="required"/>
+				<xs:attribute name="nameColumn" type="xs:string" use="optional"/>
+				<xs:attribute name="name" type="xs:string" use="optional"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+    <xs:complexType name="sources">
 		<xs:choice maxOccurs="unbounded">
 			<xs:element name="system" type="xs:string"/>
 			<xs:element name="environment" type="xs:string"/>
@@ -125,6 +137,7 @@
 			<xs:element name="xml" type="xmlConfiguration"/>
 			<xs:element name="plist" type="abstractHierarchicalFileConfiguration"/>
 			<xs:element name="jndi" type="jndiConfiguration"/>
+			<xs:element name="database" type="databaseConfiguration"/>
 		</xs:choice>
 	</xs:complexType>
 </xs:schema>