tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject cvs commit: jakarta-tapestry/framework/src/java/org/apache/tapestry/parse SpecificationParser.java Tapestry_3_1.dtd
Date Tue, 05 Oct 2004 23:33:21 GMT
hlship      2004/10/05 16:33:21

  Modified:    src/documentation/content/xdocs/UsersGuide spec.xml
                        common.ent properties.xml configuration.xml
               junit/src/org/apache/tapestry/junit/parse
                        TestSpecificationParser.java
               .        .project .classpath
               framework/src/java/org/apache/tapestry/parse
                        SpecificationParser.java Tapestry_3_1.dtd
  Added:       junit/src/org/apache/tapestry/junit/parse Meta.library
  Log:
  Rename <property> to <meta> for the 3.1 DTD.
  
  Revision  Changes    Path
  1.4       +55 -54    jakarta-tapestry/src/documentation/content/xdocs/UsersGuide/spec.xml
  
  Index: spec.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/src/documentation/content/xdocs/UsersGuide/spec.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- spec.xml	5 Oct 2004 17:28:55 -0000	1.3
  +++ spec.xml	5 Oct 2004 23:33:21 -0000	1.4
  @@ -118,6 +118,7 @@
       the &spec.binding; element and the ognl: and message: prefixes, respectively.</li>
     <li>The &lt;inherited-binding&gt; element has been removed; parameters
of parent components may be
       accessed as properties.</li>
  +  <li>The &lt;property&gt; element (in 3.0) has been renamed to &spec.meta;.</li>
   </ul>
   
   </section>  <!-- changes -->
  @@ -164,7 +165,7 @@
   
   <p>&application; Elements:</p>
   <source>
  -  &spec.description; ?, &spec.property; *,
  +  &spec.description; ?, &spec.meta; *,
     (&spec.page; | &spec.component-type; |  &spec.library; | &spec.extension;)
*
   </source>
   
  @@ -263,7 +264,7 @@
   
   <p>&bean; Elements:</p>
   <source>
  -  &spec.description; ?, &spec.property; *,
  +  &spec.description; ?, &spec.meta; *,
     (&spec.set-property; | &spec.set-message-property;) *
   </source>
   
  @@ -437,7 +438,7 @@
   	
   <p>&component; Elements</p>
   <source>
  -  &spec.property; *,
  +  &spec.meta; *,
     (&spec.binding; | &spec.listener-binding;) *
   </source>
   
  @@ -522,7 +523,7 @@
   
   <p>&component-specification; Elements</p>
   <source>
  -  &spec.description; ?, &spec.parameter; *, &spec.reserved-parameter; *, &spec.property;
*,
  +  &spec.description; ?, &spec.parameter; *, &spec.reserved-parameter; *, &spec.meta;
*,
     (&spec.bean; | &spec.component; | &spec.external-asset; | &spec.context-asset;
| &spec.private-asset; | &spec.property-specification;)*
   </source>
   
  @@ -765,7 +766,7 @@
   
   <p>&lt;extension&gt; Elements</p>
   <source>
  -  &spec.property; *, &spec.configure; *
  +  &spec.meta; *, &spec.configure; *
   </source>
   
   
  @@ -884,7 +885,7 @@
   
   <p>&library-specification; Elements</p>
   <source>
  -  &spec.description; ?, &spec.property; *,
  +  &spec.description; ?, &spec.meta; *,
     (&spec.page; | &spec.component-type; | &spec.library; | &spec.extension;)
