User: vharcq
Date: 01/06/19 00:38:22
Modified: src/resources/org/jboss/metadata jaws.dtd jboss.dtd
Log:
1. Update DTD (Thanks to Mike Swainston-Rainford).
2. Change type-mapping to type-mapping-definition to avoid 2 different meaning of
type-mapping.
3. Remove some not needed import statements.
Revision Changes Path
1.7 +26 -6 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jaws.dtd 2001/06/15 17:00:54 1.6
+++ jaws.dtd 2001/06/19 07:38:22 1.7
@@ -5,22 +5,42 @@
"http://www.jboss.org/j2ee/dtd/jaws.dtd";>
-->
-<!ELEMENT jaws (datasource,type-mapping,enterprise-beans)>
+<!ELEMENT jaws (datasource?, type-mapping?, debug?, default-entity?,
enterprise-beans?, type-mappings?)>
<!ELEMENT datasource (#PCDATA)>
-
<!ELEMENT type-mapping (#PCDATA)>
+<!ELEMENT debug (#PCDATA)>
+
+<!ELEMENT default-entity (create-table, remove-table, tuned-updates, read-only,
pk-constraint?, select-for-update?, time-out)>
+<!ELEMENT create-table (#PCDATA)>
+<!ELEMENT remove-table (#PCDATA)>
+<!ELEMENT tuned-updates (#PCDATA)>
+<!ELEMENT read-only (#PCDATA)>
+<!ELEMENT pk-constraint (#PCDATA)>
+<!ELEMENT select-for-update (#PCDATA)>
+<!ELEMENT time-out (#PCDATA)>
<!ELEMENT enterprise-beans (entity*)>
-<!ELEMENT entity (ejb-name,cmp-field*,finder*)>
+<!ELEMENT entity (ejb-name, cmp-field*, finder*, read-only?, table-name?,
tuned-updates?, create-table?, remove-table?, pk-constraint?, select-for-update?,
time-out?)>
<!ELEMENT ejb-name (#PCDATA)>
-<!ELEMENT finder (name,query,order?)>
+<!ELEMENT cmp-field (field-name, column-name)>
+<!ELEMENT field-name (#PCDATA)>
+<!ELEMENT column-name (#PCDATA)>
+<!ELEMENT finder (name, query, order?, read-ahead?)>
<!ELEMENT name (#PCDATA)>
-
<!ELEMENT query (#PCDATA)>
-
<!ELEMENT order (#PCDATA)>
+<!ELEMENT read-ahead (#PCDATA)>
+
+<!ELEMENT table-name (#PCDATA)>
+
+<!ELEMENT type-mappings (type-mapping*)>
+<!ELEMENT type-mapping-definitions (name, mapping*)>
+<!ELEMENT mapping (java-type, jdbc-type, sql-type)>
+<!ELEMENT java-type (#PCDATA)>
+<!ELEMENT jdbc-type (#PCDATA)>
+<!ELEMENT sql-type (#PCDATA)>
1.13 +34 -16 jboss/src/resources/org/jboss/metadata/jboss.dtd
Index: jboss.dtd
===================================================================
RCS file: /cvsroot/jboss/jboss/src/resources/org/jboss/metadata/jboss.dtd,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jboss.dtd 2001/06/15 16:14:08 1.12
+++ jboss.dtd 2001/06/19 07:38:22 1.13
@@ -34,6 +34,15 @@
</resource-ref>
</session>
+ <message-driven>
+ <ejb-name />
+ <destination-jndi-name />
+ <configuration-name />
+ <security-proxy />
+ <ejb-ref />
+ <resource-ref />
+ </message-driven>
+
</enterprise-beans>
<resource-managers>
@@ -84,7 +93,7 @@
3- the deployer can specify runtime jndi names for resource managers.
-->
-<!ELEMENT jboss (secure? , security-domain?, enterprise-beans? , resource-managers?
, container-configurations?)>
+<!ELEMENT jboss (secure?, security-domain?, enterprise-beans?, resource-managers?,
container-configurations?)>
<!--
The secure element tells the container to enforce ejb1.1 restrictions
@@ -116,8 +125,7 @@
Used in: jboss
-->
-<!ELEMENT enterprise-beans (session | entity)+>
-
+<!ELEMENT enterprise-beans (session | entity | message-driven)+>
<!--
The entity element holds information specific to jboss and not declared
in ejb-jar.xml about an entity bean, such as jndi name, container
@@ -127,7 +135,7 @@
Used in: enterprise-beans
-->
-<!ELEMENT entity (ejb-name , jndi-name? , configuration-name? , security-proxy?,
ejb-ref* , resource-ref*)>
+<!ELEMENT entity (ejb-name, jndi-name?, configuration-name?, security-proxy?,
ejb-ref*, resource-ref*)>
<!--
The session element holds information specific to jboss and not declared
@@ -138,8 +146,17 @@
Used in: enterprise-beans
-->
-<!ELEMENT session (ejb-name , jndi-name? , configuration-name?, security-proxy?,
ejb-ref* , resource-ref*)>
-
+<!ELEMENT session (ejb-name, jndi-name?, configuration-name?, security-proxy?,
ejb-ref*, resource-ref*)>
+<!--
+ The message-driven element holds information specific to jboss and not declared
+ in ejb-jar.xml about a message driven bean, such as destination jndi name,
container
+ configuration, and resource managers. (see tags for details)
+ The bean should already be declared in ejb-jar.xml, with the same
+ ejb-name.
+
+ Used in: enterprise-beans
+ -->
+<!ELEMENT message-driven (ejb-name, destination-jndi-name, configuration-name?,
security-proxy?, ejb-ref*, resource-ref*)>
<!--
The ejb-name element gives the name of the bean, it must correspond to
an ejb-name element in ejb-jar.xml
@@ -167,7 +184,7 @@
Used in: entity and session
-->
<!ELEMENT configuration-name (#PCDATA)>
-
+<!ELEMENT destination-jndi-name (#PCDATA)>
<!-- The security-proxy gives the class name of the security proxy implementation.
This may be an instance of org.jboss.security.SecurityProxy, or an
just an object that implements methods in the home or remote interface
@@ -185,7 +202,7 @@
Used in: entity, session
-->
-<!ELEMENT ejb-ref (ejb-ref-name , jndi-name)>
+<!ELEMENT ejb-ref (ejb-ref-name, jndi-name)>
<!--
The ejb-ref-name element is the name of the ejb reference as given in
@@ -217,7 +234,7 @@
Used in: session, entity
-->
-<!ELEMENT resource-ref (res-ref-name , resource-name)>
+<!ELEMENT resource-ref (res-ref-name, resource-name)>
<!--
The res-ref-name element gives the "code name" of a resource. It is
@@ -275,7 +292,7 @@
Used in: resource-managers
-->
-<!ELEMENT resource-manager (res-name , (res-jndi-name | res-url))>
+<!ELEMENT resource-manager (res-name, (res-jndi-name | res-url))>
<!--
The res-class attribute is used to indicate which implementation
@@ -473,8 +490,7 @@
Used in: container-configuration
-->
-<!ELEMENT container-invoker-conf (Optimized , RMIObjectPort,
RMIClientSocketFactory?, RMIServerSocketFactory?)>
-
+<!ELEMENT container-invoker-conf (Optimized, RMIObjectPort,
RMIClientSocketFactory?, RMIServerSocketFactory?, JMSProviderAdapterJNDI?,
ServerSessionPoolFactoryJNDI?, MaximumSize?, MaxMessages?)>
<!--
This element is only valid if the container invoker is
JRMPContainerInvoker.
@@ -538,7 +554,9 @@
Used in: container-invoker-conf for JRMPContainerInvoker
-->
<!ELEMENT RMIServerSocketFactory (#PCDATA)>
-
+<!ELEMENT JMSProviderAdapterJNDI (#PCDATA)>
+<!ELEMENT ServerSessionPoolFactoryJNDI (#PCDATA)>
+<!ELEMENT MaxMessages (#PCDATA)>
<!--
The container-cache-conf element holds dynamic configuration data
for the instance cache.
@@ -552,7 +570,7 @@
Used in: container-configuration
-->
-<!ELEMENT container-cache-conf (cache-policy? , cache-policy-conf?)>
+<!ELEMENT container-cache-conf (cache-policy?, cache-policy-conf?)>
<!--
The implementation class for the cache policy, which controls
@@ -568,7 +586,7 @@
Used in: container-cache-conf (when cache-policy is the LRU cache)
-->
-<!ELEMENT cache-policy-conf (min-capacity , max-capacity , overager-period ,
resizer-period , max-bean-age , max-cache-miss-period , min-cache-miss-period ,
cache-load-factor)>
+<!ELEMENT cache-policy-conf (min-capacity, max-capacity, overager-period,
resizer-period, max-bean-age, max-cache-miss-period, min-cache-miss-period,
cache-load-factor)>
<!--
The minimum capacity of this cache
@@ -626,7 +644,7 @@
Used in: container-configuration
-->
-<!ELEMENT container-pool-conf (MaximumSize , MinimumSize)>
+<!ELEMENT container-pool-conf (MaximumSize, MinimumSize)>
<!--
This element is only valid if the instance pool is a subclass of
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
