User: starksm 
  Date: 01/06/09 23:00:39

  Modified:    src/resources/org/jboss/metadata jboss-web.dtd jboss.dtd
  Log:
  Update the jboss.dtd for EJB 2.0 additions
  Update the comments for jboss-web.dtd
  
  Revision  Changes    Path
  1.3       +4 -0      jboss/src/resources/org/jboss/metadata/jboss-web.dtd
  
  Index: jboss-web.dtd
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/resources/org/jboss/metadata/jboss-web.dtd,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jboss-web.dtd     2001/05/10 04:19:13     1.2
  +++ jboss-web.dtd     2001/06/10 06:00:39     1.3
  @@ -2,6 +2,10 @@
   
   <!-- The JBoss specific elements used to integrate the servlet web.xml elements 
into a
   JBoss deployment.
  +
  +DOCTYPE jboss-web
  +    PUBLIC "-//JBoss//DTD Web Application 2.2//EN"
  +    "http://www.jboss.org/j2ee/dtds/jboss-web.dtd";
   -->
   <!-- The jboss-web element is the root element.
   -->
  
  
  
  1.9       +56 -22    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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- jboss.dtd 2001/06/01 07:42:10     1.8
  +++ jboss.dtd 2001/06/10 06:00:39     1.9
  @@ -1,11 +1,13 @@
   <?xml version='1.0' encoding='UTF-8' ?>
   
  +<!--Generated by XML Authority-->
  +
   <!-- 
   Overview of the architecture of jboss.xml
   
   <jboss>
   
  -  <secure />
  +  <enforce-ejb-restrictions />
     <security-domain />
   
     <enterprise-beans>
  @@ -79,17 +81,17 @@
   3- the deployer can specify runtime jndi names for resource managers.
   
   -->
  -<!ELEMENT jboss (secure? , security-domain?, enterprise-beans? , resource-managers? 
, container-configurations?)>
  +<!ELEMENT jboss (enforce-ejb-restrictions? , security-domain? , enterprise-beans? , 
resource-managers? , container-configurations?)>
   
   <!--
  -  The secure element tells the container to enforce ejb1.1 restrictions
  +  The enforce-ejb-restrictions element tells the container to enforce ejb1.1 