*
   </source>
   
  @@ -966,6 +967,53 @@
   </section> <!-- spec.listener-binding -->
   
   
  +<section id="spec.meta">
  +	<title>&lt;meta&gt; element</title>
  +	
  +<p>
  +Appears in: <em>many</em>
  +</p>
  +
  +<p>
  +The &lt;meta&gt; element is used to store meta-data
  +about some other element (it is contained within).  Tapestry ignores this meta-data.
  +Any number of key/value pairs may be stored.  The value is provided with
  +the value attribute, or the 
  +character data for the &lt;meta&gt; element.
  +</p>
  +
  +<table>
  +
  +<tr>
  +  <th>Name</th>
  +  <th>Type</th>
  +  <th>Required ?</th>
  +  <th>Default Value</th>
  +  <th>Description</th>
  +</tr>
  +
  +<tr>
  +	<td>key</td>
  +	<td>string</td>
  +	<td>yes</td>
  +	<td/>
  +	<td>The name of the property.</td>
  +</tr>
  +<tr>
  +	<td>value</td>
  +	<td>string</td>
  +	<td>no</td>
  +	<td/>
  +	<td>The value for the property.  If omitted, the value is taken
  +	from the character data (the text the tag wraps around).  If specified,
  +	the character data is ignored.</td>
  +</tr>
  +
  +</table>
  +
  +</section> <!-- spec.meta -->
  +
  +
   <section id="spec.page">
   	<title>&lt;page&gt; element</title>
   
  @@ -1057,7 +1105,7 @@
   
   <p>&lt;page-specification&gt; Elements</p>
   <source>
  -  &spec.description; ?, &spec.property; *,
  +  &spec.description; ?, &spec.meta; *,
     (&spec.bean; | &spec.component; | &spec.external-asset; | &spec.context-asset;
| &spec.private-asset; | &spec.property-specification;)*
   </source>
   
  @@ -1249,53 +1297,6 @@
   
   
   </section> <!-- spec.private-asset -->
  -
  -<section id="spec.property">
  -	<title>&lt;property&gt; element</title>
  -	
  -<p>
  -Appears in: <em>many</em>
  -</p>
  -
  -<p>
  -The &lt;property&gt; element is used to store meta-data
  -about some other element (it is contained within).  Tapestry ignores this meta-data
  -Any number of name/value pairs may be stored.  The value is provided with
  -the value attribute, or the 
  -character data for the &lt;property&gt; element.
  -</p>
  -
  -<table>
  -
  -<tr>
  -  <th>Name</th>
  -  <th>Type</th>
  -  <th>Required ?</th>
  -  <th>Default Value</th>
  -  <th>Description</th>
  -</tr>
  -
  -<tr>
  -	<td>name</td>
  -	<td>string</td>
  -	<td>yes</td>
  -	<td/>
  -	<td>The name of the property.</td>
  -</tr>
  -<tr>
  -	<td>value</td>
  -	<td>string</td>
  -	<td>no</td>
  -	<td/>
  -	<td>The value for the property.  If omitted, the value is taken
  -	from the character data (the text the tag wraps around).  If specified,
  -	the character data is ignored.</td>
  -</tr>
  -
  -</table>
  -
  -</section> <!-- spec.property -->
  -
   
   <section id="spec.property-specification">
   	<title>&lt;property-specification&gt; element</title>
  
  
  
  1.8       +1 -1      jakarta-tapestry/src/documentation/content/xdocs/UsersGuide/common.ent
  
  Index: common.ent
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/src/documentation/content/xdocs/UsersGuide/common.ent,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- common.ent	5 Oct 2004 17:28:55 -0000	1.7
  +++ common.ent	5 Oct 2004 23:33:21 -0000	1.8
  @@ -34,11 +34,11 @@
   <!ENTITY spec.library				'<link href="spec.html#spec.library">&lt;library&gt;</link>'>
   <!ENTITY spec.library-specification	'<link href="spec.html#spec.library-specification">&lt;library-specification&gt;</link>'>
   <!ENTITY spec.listener-binding		'<link href="spec.html#spec.listener-binding">&lt;listener-binding&gt;</link>'>
  +<!ENTITY spec.meta					'<link href="spec.html#spec.meta">&lt;meta&gt;</link>'>
   <!ENTITY spec.page					'<link href="spec.html#spec.page">&lt;page&gt;</link>'>
   <!ENTITY spec.page-specification	'<link href="spec.html#spec.page-specification">&lt;page-specification&gt;</link>'>
   <!ENTITY spec.parameter				'<link href="spec.html#spec.parameter">&lt;parameter&gt;</link>'>
   <!ENTITY spec.private-asset			'<link href="spec.html#spec.private-asset">&lt;private-asset&gt;</link>'>
  -<!ENTITY spec.property				'<link href="spec.html#spec.property">&lt;property&gt;</link>'>
   <!ENTITY spec.property-specification
   									'<link href="spec.html#spec.property-specification">&lt;property-specification&gt;</link>'>
   <!ENTITY spec.reserved-parameter	'<link href="spec.html#spec.reserved-parameter">&lt;reserved-parameter&gt;</link>'>
  
  
  
  1.2       +1 -1      jakarta-tapestry/src/documentation/content/xdocs/UsersGuide/properties.xml
  
  Index: properties.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/src/documentation/content/xdocs/UsersGuide/properties.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- properties.xml	6 Sep 2004 03:06:45 -0000	1.1
  +++ properties.xml	5 Oct 2004 23:33:21 -0000	1.2
  @@ -439,7 +439,7 @@
   	<td>
   	The specification which defines this component.	Often used to access
   	meta data defined in the component's specification using the
  -	&spec.property; element.
  +	&spec.meta; element.
   	</td>
   </tr>
   
  
  
  
  1.2       +5 -5      jakarta-tapestry/src/documentation/content/xdocs/UsersGuide/configuration.xml
  
  Index: configuration.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/src/documentation/content/xdocs/UsersGuide/configuration.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- configuration.xml	5 Sep 2004 18:53:57 -0000	1.1
  +++ configuration.xml	5 Oct 2004 23:33:21 -0000	1.2
  @@ -233,7 +233,7 @@
   
   <ul>
   	<li>
  -		As a &spec.property; of the &spec.application; (in the application specification,
  +		As a &spec.meta; of the &spec.application; (in the application specification,
   		if the application uses one).
   	</li>
   	<li>
  @@ -299,7 +299,7 @@
   	
   	<p>
   	This configuration property does not follow the normal search path rules.  The
  -	&spec.property; must be provided in the &spec.page-specification; or &spec.component-specification;.
  +	&spec.meta; must be provided in the &spec.page-specification; or &spec.component-specification;.
   	If no value is found there, the immediate containing &spec.application; or
   	&spec.library-specification; is checked.  If still not found, the default is used.
   	</p>
  @@ -653,21 +653,21 @@
   	
   <ul>
   	<li>
  -		As a &spec.property; of the &spec.page-specification; or the &spec.component-specification;

  +		As a &spec.meta; of the &spec.page-specification; or the &spec.component-specification;

   		(in the page or component specification). 
   		<p>
   		This configuration will apply only to the page or component where it is defined.
   		</p>
   	</li>
   	<li>
  -		As a &spec.property; of the &spec.library-specification; 
  +		As a &spec.meta; of the &spec.library-specification; 
   		(in the library specification, if the components are included in a library). 
   		<p>
   		This configuration will apply to all pages and components in the library.
   		</p>
   	</li>
   	<li>
  -		As a &spec.property; of the &spec.application; (in the application specification,
  +		As a &spec.meta; of the &spec.application; (in the application specification,
   		if the application uses one).
   	</li>
   	<li>
  
  
  
  1.26      +9 -0      jakarta-tapestry/junit/src/org/apache/tapestry/junit/parse/TestSpecificationParser.java
  
  Index: TestSpecificationParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/junit/src/org/apache/tapestry/junit/parse/TestSpecificationParser.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- TestSpecificationParser.java	5 Oct 2004 17:28:55 -0000	1.25
  +++ TestSpecificationParser.java	5 Oct 2004 23:33:21 -0000	1.26
  @@ -815,4 +815,13 @@
   
           assertLoggedMessagePattern("The <service> element is no longer supported");
       }
  +    
  +    /** @since 3.1 */
  +    public void testMeta() throws Exception
  +    {
  +        ILibrarySpecification spec = parseLib("Meta.library");
  +        
  +        assertEquals("bar", spec.getProperty("foo"));
  +        assertEquals("long value", spec.getProperty("long"));
  +    }
   }
  
  
  
  1.1                  jakarta-tapestry/junit/src/org/apache/tapestry/junit/parse/Meta.library
  
  Index: Meta.library
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <!--
      Copyright 2004 The Apache Software Foundation
    
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
    
         http://www.apache.org/licenses/LICENSE-2.0
    
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
  -->
  <!DOCTYPE library-specification PUBLIC 
    "-//Apache Software Foundation//Tapestry Specification 3.1//EN" 
    "http://jakarta.apache.org/tapestry/dtd/Tapestry_3_1.dtd">
  	
  	
  <library-specification>
  	
    <meta key="foo" value="bar"/>
    <meta key="long">
      long value
    </meta>
  
  </library-specification>
  
  
  1.7       +5 -0      jakarta-tapestry/.project
  
  Index: .project
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/.project,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- .project	4 Aug 2004 15:04:24 -0000	1.6
  +++ .project	5 Oct 2004 23:33:21 -0000	1.7
  @@ -10,6 +10,11 @@
   			<arguments>
   			</arguments>
   		</buildCommand>
  +		<buildCommand>
  +			<name>com.cenqua.clover.eclipse.cloverjavabuilder</name>
  +			<arguments>
  +			</arguments>
  +		</buildCommand>
   	</buildSpec>
   	<natures>
   		<nature>org.eclipse.jdt.core.javanature</nature>
  
  
  
  1.54      +25 -25    jakarta-tapestry/.classpath
  
  Index: .classpath
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/.classpath,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- .classpath	6 Sep 2004 22:49:12 -0000	1.53
  +++ .classpath	5 Oct 2004 23:33:21 -0000	1.54
  @@ -1,28 +1,28 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <classpath>
  -    <classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/>
  -    <classpathentry kind="lib" path="config"/>
  -    <classpathentry kind="src" path="junit/src"/>
  -    <classpathentry kind="src" path="contrib/src/java"/>
  -    <classpathentry kind="src" path="framework/src/java"/>
  -    <classpathentry kind="var" path="JYTHON_DIR/jython.jar"/>
  -    <classpathentry kind="lib" path="ext-package/lib/bsf-2.3.0.jar"/>
  -    <classpathentry kind="lib" path="ext-package/lib/commons-codec-1.2.jar"/>
  -    <classpathentry kind="lib" path="ext-package/lib/commons-fileupload-1.0.jar"/>
  -    <classpathentry kind="lib" path="ext-package/lib/commons-lang-2.0.jar"/>
  -    <classpathentry kind="lib" path="ext-package/lib/commons-logging-1.0.3.jar"/>
  -    <classpathentry kind="lib" path="ext-package/lib/easymock-1.1.jar"/>
  -    <classpathentry kind="lib" path="ext-package/lib/javassist-2.6.jar"/>
  -    <classpathentry kind="lib" path="ext-package/lib/jdom-b8.jar"/>
  -    <classpathentry kind="lib" path="ext-package/lib/junit-3.8.1.jar"/>
  -    <classpathentry kind="lib" path="ext-package/lib/log4j-1.2.7.jar"/>
  -    <classpathentry kind="lib" path="ext-package/lib/ognl-2.6.3.jar"/>
  -    <classpathentry kind="lib" path="ext-package/lib/oro-2.0.6.jar"/>
  -    <classpathentry kind="lib" path="ext-package/lib/servletapi-2.3.jar"/>
  -    <classpathentry kind="lib" path="ext-package/lib/jboss-j2ee-3.2.1.jar"/>
  -    <classpathentry kind="lib"
  -        path="ext-package/lib/hivemind-1.0-rc-2-snapshot.jar" sourcepath="C:/workspace/jakarta-hivemind/framework/src/java"/>
  -    <classpathentry kind="lib" path="ext-package/lib/hivemind-lib-1.0-rc-2-snapshot.jar"/>
  -    <classpathentry kind="lib" path="framework/src/descriptor"/>
  -    <classpathentry kind="output" path="bin"/>
  +	<classpathentry exported="true" kind="var" path="CLOVER_RUNTIME"/>
  +	<classpathentry sourcepath="JRE_SRC" kind="var" path="JRE_LIB"/>
  +	<classpathentry kind="lib" path="config"/>
  +	<classpathentry kind="src" path="junit/src"/>
  +	<classpathentry kind="src" path="contrib/src/java"/>
  +	<classpathentry kind="src" path="framework/src/java"/>
  +	<classpathentry kind="var" path="JYTHON_DIR/jython.jar"/>
  +	<classpathentry kind="lib" path="ext-package/lib/bsf-2.3.0.jar"/>
  +	<classpathentry kind="lib" path="ext-package/lib/commons-codec-1.2.jar"/>
  +	<classpathentry kind="lib" path="ext-package/lib/commons-fileupload-1.0.jar"/>
  +	<classpathentry kind="lib" path="ext-package/lib/commons-lang-2.0.jar"/>
  +	<classpathentry kind="lib" path="ext-package/lib/commons-logging-1.0.3.jar"/>
  +	<classpathentry kind="lib" path="ext-package/lib/easymock-1.1.jar"/>
  +	<classpathentry kind="lib" path="ext-package/lib/javassist-2.6.jar"/>
  +	<classpathentry kind="lib" path="ext-package/lib/jdom-b8.jar"/>
  +	<classpathentry kind="lib" path="ext-package/lib/junit-3.8.1.jar"/>
  +	<classpathentry kind="lib" path="ext-package/lib/log4j-1.2.7.jar"/>
  +	<classpathentry kind="lib" path="ext-package/lib/ognl-2.6.3.jar"/>
  +	<classpathentry kind="lib" path="ext-package/lib/oro-2.0.6.jar"/>
  +	<classpathentry kind="lib" path="ext-package/lib/servletapi-2.3.jar"/>
  +	<classpathentry kind="lib" path="ext-package/lib/jboss-j2ee-3.2.1.jar"/>
  +	<classpathentry sourcepath="C:/workspace/jakarta-hivemind/framework/src/java" kind="lib"
