click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sa...@apache.org
Subject svn commit: r1096503 - in /click/trunk/click: build/ documentation/docs/developer-guide/ documentation/docs/velocity/ documentation/xdocs/src/docbook/click/ examples/webapp/WEB-INF/ lib/ template/
Date Mon, 25 Apr 2011 15:50:06 GMT
Author: sabob
Date: Mon Apr 25 15:50:05 2011
New Revision: 1096503

URL: http://svn.apache.org/viewvc?rev=1096503&view=rev
Log:
upgrade to Servlet 2.4. CLK-763

Modified:
    click/trunk/click/build/build.properties
    click/trunk/click/build/build.xml
    click/trunk/click/build/click-mock.pom
    click/trunk/click/build/click-nodeps.pom
    click/trunk/click/build/click.pom
    click/trunk/click/documentation/docs/developer-guide/building.html
    click/trunk/click/documentation/docs/velocity/velocity.html
    click/trunk/click/documentation/xdocs/src/docbook/click/chapter-best-practices.xml
    click/trunk/click/documentation/xdocs/src/docbook/click/chapter-configuration.xml
    click/trunk/click/documentation/xdocs/src/docbook/click/chapter-introduction.xml
    click/trunk/click/documentation/xdocs/src/docbook/click/chapter-pages.xml
    click/trunk/click/examples/webapp/WEB-INF/click.xml
    click/trunk/click/lib/   (props changed)
    click/trunk/click/template/build.xml

Modified: click/trunk/click/build/build.properties
URL: http://svn.apache.org/viewvc/click/trunk/click/build/build.properties?rev=1096503&r1=1096502&r2=1096503&view=diff
==============================================================================
--- click/trunk/click/build/build.properties (original)
+++ click/trunk/click/build/build.properties Mon Apr 25 15:50:05 2011
@@ -52,7 +52,7 @@ hibernate.version=3.2.6.ga
 junit.version=3.8.1
 log4j.version=1.2.16
 ognl.version=2.6.9
-servlet-api.version=2.3
+servlet-api.version=2.4
 spring.version=2.5.6
 velocity.version=1.7
 

Modified: click/trunk/click/build/build.xml
URL: http://svn.apache.org/viewvc/click/trunk/click/build/build.xml?rev=1096503&r1=1096502&r2=1096503&view=diff
==============================================================================
--- click/trunk/click/build/build.xml (original)
+++ click/trunk/click/build/build.xml Mon Apr 25 15:50:05 2011
@@ -958,7 +958,7 @@ Please ensure you have configured build.
       	file="lib/${jar.log4j}"/>
       <copy 
       	todir="../${project-name}/lib"
-      	file="lib/servlet-api-2.3.jar"/>
+      	file="lib/servlet-api-2.4.jar"/>
       <copy 
       	todir="../${project-name}" 
       	file="template/build.xml"/>

Modified: click/trunk/click/build/click-mock.pom
URL: http://svn.apache.org/viewvc/click/trunk/click/build/click-mock.pom?rev=1096503&r1=1096502&r2=1096503&view=diff
==============================================================================
--- click/trunk/click/build/click-mock.pom (original)
+++ click/trunk/click/build/click-mock.pom Mon Apr 25 15:50:05 2011
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
 

Modified: click/trunk/click/build/click-nodeps.pom
URL: http://svn.apache.org/viewvc/click/trunk/click/build/click-nodeps.pom?rev=1096503&r1=1096502&r2=1096503&view=diff
==============================================================================
--- click/trunk/click/build/click-nodeps.pom (original)
+++ click/trunk/click/build/click-nodeps.pom Mon Apr 25 15:50:05 2011
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: click/trunk/click/build/click.pom
URL: http://svn.apache.org/viewvc/click/trunk/click/build/click.pom?rev=1096503&r1=1096502&r2=1096503&view=diff
==============================================================================
--- click/trunk/click/build/click.pom (original)
+++ click/trunk/click/build/click.pom Mon Apr 25 15:50:05 2011
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: click/trunk/click/documentation/docs/developer-guide/building.html
URL: http://svn.apache.org/viewvc/click/trunk/click/documentation/docs/developer-guide/building.html?rev=1096503&r1=1096502&r2=1096503&view=diff
==============================================================================
--- click/trunk/click/documentation/docs/developer-guide/building.html (original)
+++ click/trunk/click/documentation/docs/developer-guide/building.html Mon Apr 25 15:50:05
2011
@@ -218,8 +218,8 @@ The Click framework has the following ru
 </tr>
 <tr>
   <td>Servlet API</td>
