click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sa...@apache.org
Subject svn commit: r956730 - in /click/trunk/click: documentation/docs/ documentation/dtds/ documentation/xdocs/src/docbook/click/ framework/src/org/apache/click/
Date Mon, 21 Jun 2010 23:19:17 GMT
Author: sabob
Date: Mon Jun 21 23:19:17 2010
New Revision: 956730

URL: http://svn.apache.org/viewvc?rev=956730&view=rev
Log:
updated service name order and example dtd

Modified:
    click/trunk/click/documentation/docs/click-dtd-example.html
    click/trunk/click/documentation/docs/click-dtd.html
    click/trunk/click/documentation/dtds/click-2.2.dtd
    click/trunk/click/documentation/dtds/click-2.3.dtd
    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-example.html
URL: http://svn.apache.org/viewvc/click/trunk/click/documentation/docs/click-dtd-example.html?rev=956730&r1=956729&r2=956730&view=diff
==============================================================================
--- click/trunk/click/documentation/docs/click-dtd-example.html (original)
+++ click/trunk/click/documentation/docs/click-dtd-example.html Mon Jun 21 23:19:17 2010
@@ -83,6 +83,9 @@ Provides an example of all <a href="clic
   &lt;!-- Set a custom messages map service --&gt;
   &lt;messages-map-service classname="com.mycorp.services.CustomMessagesMapService"/&gt;
 
+  &lt;!-- Set a custom resource service --&gt;
+  &lt;resource-service classname="com.mycorp.services.CustomResourceService"/&gt;
+
   &lt;!-- Set the template engine to use Freemarker instead of Velocity --&gt;
   &lt;template-service classname="org.apache.click.extras.service.FreemarkerTemplateService"/&gt;
 

Modified: click/trunk/click/documentation/docs/click-dtd.html
URL: http://svn.apache.org/viewvc/click/trunk/click/documentation/docs/click-dtd.html?rev=956730&r1=956729&r2=956730&view=diff
==============================================================================
--- click/trunk/click/documentation/docs/click-dtd.html (original)
+++ click/trunk/click/documentation/docs/click-dtd.html Mon Jun 21 23:19:17 2010
@@ -48,7 +48,7 @@ Click application XML descriptor Documen
 
 &lt;!-- The Click Application (click.xml) Document Type Definition. --&gt;
 &lt;!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">messages-map-service</span>?, <span class="blue">page-interceptor</span>*)&gt;
+                     <span class="blue">file-upload-service</span>?, <span
class="blue">log-service</span>?, <span class="blue">messages-map-service</span>?,
<span class="blue">resource-service</span>?, <span class="blue">template-service</span>?,
<span class="blue">page-interceptor</span>*)&gt;
   &lt;!ATTLIST <span class="red">click-app</span> <span class="blue">charset</span>
CDATA #IMPLIED&gt;
   &lt;!ATTLIST <span class="red">click-app</span> <span class="blue">locale</span>
CDATA #IMPLIED&gt;
 
@@ -108,15 +108,19 @@ Click application XML descriptor Documen
   &lt;!-- Log Service. --&gt;
   &lt;!ELEMENT <span class="red">log-service</span> (property*)&gt;
     &lt;!ATTLIST <span class="red">log-service</span> <span class="blue">classname</span>
CDATA #FIXED "<span class="green">org.apache.click.service.ConsoleLogService</span>"&gt;
- 
-  &lt;!-- Template Service. --&gt;
-  &lt;!ELEMENT <span class="red">template-service</span> (property*)&gt;
-    &lt;!ATTLIST <span class="red">template-service</span> <span class="blue">classname</span>
CDATA #FIXED "<span class="green">org.apache.click.service.VelocityTemplateService</span>"&gt;
 
   &lt;!-- Messages Map Service. --&gt;
   &lt;!ELEMENT <span class="red">messages-map-service</span> (property*)&gt;
     &lt;!ATTLIST <span class="red">messages-map-service</span> <span class="blue">classname</span>
CDATA #FIXED "<span class="green">org.apache.click.service.DefaultMessagesMapService</span>"&gt;
 
+  &lt;!-- Resource Service. --&gt;
+  &lt;!ELEMENT <span class="red">resource-service</span> (property*)&gt;
+    &lt;!ATTLIST <span class="red">resource-service</span> <span class="blue">classname</span>
CDATA #FIXED "<span class="green">org.apache.click.service.ClickResourceService</span>"&gt;
+
+  &lt;!-- Template Service. --&gt;
+  &lt;!ELEMENT <span class="red">template-service</span> (property*)&gt;
+    &lt;!ATTLIST <span class="red">template-service</span> <span class="blue">classname</span>
CDATA #FIXED "<span class="green">org.apache.click.service.VelocityTemplateService</span>"&gt;
+
   &lt;!-- Application page interceptors. --&gt;
   &lt;!ELEMENT page-interceptor (property*)&gt;
     &lt;!ATTLIST page-interceptor classname CDATA #REQUIRED&gt;