path="ext-package/lib/hivemind-1.0-rc-2-snapshot.jar"/>
  +	<classpathentry kind="lib" path="ext-package/lib/hivemind-lib-1.0-rc-2-snapshot.jar"/>
  +	<classpathentry kind="lib" path="framework/src/descriptor"/>
  +	<classpathentry kind="output" path="bin"/>
   </classpath>
  
  
  
  1.6       +35 -45    jakarta-tapestry/framework/src/java/org/apache/tapestry/parse/SpecificationParser.java
  
  Index: SpecificationParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/parse/SpecificationParser.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SpecificationParser.java	5 Oct 2004 17:28:56 -0000	1.5
  +++ SpecificationParser.java	5 Oct 2004 23:33:21 -0000	1.6
  @@ -235,7 +235,7 @@
   
       private static final int STATE_PAGE_SPECIFICATION_INITIAL = 1001;
   
  -    private static final int STATE_PROPERTY = 3;
  +    private static final int STATE_META = 3;
   
       private static final int STATE_PROPERTY_SPECIFICATION = 10;
   
  @@ -397,7 +397,7 @@
   
               case STATE_ALLOW_PROPERTY:
   
  -                beginAllowProperty();
  +                allowMetaData();
                   break;
   
               case STATE_BEAN:
  @@ -443,15 +443,23 @@
       }
   
       /**
  -     * Special state for a number of elements that can support the nested &lt;property&gt;
  -     * (meta-data) element.
  +     * Special state for a number of elements that can support the nested &lt;meta&gt;
meta data
  +     * element (&lt;property&gt; in 3.0 DTD).
        */
   
  -    private void beginAllowProperty()
  +    private void allowMetaData()
       {
  -        if (_elementName.equals("property"))
  +        if (_DTD_3_1)
           {
  -            enterProperty();
  +            if (_elementName.equals("meta"))
  +            {
  +                enterMeta();
  +                return;
  +            }
  +        }
  +        else if (_elementName.equals("property"))
  +        {
  +            enterProperty_3_0();
               return;
           }
   
  @@ -497,13 +505,7 @@
               return;
           }
   
  -        if (_elementName.equals("property"))
  -        {
  -            enterProperty();
  -            return;
  -        }
  -
  -        unexpectedElement(_elementName);
  +        allowMetaData();
       }
   
       private void beginComponent()
  @@ -541,13 +543,7 @@
               return;
           }
   
  -        if (_elementName.equals("property"))
  -        {
  -            enterProperty();
  -            return;
  -        }
  -
  -        unexpectedElement(_elementName);
  +        allowMetaData();
       }
   
       private void beginComponentSpecification()
  @@ -593,19 +589,13 @@
   
       private void beginExtension()
       {
  -        if (_elementName.equals("property"))
  -        {
  -            enterProperty();
  -            return;
  -        }
  -
           if (_elementName.equals("configure"))
           {
               enterConfigure();
               return;
           }
   
  -        unexpectedElement(_elementName);
  +        allowMetaData();
       }
   
       private void beginLibrarySpecification()
  @@ -616,12 +606,6 @@
               return;
           }
   
  -        if (_elementName.equals("property"))
  -        {
  -            enterProperty();
  -            return;
  -        }
  -
           if (_elementName.equals("page"))
           {
               enterPage();
  @@ -654,7 +638,7 @@
               return;
           }
   
  -        unexpectedElement(_elementName);
  +        allowMetaData();
       }
   
       private void beginLibrarySpecificationInitial()
  @@ -707,19 +691,13 @@
   
           }
   
  -        if (_elementName.equals("property"))
  -        {
  -            enterProperty();
  -            return;
  -        }
  -
           if (_elementName.equals("description"))
           {
               enterDescription();
               return;
           }
   
  -        unexpectedElement(_elementName);
  +        allowMetaData();
       }
   
       private void beginPageSpecificationInitial()
  @@ -787,7 +765,7 @@
                   endDescription();
                   break;
   
  -            case STATE_PROPERTY:
  +            case STATE_META:
   
                   endProperty();
                   break;
  @@ -1255,7 +1233,19 @@
           enterAsset("resource-path", AssetType.PRIVATE);
       }
   
  -    private void enterProperty()
  +    private void enterMeta()
  +    {
  +        String key = getAttribute("key");
  +        String value = getAttribute("value");
  +
  +        // Value may be null, in which case the value is set from the element content
  +
  +        IPropertyHolder ph = (IPropertyHolder) peekObject();
  +
  +        push(_elementName, new PropertyValueSetter(ph, key, value), STATE_META, false);
  +    }
  +
  +    private void enterProperty_3_0()
       {
           String name = getAttribute("name");
           String value = getAttribute("value");
  @@ -1264,7 +1254,7 @@
   
           IPropertyHolder ph = (IPropertyHolder) peekObject();
   
  -        push(_elementName, new PropertyValueSetter(ph, name, value), STATE_PROPERTY, false);
  +        push(_elementName, new PropertyValueSetter(ph, name, value), STATE_META, false);
       }
   
       private void enterPropertySpecification()
  
  
  
  1.3       +17 -15    jakarta-tapestry/framework/src/java/org/apache/tapestry/parse/Tapestry_3_1.dtd
  
  Index: Tapestry_3_1.dtd
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/parse/Tapestry_3_1.dtd,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Tapestry_3_1.dtd	5 Oct 2004 17:28:56 -0000	1.2
  +++ Tapestry_3_1.dtd	5 Oct 2004 23:33:21 -0000	1.3
  @@ -30,6 +30,7 @@
   - The <static-binding>, <inherited-binding> and <message-binding> elements
