rleland     2003/08/09 01:50:52

  Modified:    conf/share struts-config_1_2.dtd
               doc/userGuide release-notes.xml
               web/example/WEB-INF struts-config-registration.xml
                        struts-config.xml
  Log:
  Add two new elements <description-short>  and <description-long> for use
  by struts config file tools and document generation.
  Suggested by Jonas Björnerstedt
  
  Revision  Changes    Path
  1.4       +11 -2     jakarta-struts/conf/share/struts-config_1_2.dtd
  
  Index: struts-config_1_2.dtd
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/conf/share/struts-config_1_2.dtd,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- struts-config_1_2.dtd     4 Jul 2003 21:33:29 -0000       1.3
  +++ struts-config_1_2.dtd     9 Aug 2003 08:50:52 -0000       1.4
  @@ -82,9 +82,18 @@
        hierarchy, and contains nested elements for all of the other
        configuration settings.
   -->
  -<!ELEMENT struts-config (data-sources?, form-beans?, global-exceptions?, 
global-forwards?, action-mappings?, controller?, message-resources*, plug-in*)>
  +<!ELEMENT struts-config (description-short?, description-long?, data-sources?, 
form-beans?, global-exceptions?, global-forwards?, action-mappings?, controller?, 
message-resources*, plug-in*)>
   <!ATTLIST struts-config  id             ID              #IMPLIED>
   
  +<!-- The "description-short" element is a short descriptive phrase that summarize 
the purpose of this
  +     struts-config. It is not used or read by struts and is only for documentation 
