User: kvvinaymenon Date: 01/07/08 05:22:50 Modified: src/resources/org/jboss/metadata jaws.dtd jaws_2_4.dtd Log: datasource change for allowing bean level datasources.Checking in dtd file changes to the main trunk. Revision Changes Path 1.11 +3 -4 jboss/src/resources/org/jboss/metadata/jaws.dtd Index: jaws.dtd =================================================================== RCS file: /cvsroot/jboss/jboss/src/resources/org/jboss/metadata/jaws.dtd,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- jaws.dtd 2001/07/05 19:02:22 1.10 +++ jaws.dtd 2001/07/08 12:22:50 1.11 @@ -1,8 +1,5 @@ <!-- This is the XML DTD for the JAWS deployment descriptor. - <!DOCTYPE jaws PUBLIC - "-//JBoss//DTD JAWS//EN" - "http://www.jboss.org/j2ee/dtd/jaws.dtd";> --> <!ELEMENT jaws (datasource,type-mapping,enterprise-beans)> @@ -13,9 +10,11 @@ <!ELEMENT enterprise-beans (entity*)> -<!ELEMENT entity (ejb-name,cmp-field*,finder*)> +<!ELEMENT entity (ejb-name,datasource?,cmp-field*,finder*)> <!ELEMENT ejb-name (#PCDATA)> + +<!ELEMENT datasource (#PCDATA)> <!ELEMENT finder (name,query,order?)> 1.3 +8 -3 jboss/src/resources/org/jboss/metadata/jaws_2_4.dtd Index: jaws_2_4.dtd =================================================================== RCS file: /cvsroot/jboss/jboss/src/resources/org/jboss/metadata/jaws_2_4.dtd,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jaws_2_4.dtd 2001/06/22 21:19:05 1.2 +++ jaws_2_4.dtd 2001/07/08 12:22:50 1.3 @@ -14,7 +14,10 @@ <!-- the datasource element is used to indicate to JAWS which datasource should be used for persistence of the CMP entities in this ejb-jar. It should be the datasource named as it appears in jboss' global naming - context. The default is java:/DefaultDS --> + context. The default is java:/DefaultDS + + Beans are also allowed to specify datasources at bean level and will override this datasource if specified. + --> <!ELEMENT datasource (#PCDATA)> <!-- the type-mapping element is used to indicate to JAWS which set of mappings @@ -55,13 +58,15 @@ pk-constraint: If create-table is on, create it with a primary key. time-out: For read-only only, re-load entity after time-out --> -<!ELEMENT entity (ejb-name,cmp-field*,finder*,read-ahead?,read-only?, +<!ELEMENT entity (ejb-name,datasource?,cmp-field*,finder*,read-ahead?,read-only?, table-name?,tuned-updates?,create-table?,remove-table?,select-for-update?,time-out?,pk-constraint?)> <!-- ejb-name within an entity element must contain the ejb-name as specified in ejb-jar.xml. --> <!ELEMENT ejb-name (#PCDATA)> - +<!-- The datasource at bean level. If specified the bean will use this datasource instead of the global one. +Else the global one is used --> +<!ELEMENT datasource (#PCDATA)> <!ELEMENT cmp-field (field-name, column-name)> <!ELEMENT field-name (#PCDATA)> <!ELEMENT column-name (#PCDATA)> _______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