have been removed.
     There is now just <binding>, whose value attribute contains a prefix to interpret
how
     the remainder of the value is interpreted (no prefix meaning a literal, or static, value).
  +- <property> renamed to <meta> and <property-specification> renamed to
<property>
   
   -->
   <!-- =======================================================
  @@ -47,7 +48,7 @@
   
   -->
   <!ENTITY % static-value-type "(boolean|int|long|double|String) 'String'">
  -<!ENTITY % library-content "(description?, property*, (page|component-type|service|library|extension)*)">
  +<!ENTITY % library-content "(description?, meta*, (page|component-type|service|library|extension)*)">
   <!-- =======================================================
   Element: application
   Root element
  @@ -95,7 +96,7 @@
   newly instantiated beans, and beans that are retrieved from a pool.
   
   -->
  -<!ELEMENT bean (description?, property*, (set-property | set-message-property)*)>
  +<!ELEMENT bean (description?, meta*, (set-property | set-message-property)*)>
   <!ATTLIST bean
   	name CDATA #REQUIRED
   	class CDATA #REQUIRED
  @@ -155,7 +156,7 @@
   
   The Tapestry page loader ensures that either type or copy-of is specified, but not both.
   -->
  -<!ELEMENT component (property*, (binding | listener-binding)*)>
  +<!ELEMENT component (meta*, (binding | listener-binding)*)>
   <!ATTLIST component
   	id ID #REQUIRED
   	type CDATA #IMPLIED
  @@ -193,7 +194,7 @@
     allow-informal-parameters:  If yes (the default), informal parameters (parameters that
are not
       explictily defined) are allowed.
   -->
  -<!ELEMENT component-specification (description?, parameter*, reserved-parameter*, property*,
(bean | component | external-asset | context-asset | private-asset | property-specification)*)>
  +<!ELEMENT component-specification (description?, parameter*, reserved-parameter*, meta*,
(bean | component | external-asset | context-asset | private-asset | property-specification)*)>
   <!ATTLIST component-specification
   	class CDATA #IMPLIED
   	allow-body %attribute-flag; "yes"
  @@ -210,7 +211,7 @@
     name: The name of the asset.
     path: The path, relative to the web application context, of the resource.
   -->
  -<!ELEMENT context-asset (property*)>
  +<!ELEMENT context-asset (meta*)>
   <!ATTLIST context-asset
   	name CDATA #REQUIRED
   	path CDATA #REQUIRED
  @@ -239,7 +240,7 @@
     immediate: If true, the extension is instantiated early instead of as-needed.
     
   -->
  -<!ELEMENT extension (property*, configure*)>
  +<!ELEMENT extension (meta*, configure*)>
   <!ATTLIST extension
   	name CDATA #REQUIRED
   	class CDATA #REQUIRED
  @@ -255,7 +256,7 @@
     name: The name of the asset.
     URL: The URL used to reference the asset.
   -->
  -<!ELEMENT external-asset (property*)>
  +<!ELEMENT external-asset (meta*)>
   <!ATTLIST external-asset
   	name CDATA #REQUIRED
   	URL CDATA #REQUIRED
  @@ -336,7 +337,7 @@
   Attributes:
     class: The Java class to instantiate for the component.
   -->
  -<!ELEMENT page-specification (description?, property*, (bean | component | external-asset
| context-asset | private-asset | property-specification)*)>
  +<!ELEMENT page-specification (description?, meta*, (bean | component | external-asset
| context-asset | private-asset | property-specification)*)>
   <!ATTLIST page-specification
   	class CDATA #IMPLIED
   >
  @@ -377,30 +378,31 @@
     name: The name of the asset.
     resource-path: The complete pathname of the resource.
   -->
  -<!ELEMENT private-asset (property*)>
  +<!ELEMENT private-asset (meta*)>
   <!ATTLIST private-asset
   	name CDATA #REQUIRED
   	resource-path CDATA #REQUIRED
   >
   <!-- =======================================================
  -Element: property
  +Element: meta
   Contained by: (many other elements)
   
   Defines a key/value pair associated with the application or component specification.  Properties
   are used to capture information that doesn't fit into the DTD.  The value for the property
is
  -the PCDATA wrapped by the property tag (which is trimmed of leading and trailing whitespace).
  +either the value attribute, or the PCDATA wrapped by the property tag 
  +(which is trimmed of leading and trailing whitespace).
   
   This should not be confused with several other tags which are used to set JavaBeans properties
   of various objects.  The <property> tag exists to allow meta-data to be stored in
the specification.
   
   Attributes:
  -  name: The name of the property to set.
  +  key: The name of the property to set.
     value: If specified, is the value of the property, otherwise, the PCDATA is used.
     
   -->
  -<!ELEMENT property (#PCDATA)>
  -<!ATTLIST property
  -	name CDATA #REQUIRED
  +<!ELEMENT meta (#PCDATA)>
  +<!ATTLIST meta
  +	key CDATA #REQUIRED
   	value CDATA #IMPLIED
   >
   <!-- =======================================================
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org


Mime
View raw message