-  <td>2.3</td>
-  <td>servlet-2.3.jar</td>  
+  <td>2.4</td>
+  <td>servlet-2.4.jar</td>  
   <td><a target="_blank" href="http://java.sun.com/products/servlet/">Sun Microsystems</a></td>
   <td>JEE Servlet API</td>
 </tr>

Modified: click/trunk/click/documentation/docs/velocity/velocity.html
URL: http://svn.apache.org/viewvc/click/trunk/click/documentation/docs/velocity/velocity.html?rev=1096503&r1=1096502&r2=1096503&view=diff
==============================================================================
--- click/trunk/click/documentation/docs/velocity/velocity.html (original)
+++ click/trunk/click/documentation/docs/velocity/velocity.html Mon Apr 25 15:50:05 2011
@@ -83,16 +83,16 @@ following objects to page templates:
     of the page template to render.
   </li>
   <li><span class="st">request</span> &nbsp; - &nbsp; 
-    the pages <a class="external" target="_blank" href="http://java.sun.com/products/servlet/2.3/javadoc/javax/servlet/http/HttpServletRequest.html">HttpServletRequest</a>
+    the pages <a class="external" target="_blank" href="http://tomcat.apache.org/tomcat-5.5-doc/servletapi/javax/servlet/http/HttpServletRequest.html">HttpServletRequest</a>
     object.
   </li>
   <li><span class="st">response</span> &nbsp; - &nbsp; 
-    the pages <a class="external" target="_blank" href="http://java.sun.com/products/servlet/2.3/javadoc/javax/servlet/http/HttpServletResponse.html">HttpServletResponse</a>
+    the pages <a class="external" target="_blank" href="http://tomcat.apache.org/tomcat-5.5-doc/servletapi/javax/servlet/http/HttpServletResponse.html">HttpServletResponse</a>
     object.
   </li>
   <li><span class="st">session</span> &nbsp; - &nbsp; 
    the <a target="topic" href="../click-api/org/apache/click/util/SessionMap.html">SessionMap</a>
adaptor
-   for the users <a class="external" target="_blank" href="http://java.sun.com/products/servlet/2.3/javadoc/javax/servlet/http/HttpSession.html">HttpSession</a>.
+   for the users <a class="external" target="_blank" href="http://tomcat.apache.org/tomcat-5.5-doc/servletapi/javax/servlet/http/HttpSession.html">HttpSession</a>.
   </li>
 </ul>
 

Modified: click/trunk/click/documentation/xdocs/src/docbook/click/chapter-best-practices.xml
URL: http://svn.apache.org/viewvc/click/trunk/click/documentation/xdocs/src/docbook/click/chapter-best-practices.xml?rev=1096503&r1=1096502&r2=1096503&view=diff
==============================================================================
--- click/trunk/click/documentation/xdocs/src/docbook/click/chapter-best-practices.xml (original)
+++ click/trunk/click/documentation/xdocs/src/docbook/click/chapter-best-practices.xml Mon
Apr 25 15:50:05 2011
@@ -760,7 +760,7 @@
 
     <para>Generally applications handle transactional errors using service layer code
     or via a servlet