or automated tools.
  +-->
  +<!ELEMENT description-short (#PCDATA)>
  +
  +<!-- The "description-long" element is a long descriptive phrase that details the 
purpose of this
  +     struts-config. It is not used or read by struts and is only for documentation 
or automated tools.
  +-->
  +<!ELEMENT description-long (#PCDATA)>
   
   <!-- The "data-sources" element describes a set of DataSource objects [JDBC 2.0
        Standard Extension]. The individual DataSource objects are configured through
  
  
  
  1.27      +8 -33     jakarta-struts/doc/userGuide/release-notes.xml
  
  Index: release-notes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/doc/userGuide/release-notes.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- release-notes.xml 30 Jul 2003 03:56:15 -0000      1.26
  +++ release-notes.xml 9 Aug 2003 08:50:52 -0000       1.27
  @@ -131,53 +131,28 @@
       <p> The Struts Configuration 1.1 DTD has been deprecated in favor of the
       <code><a 
href="http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>struts-config_1_2.dtd</a></code>.
       In the Struts 1.2 release, existing Struts configuration files can be
  -    loaded using either DTD version.
  +    loaded using either DTD version. The new DTD adds two new elements 
&lt;description-short&gt;
  +    and &lt;description-long&gt; for use by struts config file tools and document 
generation. 
       </p>
   
       <p><strong>New Dependencies on Commons packages</strong></p>
  -    <p>Several components of Struts 1.0 have been found to be useful in
  +    <p>The resource components of Struts 1.1 has been found to be useful in
       general Java development (and not just useful for building Struts-based
       web applications), and have been migrated into the
       <a href="http://jakarta.apache.org/commons/";>Jakarta Commons Project</a>.
       As a result, the current development version of Struts has been modified
  -    to rely on the Commons packages containing these classes, rather than the
  -    Struts internal versions.  In nearly every case, this involved changing
  +    to rely on this Commons package, rather than the
  +    Struts internal version.  In nearly every case, this involved changing
       only the <code>import</code> statements at the top of your classes.  Any
       applications that utilize these classes will need to be modified in the
       same way.  </p>
       <p>The following Commons packages contain the replacements for the
  -    corresponding Struts 1.0 classes:</p>
  +    corresponding Struts 1.1 classes:</p>
       <ul>
       <li><strong>BeanUtils Package</strong>
  -        [<a 
href="http://jakarta.apache.org/commons/beanutils.html";><code>org.apache.commons.beanutils</code></a>]
 -
  -        <code>org.apache.struts.utils.BeanUtils</code>,
  -        <code>org.apache.struts.utils.ConvertUtils</code>, and
  -        <code>org.apache.struts.utils.PropertyUtils</code>.</li>
  -    <li><strong>Collections Package</strong>
  -        [<a 
href="http://jakarta.apache.org/commons/collections.html";><code>org.apache.commons.collections</code></a>]
  -
  -        <code>org.apache.struts.util.ArrayStack</code>,
  -        <code>org.apache.struts.util.FastArrayList</code>,
  -        <code>org.apache.struts.util.FastHashMap</code>,
  -        <code>org.apache.struts.util.FastTreeMap</code>.</li>
  -    <li><strong>Digester Package</strong> -
  -        [<a 
href="http://jakarta.apache.org/commons/digester.html";><code>org.apache.commons.digester</code></a>]
 -
  -        <code>org.apache.struts.digester.*</code>.</li>
  +        [<a 
href="http://jakarta.apache.org/commons/resources.html";><code>org.apache.commons.resources</code></a>]
 -
  +        <code>org.apache.struts.utils.MessageResources</code></li>
       </ul>
  -    <p>The following Commons packages are also now used by various components
  -    of the Struts framework:</p>
  -    <ul>
  -    <li><strong>Database Connection Pool Package</strong>
  -    [<a 
href="http://jakarta.apache.org/commons/dbcp.html";><code>org.apache.commons.dbpc</code></a>]</li>
  -    <li><strong>FileUpload Package</strong>
  -    [<a 
href="http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/fileupload/";><code>org.apache.commons.fileupload</code></a>]</li>
  -    <li><strong>Logging Package</strong>
  -    [<a 
href="http://jakarta.apache.org/commons/logging.html";><code>org.apache.commons.logging</code></a>]</li>
  -    <li><strong>Pool Package</strong>
  -    [<a 
href="http://jakarta.apache.org/commons/pool/index.html";><code>org.apache.commons.pool</code></a>]</li>
  -    <li><strong>Validator Package</strong>
  -    [<a 
href="http://cvs.apache.org/viewcvs/jakarta-commons/validator/";><code>org.apache.commons.validator</code></a>]</li>
  -    </ul>
  -
   
       <p><strong>NOTE! XML Parser Prerequisite Updated</strong></p>
   
  
  
  
  1.2       +10 -6     
jakarta-struts/web/example/WEB-INF/struts-config-registration.xml
  
  Index: struts-config-registration.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/web/example/WEB-INF/struts-config-registration.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- struts-config-registration.xml    25 Apr 2003 03:07:45 -0000      1.1
  +++ struts-config-registration.xml    9 Aug 2003 08:50:52 -0000       1.2
  @@ -1,15 +1,19 @@
   <?xml version="1.0" encoding="ISO-8859-1" ?>
   
   <!DOCTYPE struts-config PUBLIC
  -          "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
  -          "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
  +          "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
  +          "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
   
  -<!--
  +<struts-config>
  +  <description-short><![CDATA[
  +     registration
  +  ]]>
  +  </description-short>
  +    <description-long><![CDATA[
        This is the Struts configuration file for the registration 
        portion of the example application, using the proposed new syntax.
  --->
  -
  -<struts-config>
  +  ]]>
  +  </description-long>
   
     <!-- ========== Form Bean Definitions =================================== -->
     <form-beans>
  
  
  
  1.32      +10 -7     jakarta-struts/web/example/WEB-INF/struts-config.xml
  
  Index: struts-config.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/example/WEB-INF/struts-config.xml,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- struts-config.xml 25 Apr 2003 03:07:45 -0000      1.31
  +++ struts-config.xml 9 Aug 2003 08:50:52 -0000       1.32
  @@ -1,16 +1,19 @@
   <?xml version="1.0" encoding="ISO-8859-1" ?>
   
   <!DOCTYPE struts-config PUBLIC
  -          "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
  -          "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
  -
  -<!--
  -     This is the Struts configuration file for the example application,
  -     using the proposed new syntax.
  --->
  +          "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
  +          "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
   
   
   <struts-config>
  +  <description-short><![CDATA[
  +     account maintaince
  +  ]]>
  +  </description-short>
  +    <description-long><![CDATA[
  +     Allows the updating of users accounts and subscriptions.
  +  ]]>
  +  </description-long>
   
   
     <!-- ========== Data Source Configuration =============================== -->
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to