You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@click.apache.org by bc...@apache.org on 2010/06/21 22:47:21 UTC
svn commit: r956688 - in /click/trunk/click:
documentation/docs/click-dtd.html documentation/dtds/click-2.3.dtd
documentation/xdocs/src/docbook/click/chapter-configuration.xml
framework/src/org/apache/click/click.dtd
Author: bckfnn
Date: Mon Jun 21 20:47:21 2010
New Revision: 956688
URL: http://svn.apache.org/viewvc?rev=956688&view=rev
Log:
dtd & doco for messages-map-service. CLK-655
Added:
click/trunk/click/documentation/dtds/click-2.3.dtd (with props)
Modified:
click/trunk/click/documentation/docs/click-dtd.html
click/trunk/click/documentation/xdocs/src/docbook/click/chapter-configuration.xml
click/trunk/click/framework/src/org/apache/click/click.dtd
Modified: click/trunk/click/documentation/docs/click-dtd.html
URL: http://svn.apache.org/viewvc/click/trunk/click/documentation/docs/click-dtd.html?rev=956688&r1=956687&r2=956688&view=diff
==============================================================================
--- click/trunk/click/documentation/docs/click-dtd.html (original)
+++ click/trunk/click/documentation/docs/click-dtd.html Mon Jun 21 20:47:21 2010
@@ -48,7 +48,7 @@ Click application XML descriptor Documen
<!-- The Click Application (click.xml) Document Type Definition. -->
<!ELEMENT <span class="red">click-app</span> (<span class="blue">pages</span>*, <span class="blue">headers</span>?, <span class="blue">format</span>?, <span class="blue">mode</span>?, <span class="blue">controls</span>?,
- <span class="blue">file-upload-service</span>?, <span class="blue">log-service</span>?, <span class="blue">template-service</span>?, <span class="blue">page-interceptor</span>*)>
+ <span class="blue">file-upload-service</span>?, <span class="blue">log-service</span>?, <span class="blue">template-service</span>?, <span class="blue">messages-map-service</span>?, <span class="blue">page-interceptor</span>*)>
<!ATTLIST <span class="red">click-app</span> <span class="blue">charset</span> CDATA #IMPLIED>
<!ATTLIST <span class="red">click-app</span> <span class="blue">locale</span> CDATA #IMPLIED>
@@ -113,6 +113,10 @@ Click application XML descriptor Documen
<!ELEMENT <span class="red">template-service</span> (property*)>
<!ATTLIST <span class="red">template-service</span> <span class="blue">classname</span> CDATA #FIXED "<span class="green">org.apache.click.service.VelocityTemplateService</span>">
+ <!-- Messages Map Service. -->
+ <!ELEMENT <span class="red">messages-map-service</span> (property*)>
+ <!ATTLIST <span class="red">messages-map-service</span> <span class="blue">classname</span> CDATA #FIXED "<span class="green">org.apache.click.service.DefaultMessagesMapService</span>">
+
<!-- Application page interceptors. -->
<!ELEMENT page-interceptor (property*)>
<!ATTLIST page-interceptor classname CDATA #REQUIRED>
Added: click/trunk/click/documentation/dtds/click-2.3.dtd
URL: http://svn.apache.org/viewvc/click/trunk/click/documentation/dtds/click-2.3.dtd?rev=956688&view=auto
==============================================================================
--- click/trunk/click/documentation/dtds/click-2.3.dtd (added)
+++ click/trunk/click/documentation/dtds/click-2.3.dtd Mon Jun 21 20:47:21 2010
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+-->
+
+<!--
+ DTD for the Click Application Configuration File, Version 2.2
+
+ To support validation of your configuration file, include the following
+ DOCTYPE element at the beginning (after the "xml" declaration):
+
+ <!DOCTYPE click-app PUBLIC
+ "-//Apache Software Foundation//DTD Click Configuration 2.2//EN"
+ "http://click.apache.org/dtds/click-2.3.dtd">
+-->
+
+<!-- The Click Application (click.xml) Document Type Definition. -->
+<!ELEMENT click-app (pages*, headers?, format?, mode?, controls?, file-upload-service?, log-service?, template-service?, messages-map-service?, page-interceptor*)>
+ <!ATTLIST click-app charset CDATA #IMPLIED>
+ <!ATTLIST click-app locale CDATA #IMPLIED>
+
+ <!-- Application pages. -->
+ <!ELEMENT pages (page*, excludes*)>
+ <!ATTLIST pages package CDATA #IMPLIED>
+ <!ATTLIST pages automapping (true|false) "true">
+ <!ATTLIST pages autobinding (default|annotation|none) "default">
+
+ <!-- Page definition. -->
+ <!ELEMENT page (header*)>
+ <!ATTLIST page path CDATA #REQUIRED>
+ <!ATTLIST page classname CDATA #REQUIRED>
+
+ <!-- Excludes definition. -->
+ <!ELEMENT excludes (#PCDATA)>
+ <!ATTLIST excludes pattern CDATA #REQUIRED>
+
+ <!-- Application default page headers. -->
+ <!ELEMENT headers (header*)>
+
+ <!-- Header definition. -->
+ <!ELEMENT header (#PCDATA)>
+ <!ATTLIST header name CDATA #REQUIRED>
+ <!ATTLIST header value CDATA #REQUIRED>
+ <!ATTLIST header type (String|Integer|Date) "String">
+
+ <!-- Page template formatter class. An new format object added to
+ the Velocity context under the key: "format". -->
+ <!ELEMENT format (#PCDATA)>
+ <!ATTLIST format classname CDATA #FIXED "org.apache.click.util.Format">
+
+ <!-- Application mode, which configures logging and caching. -->
+ <!ELEMENT mode (#PCDATA)>
+ <!ATTLIST mode value (production|profile|development|debug|trace) "development">
+
+ <!-- Application control objects. -->
+ <!ELEMENT controls (control*, control-set*)>
+
+ <!-- Deployable control class. -->
+ <!ELEMENT control (#PCDATA)>
+ <!ATTLIST control classname CDATA #REQUIRED>
+
+ <!-- Deployable Third Party Set of Controls -->
+ <!ELEMENT control-set (#PCDATA)>
+ <!ATTLIST control-set name CDATA #REQUIRED>
+
+ <!-- File Upload Service. -->
+ <!ELEMENT file-upload-service (property*)>
+ <!ATTLIST file-upload-service classname CDATA #FIXED "org.apache.click.service.FileUploadService">
+
+ <!-- Property definition. -->
+ <!ELEMENT property (#PCDATA)>
+ <!ATTLIST property name CDATA #REQUIRED>
+ <!ATTLIST property value CDATA #REQUIRED>
+
+ <!-- Log Service. -->
+ <!ELEMENT log-service (property*)>
+ <!ATTLIST log-service classname CDATA #FIXED "org.apache.click.service.ConsoleLogService">
+
+ <!-- Template Service class. -->
+ <!ELEMENT template-service (property*)>
+ <!ATTLIST template-service classname CDATA #FIXED "org.apache.click.service.VelocityTemplateService">
+
+ <!-- Messages Map Service class. -->
+ <!ELEMENT messages-map-service (property*)>
+ <!ATTLIST messages-map-service classname CDATA #FIXED "org.apache.click.service.DefaultMessagesMapService">
+
+ <!-- Application page interceptors. -->
+ <!ELEMENT page-interceptor (property*)>
+ <!ATTLIST page-interceptor classname CDATA #REQUIRED>
+ <!ATTLIST page-interceptor scope (application|request) "request">
Propchange: click/trunk/click/documentation/dtds/click-2.3.dtd
------------------------------------------------------------------------------
svn:eol-style = native
Modified: click/trunk/click/documentation/xdocs/src/docbook/click/chapter-configuration.xml
URL: http://svn.apache.org/viewvc/click/trunk/click/documentation/xdocs/src/docbook/click/chapter-configuration.xml?rev=956688&r1=956687&r2=956688&view=diff
==============================================================================
--- click/trunk/click/documentation/xdocs/src/docbook/click/chapter-configuration.xml (original)
+++ click/trunk/click/documentation/xdocs/src/docbook/click/chapter-configuration.xml Mon Jun 21 20:47:21 2010
@@ -248,7 +248,7 @@
</para>
<literallayout><!ELEMENT <symbol>click-app</symbol> (pages*, headers?, format?, mode?, controls?,
- file-upload-service?, log-service?, template-service?)>
+ file-upload-service?, log-service?, template-service?, resource-service?, messages-map-service?)>
<!ATTLIST click-app <varname>charset</varname> CDATA #IMPLIED>
<!ATTLIST click-app <varname>locale</varname> CDATA #IMPLIED></literallayout>
Modified: click/trunk/click/framework/src/org/apache/click/click.dtd
URL: http://svn.apache.org/viewvc/click/trunk/click/framework/src/org/apache/click/click.dtd?rev=956688&r1=956687&r2=956688&view=diff
==============================================================================
--- click/trunk/click/framework/src/org/apache/click/click.dtd (original)
+++ click/trunk/click/framework/src/org/apache/click/click.dtd Mon Jun 21 20:47:21 2010
@@ -27,11 +27,11 @@
<!DOCTYPE click-app PUBLIC
"-//Apache Software Foundation//DTD Click Configuration 2.2//EN"
- "http://click.apache.org/dtds/click-2.2.dtd">
+ "http://click.apache.org/dtds/click-2.3.dtd">
-->
<!-- The Click Application (click.xml) Document Type Definition. -->
-<!ELEMENT click-app (pages*, headers?, format?, mode?, controls?, file-upload-service?, log-service?, template-service?, page-interceptor*)>
+<!ELEMENT click-app (pages*, headers?, format?, mode?, controls?, file-upload-service?, log-service?, template-service?, messages-map-service?, page-interceptor*)>
<!ATTLIST click-app charset CDATA #IMPLIED>
<!ATTLIST click-app locale CDATA #IMPLIED>
@@ -45,14 +45,14 @@
<!ELEMENT page (header*)>
<!ATTLIST page path CDATA #REQUIRED>
<!ATTLIST page classname CDATA #REQUIRED>
-
+
<!-- Excludes definition. -->
<!ELEMENT excludes (#PCDATA)>
<!ATTLIST excludes pattern CDATA #REQUIRED>
<!-- Application default page headers. -->
<!ELEMENT headers (header*)>
-
+
<!-- Header definition. -->
<!ELEMENT header (#PCDATA)>
<!ATTLIST header name CDATA #REQUIRED>
@@ -63,39 +63,43 @@
the Velocity context under the key: "format". -->
<!ELEMENT format (#PCDATA)>
<!ATTLIST format classname CDATA #FIXED "org.apache.click.util.Format">
-
+
<!-- Application mode, which configures logging and caching. -->
<!ELEMENT mode (#PCDATA)>
<!ATTLIST mode value (production|profile|development|debug|trace) "development">
<!-- Application control objects. -->
<!ELEMENT controls (control*, control-set*)>
-
+
<!-- Deployable control class. -->
<!ELEMENT control (#PCDATA)>
<!ATTLIST control classname CDATA #REQUIRED>
-
+
<!-- Deployable Third Party Set of Controls -->
<!ELEMENT control-set (#PCDATA)>
<!ATTLIST control-set name CDATA #REQUIRED>
-
+
<!-- File Upload Service. -->
<!ELEMENT file-upload-service (property*)>
<!ATTLIST file-upload-service classname CDATA #FIXED "org.apache.click.service.FileUploadService">
-
+
<!-- Property definition. -->
<!ELEMENT property (#PCDATA)>
<!ATTLIST property name CDATA #REQUIRED>
<!ATTLIST property value CDATA #REQUIRED>
-
+
<!-- Log Service. -->
<!ELEMENT log-service (property*)>
<!ATTLIST log-service classname CDATA #FIXED "org.apache.click.service.ConsoleLogService">
-
+
<!-- Template Service class. -->
<!ELEMENT template-service (property*)>
<!ATTLIST template-service classname CDATA #FIXED "org.apache.click.service.VelocityTemplateService">
-
+
+ <!-- Messages Map Service class. -->
+ <!ELEMENT messages-map-service (property*)>
+ <!ATTLIST messages-map-service classname CDATA #FIXED "org.apache.click.service.DefaultMessagesMapService">
+
<!-- Application page interceptors. -->
<!ELEMENT page-interceptor (property*)>
<!ATTLIST page-interceptor classname CDATA #REQUIRED>