Modified: click/trunk/click/documentation/dtds/click-2.2.dtd
URL: http://svn.apache.org/viewvc/click/trunk/click/documentation/dtds/click-2.2.dtd?rev=956730&r1=956729&r2=956730&view=diff
==============================================================================
--- click/trunk/click/documentation/dtds/click-2.2.dtd (original)
+++ click/trunk/click/documentation/dtds/click-2.2.dtd Mon Jun 21 23:19:17 2010
@@ -31,7 +31,7 @@
 -->
 
 <!-- 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?, resource-service?, template-service?, page-interceptor*)>
   <!ATTLIST click-app charset CDATA #IMPLIED>
   <!ATTLIST click-app locale CDATA #IMPLIED>
 
@@ -92,6 +92,10 @@
   <!ELEMENT log-service (property*)>
    <!ATTLIST log-service classname CDATA #FIXED "org.apache.click.service.ConsoleLogService">
 
+  <!-- Resource Service class. -->
+  <!ELEMENT resource-service (property*)>
+   <!ATTLIST resource-service classname CDATA #FIXED "org.apache.click.service.ClickResourceService">
+
   <!-- Template Service class. -->
   <!ELEMENT template-service (property*)>
    <!ATTLIST template-service classname CDATA #FIXED "org.apache.click.service.VelocityTemplateService">

Modified: 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=956730&r1=956729&r2=956730&view=diff
==============================================================================
--- click/trunk/click/documentation/dtds/click-2.3.dtd (original)
+++ click/trunk/click/documentation/dtds/click-2.3.dtd Mon Jun 21 23:19:17 2010
@@ -31,7 +31,7 @@
 -->
 
 <!-- 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*)>
+<!ELEMENT click-app (pages*, headers?, format?, mode?, controls?, file-upload-service?,
log-service?, messages-map-service?, resource-service?, template-service?, page-interceptor*)>
   <!ATTLIST click-app charset CDATA #IMPLIED>
   <!ATTLIST click-app locale CDATA #IMPLIED>
 
@@ -92,14 +92,18 @@
   <!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">
 
+  <!-- Resource Service class. -->
+  <!ELEMENT resource-service (property*)>
+   <!ATTLIST resource-service classname CDATA #FIXED "org.apache.click.service.ClickResourceService">
+
+  <!-- Template Service class. -->
+  <!ELEMENT template-service (property*)>
+   <!ATTLIST template-service classname CDATA #FIXED "org.apache.click.service.VelocityTemplateService">
+
   <!-- Application page interceptors. -->
   <!ELEMENT page-interceptor (property*)>
     <!ATTLIST page-interceptor classname CDATA #REQUIRED>

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=956730&r1=956729&r2=956730&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 23:19:17 2010
@@ -248,7 +248,7 @@
       </para>
 
       <literallayout>&lt;!ELEMENT <symbol>click-app</symbol> (pages*,
headers?, format?, mode?, controls?,
-                         file-upload-service?, log-service?, template-service?, resource-service?,
messages-map-service?)&gt;
+                         file-upload-service?, log-service?, messages-map-service?, resource-service?,
template-service?, page-interceptor*)&gt;
   &lt;!ATTLIST click-app <varname>charset</varname> CDATA #IMPLIED&gt;
   &lt;!ATTLIST click-app <varname>locale</varname> CDATA #IMPLIED&gt;</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=956730&r1=956729&r2=956730&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 23:19:17 2010
@@ -31,7 +31,7 @@
 -->
 
 <!-- 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*)>
+<!ELEMENT click-app (pages*, headers?, format?, mode?, controls?, file-upload-service?,
log-service?, messages-map-service?, resource-service?, template-service?, page-interceptor*)>
   <!ATTLIST click-app charset CDATA #IMPLIED>
   <!ATTLIST click-app locale CDATA #IMPLIED>
 
@@ -92,14 +92,18 @@
   <!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">
 
+  <!-- Resource Service class. -->
+  <!ELEMENT resource-service (property*)>
+   <!ATTLIST resource-service classname CDATA #FIXED "org.apache.click.service.ClickResourceService">
+
+  <!-- Template Service class. -->
+  <!ELEMENT template-service (property*)>
+   <!ATTLIST template-service classname CDATA #FIXED "org.apache.click.service.VelocityTemplateService">
+
   <!-- Application page interceptors. -->
   <!ELEMENT page-interceptor (property*)>
     <!ATTLIST page-interceptor classname CDATA #REQUIRED>



Mime
View raw message