CVS: Tapestry/junit/src/net/sf/tapestry/junit/parse Tapestry_1_2.dtd,NONE,1.1.2.1 ListenerBinding.page,NONE,1.1.2.1 ConfigureValue.library,NONE,1.1.2.1 SpecificationParserTest.java,1.9.2.3,1.9.2.4 InvalidPublicId.application,1.1.2.1,1.1.2.2
Howard Lewis Ship <[email protected]>
| Newsgroups | gmane.comp.java.tapestry.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/tapestry/Tapestry/junit/src/net/sf/tapestry/junit/parse
In directory sc8-pr-cvs1:/tmp/cvs-serv3134/junit/src/net/sf/tapestry/junit/parse
Modified Files:
Tag: hship-2-3
SpecificationParserTest.java InvalidPublicId.application
Added Files:
Tag: hship-2-3
Tapestry_1_2.dtd ListenerBinding.page ConfigureValue.library
Log Message:
Add tests for <listener-binding>
--- NEW FILE: Tapestry_1_2.dtd ---
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id: Tapestry_1_2.dtd,v 1.1.2.1 2003/01/04 02:49:05 hship Exp $ -->
<!--
The DTD for Tapestry application and component specifications.
Associated with the public identifier:
-//Howard Lewis Ship//Tapestry Specification 1.2//EN
The canonical location for the DTD is:
http://tapestry.sf.net/dtd/Tapestry_1_2.dtd
For application specifications, the root element is application.
For component specifications the root element is specification.
This DTD is backwards compatible with the 1.1 DTD, with the following exceptions:
- Addition of the parameter-name attribute to the parameter element
- Addition of direction attribute to the parameter element
- Addition of string-binding element
-->
<!-- =======================================================
Entity: attribute-flag
For entity attribute that take a boolean value, defines 'yes' and 'no.
-->
<!ENTITY % attribute-flag "(yes|no)">
<!-- =======================================================
Element: application
Root element
Defines a Tapestry application.
Attributes:
name: A textual name used to uniquely identify the application.
engine-class: The Java class to instantiate as the application engine.
-->
<!ELEMENT application (description*, property*, (page|component-alias|service)*)>
<!ATTLIST application
name CDATA #REQUIRED
engine-class CDATA #REQUIRED
>
<!-- =======================================================
Element: bean
Appears in: specification
Defines a JavaBean that will be used in some way by the component. Beans
are accessible via the components' beans property (which contains a property
for each bean). Beans are created as needed, and are discarded based on
the lifecycle attribute. Beans are typically used to extend the
implementation of a component via aggregation.
Attributes:
name: the name of the bean
class: the Java class to instantiate
lifecycle: when the reference to the bean should be discard
"none" no lifecycle, the bean is created and returned, but not stored
"request" the bean is retained until the end of the request cycle
"page" the bean is retained for the lifespan of the page
Nothing prevents a bean for storing state; however, such state will
not be associated with any particular session (unlike persistant page
properties). Further, because of page pooling, subsequent requests
from the same client may be serviced by different instances of a page and
(therefore) different bean instances.
Beans that have the "request" lifecycle may be stored into a pool
for later re-use (in the same or different page).
The bean may have its properties set. Properties are set on both
newly instantiated beans, and beans that are retrieved from a pool.
-->
<!ELEMENT bean (description*, set-property*)>
<!ATTLIST bean
name CDATA #REQUIRED
class CDATA #REQUIRED
lifecycle (none|request|page) "request"
>
<!-- =======================================================
Element: binding
Appears in: component
Binds a parameter of the component to a property of its container.
Attributes:
name: The name of the component parameter to bind.
property-path: The property path, relative to the container, to obtain
the parameter value from.
-->
<!ELEMENT binding EMPTY>
<!ATTLIST binding
name CDATA #REQUIRED
property-path CDATA #REQUIRED
>
<!-- =======================================================
Element: component
Contained by: specification
Defines a component contained by the component being specified.
Attribute:
id: A unique identifier for the component within the container.
type: The type of component, either a well known logical name, or the complete path
to the component's specification.
copy-of: The id of a previously defined component; this component will be a copy
of the other component.
The Tapestry page loader ensures that either type or copy-of is specified, but not both.
-->
<!ELEMENT component ((binding | field-binding | inherited-binding | static-binding | string-binding)*)>
<!ATTLIST component
id ID #REQUIRED
type CDATA #IMPLIED
copy-of IDREF #IMPLIED
>
<!-- =======================================================
Element: component-alias
Contained by: application
Establishes a short logic name for a particular component that is used
within the application.
Attributes:
type: The logical name for the component.
specification-path: The complete path to the component's specification.
-->
<!ELEMENT component-alias EMPTY>
<!ATTLIST component-alias
type CDATA #REQUIRED
specification-path CDATA #REQUIRED
>
<!-- =======================================================
Element: context-asset
Contained by: specification
An asset located in the same web application context as the running
application.
Attributes:
name: The name of the asset.
path: The path, relative to the web application context, of the resource.
-->
<!ELEMENT context-asset EMPTY>
<!ATTLIST context-asset
name CDATA #REQUIRED
path CDATA #REQUIRED
>
<!-- =======================================================
Element: description
Appears in: application bean parameter specification
Several elements may contain descriptions; these descriptions are
optional. The eventual goal is to provide help in some form of IDE.
Currently, descriptions are optional and ignored.
Attributes:
xml:lang the language that the description is expressed in.
-->
<!ELEMENT description (#PCDATA)>
<!ATTLIST description
xml:lang NMTOKEN "en"
>
<!-- =======================================================
Element: external-asset
Contained by: specification
Defines an asset at some external source.
Attributes:
name: The name of the asset.
URL: The URL used to reference the asset.
-->
<!ELEMENT external-asset EMPTY>
<!ATTLIST external-asset
name CDATA #REQUIRED
URL CDATA #REQUIRED
>
<!-- =======================================================
Element: field-binding
Appears in: component
Binds a parameter of the component to a public static field of
some Java object.
Attributes:
name: The name of the component parameter to bind.
field-name: The name of the field, of the form [package.]class.field.
The package may be ommitted if it is "java.lang".
-->
<!ELEMENT field-binding EMPTY>
<!ATTLIST field-binding
name CDATA #REQUIRED
field-name CDATA #REQUIRED
>
<!-- =======================================================
Element: field-value
Appears in: set-property
Allows a helper bean property to be set to the value of
a static field.
Attributes:
field-name: The name of the field, as with field-binding.
-->
<!ELEMENT field-value EMPTY>
<!ATTLIST field-value
field-name CDATA #REQUIRED
>
<!-- =======================================================
Element: inherited-binding
Appears in: component
Binds a parameter of the component to a parameter of the container.
Attributes:
name: The name of the component parameter to bind.
parameter-name: The name of the container parameter to bind the
component parameter to.
-->
<!ELEMENT inherited-binding EMPTY>
<!ATTLIST inherited-binding
name CDATA #REQUIRED
parameter-name CDATA #REQUIRED
>
<!-- =======================================================
Element: page
Contained by: application
Defines a single page within the application. Each application will contain
at least one of these, to define the Home page.
Attributes:
name: A unique name for the application.
specification-path: The resource classpath of the component specification
for the page.
-->
<!ELEMENT page EMPTY>
<!ATTLIST page
name CDATA #REQUIRED
specification-path CDATA #REQUIRED
>
<!-- =======================================================
Element: parameter
Contained by: specification
Defines a formal parameter for the component.
Attributes:
name: A unqiue name for the parameter.
java-type: The name of a Java class or primitive type expected by the parameter.
This is for documentation purposes only, it is not enforced.
required: If yes, then the parameter must be bound. If no (the default),
then the parameter is optional.
property-name: The name to use, instead of the parameter name, for the
JavaBean property connected to this parameter.
direction: The normal flow of data through the component.
-->
<!ELEMENT parameter (description*)>
<!ATTLIST parameter
name CDATA #REQUIRED
java-type CDATA #IMPLIED
required %attribute-flag; "no"
property-name CDATA #IMPLIED
direction (in|custom) "custom"
>
<!-- =======================================================
Element: private-asset
Contained by: specification
An asset available within the Java classpath (i.e., bundled inside a JAR or WAR).
Attributes:
name: The name of the asset.
resource-path: The complete pathname of the resource.
-->
<!ELEMENT private-asset EMPTY>
<!ATTLIST private-asset
name CDATA #REQUIRED
resource-path CDATA #REQUIRED
>
<!-- =======================================================
Element: property
Contained by: application, specification
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).
-->
<!ELEMENT property (#PCDATA)>
<!ATTLIST property
name CDATA #REQUIRED
>
<!-- =======================================================
Element: property-value
Appears in: set-parameter
Used to initialize a bean with a property of its containing
component.
-->
<!ELEMENT property-value EMPTY>
<!ATTLIST property-value
property-path CDATA #REQUIRED
>
<!-- =======================================================
Element: reserved-parameter
Appears in: specification
Identifies a name which may not be used as an informal parameter.
Informal parameters are typically HTML attribute names; this
list identifies HTML attributes that are written exclusively
by the component and may not be affected by informal parameters.
-->
<!ELEMENT reserved-parameter EMPTY>
<!ATTLIST reserved-parameter
name CDATA #REQUIRED
>
<!-- =======================================================
Element: service
Appears in: application
Defines an engine service. You may override the default
set of engine services or provide completely new services.
Attributes:
name: The name of the service.
class: The Java class to instantiate for the service.
-->
<!ELEMENT service EMPTY>
<!ATTLIST service
name CDATA #REQUIRED
class CDATA #REQUIRED
>
<!-- =======================================================
Element: set-property
Appears in: bean
Used to initialize a property of a helper bean.
-->
<!ELEMENT set-property (static-value | property-value | field-value)>
<!ATTLIST set-property
name CDATA #REQUIRED
>
<!-- =======================================================
Element: specification
Root element
A component specification. It's attributes define the Java class to
instantiate, whether the component may wrap other elements, and whether
informal (undeclared) parameters are allowed.
Attributes:
class: The Java class to instantiate for the component.
allow-body: If yes (the default), the component may wrap other elements (have a body).
allow-informal-parameters: If yes (the default), informal parameters (parameters that are not
explictily defined) are allowed.
-->
<!ELEMENT specification (description*, parameter*, reserved-parameter*, property*, bean*,
component*, (external-asset | context-asset | private-asset)*)>
<!ATTLIST specification
class CDATA #REQUIRED
allow-body %attribute-flag; "yes"
allow-informal-parameters %attribute-flag; "yes"
>
<!-- =======================================================
Element: static-binding
Appears in: component
Binds a parameter of the component to a static value defined directly
within this specification. The value is the PCDATA wrapped by the element
(with leading and trailing whitespace removed).
Attributes:
name: The name of the component parameter to bind.
-->
<!ELEMENT static-binding (#PCDATA)>
<!ATTLIST static-binding
name CDATA #REQUIRED
>
<!-- =======================================================
Element: static-value
Appears in: set-parameter
A static value, that will be converted to some known type.
The possible types are limited to a few simple scalar types,
and String. Additional types will likely be added in the future.
-->
<!ELEMENT static-value (#PCDATA)>
<!ATTLIST static-value
type (boolean|int|double|String) "String"
>
<!-- =======================================================
Element: string-binding
Appears in: component
Binds a parameter of the component to a localized string of
its container.
Attributes:
name: The name of the component parameter to bind.
key: The key used to access a localized string.
-->
<!ELEMENT string-binding EMPTY>
<!ATTLIST string-binding
name CDATA #REQUIRED
key CDATA #REQUIRED
>
--- NEW FILE: ListenerBinding.page ---
<?xml version="1.0"?>
<!-- $Id: ListenerBinding.page,v 1.1.2.1 2003/01/04 02:49:05 hship Exp $ -->
<!DOCTYPE page-specification PUBLIC
"-//Howard Lewis Ship//Tapestry Specification 1.4//EN"
"http://tapestry.sf.net/dtd/Tapestry_1_4.dtd">
<page-specification>
<component id="c" type="DirectLink">
<listener-binding name="listener" language="jython">
if page.isFormInputValid():
cycle.page = "Results"
else:
page.message = "Please fix errors before continuing.";
</listener-binding>
</component>
</page-specification>
--- NEW FILE: ConfigureValue.library ---
<?xml version="1.0"?>
<!--$Id: ConfigureValue.library,v 1.1.2.1 2003/01/04 02:49:05 hship Exp $-->
<!DOCTYPE library-specification PUBLIC
"-//Howard Lewis Ship//Tapestry Specification 1.4//EN"
"http://tapestry.sf.net/dtd/Tapestry_1_4.dtd">
<library-specification>
<extension name="map" class="java.util.HashMap">
<configure property-name="fred" value="flintstone"/>
</extension>
</library-specification>
Index: SpecificationParserTest.java
===================================================================
RCS file: /cvsroot/tapestry/Tapestry/junit/src/net/sf/tapestry/junit/parse/SpecificationParserTest.java,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -C2 -d -r1.9.2.3 -r1.9.2.4
*** SpecificationParserTest.java 31 Dec 2002 17:08:40 -0000 1.9.2.3
--- SpecificationParserTest.java 4 Jan 2003 02:49:05 -0000 1.9.2.4
***************
*** 1,4 ****
--- 1,6 ----
package net.sf.tapestry.junit.parse;
+ import java.util.Map;
+
import net.sf.tapestry.junit.TapestryTestCase;
import net.sf.tapestry.spec.BindingSpecification;
***************
*** 8,11 ****
--- 10,15 ----
import net.sf.tapestry.spec.IApplicationSpecification;
import net.sf.tapestry.spec.ILibrarySpecification;
+ import net.sf.tapestry.spec.LibrarySpecification;
+ import net.sf.tapestry.spec.ListenerBindingSpecification;
import net.sf.tapestry.spec.ParameterSpecification;
import net.sf.tapestry.util.xml.DocumentParseException;
***************
*** 387,390 ****
--- 391,452 ----
assertEquals("rubble", c.getBinding("barney").getValue());
assertEquals("hudson", c.getBinding("rock").getValue());
+ }
+
+ /**
+ * Tests the new (in DTD 1.4) value attribute on a configure element.
+ *
+ * @since 2.4
+ *
+ **/
+
+ public void testConfigureValue() throws Exception
+ {
+ ILibrarySpecification spec = parseLib("ConfigureValue.library");
+
+ Map map = (Map)spec.getExtension("map", Map.class);
+
+ assertEquals("flintstone", map.get("fred"));
+ }
+
+ /**
+ * Tests the new <listener-binding> element in the 1.4 DTD.
+ *
+ * @since 2.4
+ *
+ **/
+
+ public void testListenerBinding() throws Exception
+ {
+ ComponentSpecification spec = parsePage("ListenerBinding.page");
+
+ ContainedComponent c = spec.getComponent("c");
+
+ ListenerBindingSpecification lbs = (ListenerBindingSpecification) c.getBinding("listener");
+
+ String expectedScript =
+ buildExpectedScript(
+ new String[] {
+ "if page.isFormInputValid():",
+ " cycle.page = \"Results\"",
+ "else:",
+ " page.message = \"Please fix errors before continuing.\";" });
+
+ assertEquals("jython", lbs.getLanguage());
+ assertEquals(expectedScript, lbs.getScript());
+ }
+
+ private String buildExpectedScript(String[] lines)
+ {
+ StringBuffer buffer = new StringBuffer();
+
+ for (int i = 0; i < lines.length; i++)
+ {
+ if (i > 0)
+ buffer.append("\n");
+
+ buffer.append(lines[i]);
+ }
+
+ return buffer.toString();
}
}
Index: InvalidPublicId.application
===================================================================
RCS file: /cvsroot/tapestry/Tapestry/junit/src/net/sf/tapestry/junit/parse/Attic/InvalidPublicId.application,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** InvalidPublicId.application 31 Dec 2002 17:08:41 -0000 1.1.2.1
--- InvalidPublicId.application 4 Jan 2003 02:49:05 -0000 1.1.2.2
***************
*** 2,7 ****
<!--$Id$-->
<!DOCTYPE application PUBLIC
! "-//Howard Lewis Ship//Tapestry Specification 1.1//EN"
! "http://tapestry.sf.net/dtd/Tapestry_1_3.dtd">
<application name="Tapestry Component Workbench"
--- 2,7 ----
<!--$Id$-->
<!DOCTYPE application PUBLIC
! "-//Howard Lewis Ship//Tapestry Specification 1.2//EN"
! "Tapestry_1_2.dtd">
<application name="Tapestry Component Workbench"
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf