click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sa...@apache.org
Subject svn commit: r932899 - in /click/trunk/click: documentation/docs/click-dtd-example.html documentation/docs/click-dtd.html documentation/dtds/click-2.2.dtd framework/src/org/apache/click/click.dtd framework/src/org/apache/click/service/XmlConfigService.java
Date Sun, 11 Apr 2010 13:45:32 GMT
Author: sabob
Date: Sun Apr 11 13:45:32 2010
New Revision: 932899

URL: http://svn.apache.org/viewvc?rev=932899&view=rev
Log:
updated dtds with page interceptor

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/framework/src/org/apache/click/click.dtd
    click/trunk/click/framework/src/org/apache/click/service/XmlConfigService.java

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=932899&r1=932898&r2=932899&view=diff
==============================================================================
--- click/trunk/click/documentation/docs/click-dtd-example.html (original)
+++ click/trunk/click/documentation/docs/click-dtd-example.html Sun Apr 11 13:45:32 2010
@@ -51,13 +51,18 @@ Provides an example of all <a href="clic
           &lt;!-- Specify headers to cache the page for 1 hour, after which it should
be reloaded --&gt;
           &lt;header name="Pragma" value="no-cache"/&gt;
           &lt;header name="Expires" value="1" type="Date"/&gt;
-      &lt;/page&gt; 
+      &lt;/page&gt;
 
   &lt;/pages&gt;
 
   &lt;!-- Another automatically mapped Page package --&gt;
   &lt;pages package="com.mycorp.common.page"/&gt;
 
+  &lt;page-interceptor classname="com.mycorp.PageSecurityInterceptor" scope="application"&gt;
+     &lt;property name="notAuthenticatedPath" value="/not-authenticated.htm"/&gt;
+     &lt;property name="notAuthorizedPath" value="/not-authorized.htm"/&gt;
+  &lt;/page-interceptor&gt;
+
   &lt;!-- Setup global headers. The headers shown below is the default used by Click
--&gt;
   &lt;headers&gt;
       &lt;header name="Pragma" value="no-cache"/&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=932899&r1=932898&r2=932899&view=diff
==============================================================================
--- click/trunk/click/documentation/docs/click-dtd.html (original)
+++ click/trunk/click/documentation/docs/click-dtd.html Sun Apr 11 13:45:32 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">page-interceptor</span>*)&gt;
+                     <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>*)&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;
 

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=932899&r1=932898&r2=932899&view=diff
==============================================================================
--- click/trunk/click/documentation/dtds/click-2.2.dtd (original)
+++ click/trunk/click/documentation/dtds/click-2.2.dtd Sun Apr 11 13:45:32 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?)>
+<!ELEMENT click-app (pages*, headers?, format?, mode?, controls?, file-upload-service?,
log-service?, template-service?, page-interceptor*)>
   <!ATTLIST click-app charset CDATA #IMPLIED>
   <!ATTLIST click-app locale CDATA #IMPLIED>
 
@@ -95,3 +95,8 @@
   <!-- 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>
+    <!ATTLIST page-interceptor scope (application|request) "request">

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=932899&r1=932898&r2=932899&view=diff
==============================================================================
--- click/trunk/click/framework/src/org/apache/click/click.dtd (original)
+++ click/trunk/click/framework/src/org/apache/click/click.dtd Sun Apr 11 13:45:32 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-listener*)>
+<!ELEMENT click-app (pages*, headers?, format?, mode?, controls?, file-upload-service?,
log-service?, template-service?, page-interceptor*)>
   <!ATTLIST click-app charset CDATA #IMPLIED>
   <!ATTLIST click-app locale CDATA #IMPLIED>
 
@@ -96,8 +96,7 @@
   <!ELEMENT template-service (property*)>
    <!ATTLIST template-service classname CDATA #FIXED "org.apache.click.service.VelocityTemplateService">
   
-  <!-- Application page listeners. -->
-  <!ELEMENT page-listener (property*)>
-    <!ATTLIST page-listener classname CDATA #REQUIRED>
-    <!ATTLIST page-listener scope (application|request) "request">
-  
\ No newline at end of file
+  <!-- Application page interceptors. -->
+  <!ELEMENT page-interceptor (property*)>
+    <!ATTLIST page-interceptor classname CDATA #REQUIRED>
+    <!ATTLIST page-interceptor scope (application|request) "request">

Modified: click/trunk/click/framework/src/org/apache/click/service/XmlConfigService.java
URL: http://svn.apache.org/viewvc/click/trunk/click/framework/src/org/apache/click/service/XmlConfigService.java?rev=932899&r1=932898&r2=932899&view=diff
==============================================================================
--- click/trunk/click/framework/src/org/apache/click/service/XmlConfigService.java (original)
+++ click/trunk/click/framework/src/org/apache/click/service/XmlConfigService.java Sun Apr
11 13:45:32 2010
@@ -743,8 +743,8 @@ public class XmlConfigService implements
         List<PageInterceptor> interceptorList =
             new ArrayList<PageInterceptor>(pageInterceptorConfigList.size());
 
-        for (PageInterceptorConfig pageListenerConfig : pageInterceptorConfigList) {
-            interceptorList.add(pageListenerConfig.getPageInterceptor());
+        for (PageInterceptorConfig pageInterceptorConfig : pageInterceptorConfigList) {
+            interceptorList.add(pageInterceptorConfig.getPageInterceptor());
         }
 
         return interceptorList;
@@ -1574,10 +1574,10 @@ public class XmlConfigService implements
                 propertyList.add(new Property(name, value));
             }
 
-            PageInterceptorConfig pageListenerConfig =
+            PageInterceptorConfig pageInterceptorConfig =
                 new PageInterceptorConfig(interceptorClass, applicationScope, propertyList);
 
-            pageInterceptorConfigList.add(pageListenerConfig);
+            pageInterceptorConfigList.add(pageInterceptorConfig);
         }
     }
 



Mime
View raw message