restrictions
     It must be one of the following : 
  -     <secure>true</secure>
  -     <secure>false</secure>
  +     <enforce-ejb-restrictions>true</enforce-ejb-restrictions>
  +     <enforce-ejb-restrictions>false</enforce-ejb-restrictions>
     
     Used in: jboss
     -->
  -<!ELEMENT secure (#PCDATA)>
  +<!ELEMENT enforce-ejb-restrictions (#PCDATA)>
   
   <!-- The security-domain element allows one to specify a module wide
   security manager domain. It specifies the JNDI name of the security
  @@ -111,7 +113,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
  @@ -122,7 +124,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* , resource-env-ref*)>
   
   <!--
       The session element holds information specific to jboss and not declared
  @@ -132,14 +134,25 @@
       ejb-name.
       
       Used in: enterprise-beans
  +    -->
  +<!ELEMENT session (ejb-name , jndi-name? , configuration-name? , security-proxy? , 
ejb-ref* , resource-ref* , resource-env-ref*)>
  +
  +<!--
  +    The message-driven element holds information specific to jboss and not declared
  +    in ejb-jar.xml about a message-driven bean, such as container 
  +    configuration and resources.
  +    The bean should already be declared in ejb-jar.xml, with the same 
  +    ejb-name.
  +    
  +    Used in: enterprise-beans
       -->
  -<!ELEMENT session (ejb-name , jndi-name? , configuration-name?, security-proxy?, 
ejb-ref* , resource-ref*)>
  +<!ELEMENT message-driven (ejb-name , configuration-name? , security-proxy? , 
ejb-ref* , resource-ref* , resource-env-ref*)>
   
   <!-- 
         The ejb-name element gives the name of the bean, it must correspond to 
         an ejb-name element in ejb-jar.xml
         
  -      Used in: entity and session
  +      Used in: entity, session, and message-driven
         -->
   <!ELEMENT ejb-name (#PCDATA)>
   
  @@ -159,7 +172,7 @@
         configurations. If none is provided, jboss will automatically use the
         right standard configuration, see container-configurations.
         
  -      Used in: entity and session
  +      Used in: entity, session, and message-driven
         -->
   <!ELEMENT configuration-name (#PCDATA)>
   
  @@ -168,7 +181,7 @@
        just an object that implements methods in the home or remote interface
        of an EJB without implementating any common interface.
   
  -     Used in: entity and session
  +      Used in: entity, session, and message-driven
   -->
   <!ELEMENT security-proxy (#PCDATA)>
   
  @@ -178,7 +191,7 @@
         provide a ejb-link element in ejb-jar.xml, but you provide a jndi-name
         in jboss.xml
          
  -      Used in: entity, session
  +      Used in: entity, session, and message-driven
         -->
   <!ELEMENT ejb-ref (ejb-ref-name , jndi-name)>
   
  @@ -202,6 +215,26 @@
           -->
   <!--    <!ELEMENT jndi-name (#PCDATA)> -->
   <!-- 
  +      The resource-env-ref element gives a mapping between the "code name" 
  +      of a env resource (res-ref-name, provided by the Bean Developper) and 
  +      its deployed JNDI name.
  +      
  +      Used in: session, entity, message-driven
  +      -->
  +<!ELEMENT resource-env-ref (res-ref-name , jndi-name)>
  +
  +<!-- 
  +        The jndi-name element gives the deployed name of the reference. The 
  +        general form is 
  +           <jndi-name>t3://otherserver/application/beanB</jndi-name>
  +        
  +        Used in: ejb-ref
  +
  +     (It's commented out here because it appears above and you
  +         can't declare an element more than once per DTD)
  +        -->
  +<!--    <!ELEMENT jndi-name (#PCDATA)> -->
  +<!-- 
         The resource-ref element gives a mapping between the "code name" 
         of a resource (res-ref-name, provided by the Bean Developper) and 
         its "xml name" (resource-name, provided by the Application Assembler).
  @@ -210,16 +243,16 @@
          
         See resource-managers.
         
  -      Used in: session, entity
  +      Used in: entity, session, and message-driven
         -->
  -<!ELEMENT resource-ref (res-ref-name , (resource-name | jndi-name | res-url)>
  +<!ELEMENT resource-ref (res-ref-name , (resource-name | jndi-name | res-url))>
   
   <!-- 
           The res-ref-name element gives the "code name" of a resource. It is 
           provided by the Bean Developper. See resource-managers for the actual
           configuration of the resource.
           
  -        Used in: resource-ref
  +        Used in: resource-ref, resource-env-ref
           -->
   <!ELEMENT res-ref-name (#PCDATA)>
   
  @@ -328,10 +361,7 @@
       
       Used in: container-configurations
       -->
  -<!ELEMENT container-configuration (container-name, call-logging, container-invoker,
  -container-interceptors?, instance-pool?, instance-cache? , persistence-manager? ,
  -transaction-manager? , container-invoker-conf? , container-cache-conf? , 
container-pool-conf?,
  -commit-option? , optiond-refresh-rate?, (role-mapping-manager, 
authentication-module?)?)>
  +<!ELEMENT container-configuration (container-name , call-logging , 
container-invoker , container-interceptors? , instance-pool? , instance-cache? , 
persistence-manager? , transaction-manager? , container-invoker-conf? , 
container-cache-conf? , container-pool-conf? , commit-option? , optiond-refresh-rate? 
, (role-mapping-manager , authentication-module?)?)>
   
   <!--
       The configuration-class attribute is used to indicate the
  @@ -468,7 +498,7 @@
         
         Used in: container-configuration
         -->
  -<!ELEMENT container-invoker-conf (Optimized , RMIObjectPort, 
RMIClientSocketFactory?, RMIServerSocketFactory?)>
  +<!ELEMENT container-invoker-conf (Optimized , RMIObjectPort , 
RMIClientSocketFactory? , RMIServerSocketFactory?)>
   
   <!-- 
           This element is only valid if the container invoker is 
  @@ -581,6 +611,11 @@
   <!ELEMENT overager-period (#PCDATA)>
   
   <!--
  +       The period of the remover's runs
  +       -->
  +<!ELEMENT remover-period (#PCDATA)>
  +
  +<!--
          The period of the resizer's runs
          -->
   <!ELEMENT resizer-period (#PCDATA)>
  @@ -671,7 +706,6 @@
       This element is used to specify the refresh rate of commit option d
     -->
   <!ELEMENT optiond-refresh-rate (#PCDATA)>
  -
   
   <!--
         The role-mapping-manager element specifies the JNDI name of the
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to