-    <ulink url="http://java.sun.com/products/servlet/2.3/javadoc/javax/servlet/Filter.html">Filter</ulink>
+    <ulink url="http://tomcat.apache.org/tomcat-5.5-doc/servletapi/javax/servlet/Filter.html">Filter</ulink>
     and would not need to include error handling logic in an error page.
     </para>
 

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=1096503&r1=1096502&r2=1096503&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
Apr 25 15:50:05 2011
@@ -362,7 +362,7 @@
       <para>When the Click application starts up it will check all the page
       definitions. If there is a critical configuration error the ClickSerlvet
       will log an <literal>ERROR</literal> message and throw an
-      <ulink url="http://java.sun.com/products/servlet/2.3/javadoc/javax/servlet/UnavailableException.html">UnavailableException</ulink>.
+      <ulink url="http://tomcat.apache.org/tomcat-5.5-doc/servletapi/javax/servlet/UnavailableException.html">UnavailableException</ulink>.
       If this occurs the click application will be permanently unavailable until
       the error is fixed and the web app is restarted.
       </para>
@@ -725,7 +725,7 @@ change-password.htm  =&gt;  <token>Chang
 
       <para>The <symbol>header</symbol> element defines header name and
value
       pairs which are applied to the
-      <ulink url="http://java.sun.com/products/servlet/2.3/javadoc/javax/servlet/http/HttpServletResponse.html">HttpServletResponse</ulink>.
+      <ulink url="http://tomcat.apache.org/tomcat-5.5-doc/servletapi/javax/servlet/http/HttpServletResponse.html">HttpServletResponse</ulink>.
       </para>
 
       <literallayout>&lt;!ELEMENT <symbol>header</symbol> (#PCDATA)&gt;

Modified: click/trunk/click/documentation/xdocs/src/docbook/click/chapter-introduction.xml
URL: http://svn.apache.org/viewvc/click/trunk/click/documentation/xdocs/src/docbook/click/chapter-introduction.xml?rev=1096503&r1=1096502&r2=1096503&view=diff
==============================================================================
--- click/trunk/click/documentation/xdocs/src/docbook/click/chapter-introduction.xml (original)
+++ click/trunk/click/documentation/xdocs/src/docbook/click/chapter-introduction.xml Mon Apr
25 15:50:05 2011
@@ -535,7 +535,7 @@ public HelloWorld extends Page {
         <para>Table is a <ulink url="../../click-api/org/apache/click/Stateful.html">Stateful</ulink>
         control and provides methods for saving and restoring it's state.
         Here we save the Table state in the
-        <ulink url="http://java.sun.com/products/servlet/2.3/javadoc/javax/servlet/http/HttpSession.html">HttpSession</ulink>
+        <ulink url="http://tomcat.apache.org/tomcat-5.5-doc/servletapi/javax/servlet/http/HttpSession.html">HttpSession</ulink>
         which ensures sort and paging state is preserved while editing customers.
         </para>
       </callout>

Modified: click/trunk/click/documentation/xdocs/src/docbook/click/chapter-pages.xml
URL: http://svn.apache.org/viewvc/click/trunk/click/documentation/xdocs/src/docbook/click/chapter-pages.xml?rev=1096503&r1=1096502&r2=1096503&view=diff
==============================================================================
--- click/trunk/click/documentation/xdocs/src/docbook/click/chapter-pages.xml (original)
+++ click/trunk/click/documentation/xdocs/src/docbook/click/chapter-pages.xml Mon Apr 25 15:50:05
2011
@@ -239,13 +239,13 @@
       </listitem>
       <listitem>
         <para>request &nbsp;-&nbsp; the pages
-        <ulink url="http://java.sun.com/products/servlet/2.3/javadoc/javax/servlet/http/HttpServletRequest.html">HttpServletRequest</ulink>
+        <ulink url="http://tomcat.apache.org/tomcat-5.5-doc/servletapi/javax/servlet/http/HttpServletRequest.html">HttpServletRequest</ulink>
         object
         </para>
       </listitem>
       <listitem>
         <para>response &nbsp;-&nbsp; the pages
-        <ulink url="http://java.sun.com/products/servlet/2.3/javadoc/javax/servlet/http/HttpServletResponse.html">HttpServletResponse</ulink>
+        <ulink url="http://tomcat.apache.org/tomcat-5.5-doc/servletapi/javax/servlet/http/HttpServletResponse.html">HttpServletResponse</ulink>
         object
         </para>
       </listitem>
@@ -253,7 +253,7 @@
         <para>session &nbsp;-&nbsp; the
         <ulink url="../../click-api/org/apache/click/util/SessionMap.html">SessionMap</ulink>
         adaptor for the users
-        <ulink url="http://java.sun.com/products/servlet/2.3/javadoc/javax/servlet/http/HttpSession.html">HttpSession</ulink>
+        <ulink url="http://tomcat.apache.org/tomcat-5.5-doc/servletapi/javax/servlet/http/HttpSession.html">HttpSession</ulink>
         </para>
       </listitem>
     </itemizedlist>
@@ -494,7 +494,7 @@ public class CustomerDetails extends Pag
      */
     public boolean onSecurityCheck() {
 
-        if (getContext().getRequest().<ulink url="http://java.sun.com/products/servlet/2.3/javadoc/javax/servlet/http/HttpServletRequest.html#getRemoteUser()"><varname>getRemoteUser</varname></ulink>()
!= null) {
+        if (getContext().getRequest().<ulink url="http://tomcat.apache.org/tomcat-5.5-doc/servletapi/javax/servlet/http/HttpServletRequest.html#getRemoteUser()"><varname>getRemoteUser</varname></ulink>()
!= null) {
             return true;
 
         } else {
@@ -523,7 +523,7 @@ public class CustomerDetails extends Pag
      */
     public boolean onSecurityCheck() {
 
-        if (getContext().getRequest().<ulink url="http://java.sun.com/products/servlet/2.3/javadoc/javax/servlet/http/HttpServletRequest.html#isUserInRole(java.lang.String)"><varname>isUserInRole</varname></ulink>("admin"))
{
+        if (getContext().getRequest().<ulink url="http://tomcat.apache.org/tomcat-5.5-doc/servletapi/javax/servlet/http/HttpServletRequest.html#isUserInRole(java.lang.String)"><varname>isUserInRole</varname></ulink>("admin"))
{
             return true;
 
         } else {
@@ -548,7 +548,7 @@ public class CustomerDetails extends Pag
      * @see Page#onInit()
      */
     public void onInit() {
-        getContext().getSession().<ulink url="http://java.sun.com/products/servlet/2.3/javadoc/javax/servlet/http/HttpSession.html#invalidate()"><varname>invalidate</varname></ulink>();
+        getContext().getSession().<ulink url="http://tomcat.apache.org/tomcat-5.5-doc/servletapi/javax/servlet/http/HttpSession.html#invalidate()"><varname>invalidate</varname></ulink>();
     }
 }</programlisting>
 
@@ -566,7 +566,7 @@ public class CustomerDetails extends Pag
       <title>Forward</title>
 
       <para> To forward to another page using the servlet
-      <ulink url="http://java.sun.com/products/servlet/2.3/javadoc/javax/servlet/RequestDispatcher.html">RequestDispatcher</ulink>,
+      <ulink url="http://tomcat.apache.org/tomcat-5.5-doc/servletapi/javax/servlet/RequestDispatcher.html">RequestDispatcher</ulink>,
       set the Page's forward property. For example to forward to a page with a
       path <varname>index.htm</varname>:
       </para>
@@ -729,7 +729,7 @@ public void onPost() {
 
       <para>Redirects are another very useful way to navigate between pages.
       See HttpServletResponse.
-      <ulink url="http://java.sun.com/products/servlet/2.3/javadoc/javax/servlet/http/HttpServletResponse.html#sendRedirect(java.lang.String)">sendRedirect</ulink>
+      <ulink url="http://tomcat.apache.org/tomcat-5.5-doc/servletapi/javax/servlet/http/HttpServletResponse.html#sendRedirect(java.lang.String)">sendRedirect</ulink>
       (location) for details.
       </para>
 
@@ -786,7 +786,7 @@ public void onPost() {
 
         <para>You can pass information between redirected pages using URL
         request parameters. The ClickServlet will encode the URL for you using
-        HttpServletResponse.<ulink url="http://java.sun.com/products/servlet/2.3/javadoc/javax/servlet/http/HttpServletResponse.html#encodeRedirectURL(java.lang.String)">encodeRedirectURL</ulink>
+        HttpServletResponse.<ulink url="http://tomcat.apache.org/tomcat-5.5-doc/servletapi/javax/servlet/http/HttpServletResponse.html#encodeRedirectURL(java.lang.String)">encodeRedirectURL</ulink>
         (url).
         </para>
 
@@ -1330,7 +1330,7 @@ public class SearchPage extends Page imp
 }</programlisting>
 
     <para>Stateful page instances are stored in the user's
-    <ulink url="http://java.sun.com/products/servlet/2.3/javadoc/javax/servlet/http/HttpSession.html">HttpSession</ulink>
+    <ulink url="http://tomcat.apache.org/tomcat-5.5-doc/servletapi/javax/servlet/http/HttpSession.html">HttpSession</ulink>
     using the pages class name as the key. In the example above the page would
     be stored in the users session using the class name:
     <classname>com.mycorp.page.SearchPage</classname>

Modified: click/trunk/click/examples/webapp/WEB-INF/click.xml
URL: http://svn.apache.org/viewvc/click/trunk/click/examples/webapp/WEB-INF/click.xml?rev=1096503&r1=1096502&r2=1096503&view=diff
==============================================================================
--- click/trunk/click/examples/webapp/WEB-INF/click.xml (original)
+++ click/trunk/click/examples/webapp/WEB-INF/click.xml Mon Apr 25 15:50:05 2011
@@ -22,7 +22,7 @@
 
   <pages package="org.apache.click.examples.page" autobinding="annotation"/>
 
-  <mode value="profile"/>
+  <mode value="trace"/>
 
   <page-interceptor classname="org.apache.click.examples.interceptor.ProfilingInterceptor"/>
 

Propchange: click/trunk/click/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Apr 25 15:50:05 2011
@@ -1,18 +1,19 @@
-ognl-*.jar
-freemarker-*.jar
-velocity-*.jar
-hibernate-*.jar
-cayenne-*.jar
-checkstyle-all-*.jar
-spring-*.jar
-commons-io-*.jar
-log4j-*.jar
-concurrent-1.3.4.jar
-commons-codec-1.3.jar
-servlet-api-2.3.jar
 junit-3.8.1.jar
+checkstyle-all-*.jar
 commons-lang-2.1.jar
+cayenne-*.jar
+ognl-*.jar
 commons-collections-3.1.jar
+log4j-*.jar
 slf4j-api-1.5.6.jar
+spring-*.jar
+servlet-api-2.4.jar
+concurrent-1.3.4.jar
 commons-*.jar
 commons-fileupload-1.1.jar
+commons-codec-1.3.jar
+commons-io-*.jar
+servlet-api-2.3.jar
+hibernate-*.jar
+freemarker-*.jar
+velocity-*.jar

Modified: click/trunk/click/template/build.xml
URL: http://svn.apache.org/viewvc/click/trunk/click/template/build.xml?rev=1096503&r1=1096502&r2=1096503&view=diff
==============================================================================
--- click/trunk/click/template/build.xml (original)
+++ click/trunk/click/template/build.xml Mon Apr 25 15:50:05 2011
@@ -12,7 +12,7 @@
     -->
    
    <path id="classpath">
-   	  <pathelement location="lib/servlet-api-2.3.jar"/>
+   	  <pathelement location="lib/servlet-api-2.4.jar"/>
       <fileset dir="WebContent/WEB-INF/lib">
          <include name="*.jar"/>
       </fileset>



Mime
View raw message