You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@click.apache.org by ta...@apache.org on 2009/02/24 18:04:48 UTC
svn commit: r747436 - in
/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse: ./
click-1.5/ click-2.0.1/ click-2.0.1/lib/
src/org/apache/click/eclipse/core/facet/
Author: takezoe
Date: Tue Feb 24 17:04:39 2009
New Revision: 747436
URL: http://svn.apache.org/viewvc?rev=747436&view=rev
Log:
[CLKE-28]Replace to Click 2.0.1
Added:
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/click.dtd
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/click.xml
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/lib/
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/lib/click-2.0.1-incubating.jar (with props)
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/lib/click-extras-2.0.1-incubating.jar (with props)
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/lib/click-mock-2.0.1-incubating.jar (with props)
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/web-2.0.1.xml
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/web.xml
Removed:
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-1.5/
Modified:
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/build.properties
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetUtil.java
Modified: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/build.properties
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/build.properties?rev=747436&r1=747435&r2=747436&view=diff
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/build.properties (original)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/build.properties Tue Feb 24 17:04:39 2009
@@ -10,8 +10,8 @@
documentation/,\
lib/,\
cayenne-2.0.4/,\
- click-1.5/,\
spring-2.5.4/,\
- schema/
+ schema/,\
+ click-2.0.1/
src.includes = src/
Added: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/click.dtd
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/click.dtd?rev=747436&view=auto
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/click.dtd (added)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/click.dtd Tue Feb 24 17:04:39 2009
@@ -0,0 +1,87 @@
+<?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.
+-->
+
+<!-- The Click Application (click.xml) Document Type Definition. -->
+<!ELEMENT click-app (pages*, headers?, format?, mode?, controls?, file-upload-service?, log-service?, template-service?)>
+ <!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 (true|false) "true">
+
+ <!-- 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">
+
Added: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/click.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/click.xml?rev=747436&view=auto
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/click.xml (added)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/click.xml Tue Feb 24 17:04:39 2009
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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.
+-->
+
+<click-app charset="UTF-8">
+
+ <!--
+ <pages package="net.sf.click.examples.page">
+ <excludes pattern="/tiny_mce/"/>
+ </pages>
+ -->
+
+ <mode value="development"/>
+
+</click-app>
Added: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/lib/click-2.0.1-incubating.jar
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/lib/click-2.0.1-incubating.jar?rev=747436&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/lib/click-2.0.1-incubating.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/lib/click-extras-2.0.1-incubating.jar
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/lib/click-extras-2.0.1-incubating.jar?rev=747436&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/lib/click-extras-2.0.1-incubating.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/lib/click-mock-2.0.1-incubating.jar
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/lib/click-mock-2.0.1-incubating.jar?rev=747436&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/lib/click-mock-2.0.1-incubating.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/web-2.0.1.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/web-2.0.1.xml?rev=747436&view=auto
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/web-2.0.1.xml (added)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/web-2.0.1.xml Tue Feb 24 17:04:39 2009
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <display-name>Click Examples</display-name>
+
+ <!--
+ Provides an in memory databae initialization filter. In a production
+ application a separate database would be used, and this filter would not
+ be needed.
+ -->
+ <filter>
+ <filter-name>DatabaseInitFilter</filter-name>
+ <filter-class>org.apache.click.examples.util.DatabaseInitFilter</filter-class>
+ </filter>
+
+ <!--
+ Provides a thread local Cayenne DataContext filter.
+ -->
+ <filter>
+ <filter-name>DataContextFilter</filter-name>
+ <filter-class>org.apache.click.extras.cayenne.DataContextFilter</filter-class>
+ <init-param>
+ <param-name>session-scope</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ </filter>
+
+ <!--
+ Provides a web application performance filter which compresses the response
+ and sets the Expires header on selected static resources.
+ The "cachable-paths" init parameter tells the filter resources can have
+ their Expires header set so the browser will cache them.
+ -->
+ <filter>
+ <filter-name>PerformanceFilter</filter-name>
+ <filter-class>org.apache.click.extras.filter.PerformanceFilter</filter-class>
+ <init-param>
+ <param-name>cachable-paths</param-name>
+ <param-value>/assets/*</param-value>
+ </init-param>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>DatabaseInitFilter</filter-name>
+ <servlet-name>ClickServlet</servlet-name>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>DataContextFilter</filter-name>
+ <servlet-name>ClickServlet</servlet-name>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>PerformanceFilter</filter-name>
+ <servlet-name>ClickServlet</servlet-name>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>PerformanceFilter</filter-name>
+ <url-pattern>*.css</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>PerformanceFilter</filter-name>
+ <url-pattern>*.js</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>PerformanceFilter</filter-name>
+ <url-pattern>*.gif</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>PerformanceFilter</filter-name>
+ <url-pattern>*.png</url-pattern>
+ </filter-mapping>
+
+ <!--
+ The Spring Click Servlet which handles *.htm requests. The "spring-path"
+ init parameter tells the servlet where to find the Spring application
+ context file on the classpath.
+ -->
+ <servlet>
+ <servlet-name>ClickServlet</servlet-name>
+ <servlet-class>org.apache.click.extras.spring.SpringClickServlet</servlet-class>
+ <init-param>
+ <param-name>spring-path</param-name>
+ <param-value>/applicationContext.xml</param-value>
+ </init-param>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ClickServlet</servlet-name>
+ <url-pattern>*.htm</url-pattern>
+ </servlet-mapping>
+
+ <welcome-file-list>
+ <welcome-file>redirect.html</welcome-file>
+ </welcome-file-list>
+
+</web-app>
Added: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/web.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/web.xml?rev=747436&view=auto
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/web.xml (added)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/web.xml Tue Feb 24 17:04:39 2009
@@ -0,0 +1,76 @@
+<?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.
+-->
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ id="WebApp_ID" version="2.5">
+ #if($useCayenne)
+ <!--
+ Provides a thread local Cayenne DataContext filter.
+ -->
+ <filter>
+ <filter-name>DataContextFilter</filter-name>
+ <filter-class>org.apache.click.extras.cayenne.DataContextFilter</filter-class>
+ <init-param>
+ <param-name>session-scope</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>DataContextFilter</filter-name>
+ <servlet-name>ClickServlet</servlet-name>
+ </filter-mapping>
+ #end
+
+ #if($useSpring)
+ <!--
+ The Spring Click Servlet which handles *.htm requests. The "spring-path"
+ init parameter tells the servlet where to find the Spring application
+ context file on the classpath.
+ -->
+ <servlet>
+ <servlet-name>ClickServlet</servlet-name>
+ <servlet-class>org.apache.click.extras.spring.SpringClickServlet</servlet-class>
+ <init-param>
+ <param-name>spring-path</param-name>
+ <param-value>/applicationContext.xml</param-value>
+ </init-param>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ #else
+ <servlet>
+ <servlet-name>ClickServlet</servlet-name>
+ <servlet-class>org.apache.click.ClickServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ #end
+
+ <servlet-mapping>
+ <servlet-name>ClickServlet</servlet-name>
+ <url-pattern>*.htm</url-pattern>
+ </servlet-mapping>
+
+ <welcome-file-list>
+ <welcome-file>redirect.html</welcome-file>
+ </welcome-file-list>
+
+</web-app>
\ No newline at end of file
Modified: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetUtil.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetUtil.java?rev=747436&r1=747435&r2=747436&view=diff
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetUtil.java (original)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetUtil.java Tue Feb 24 17:04:39 2009
@@ -32,13 +32,13 @@
*/
public class ClickFacetUtil {
- public static String CLICK_DIR = "click-1.5";
+ public static String CLICK_DIR = "click-2.0.1";
public static String CAYENNE_DIR = "cayenne-2.0.4";
public static String SPRING_DIR = "spring-2.5.4";
public static final String[] COPY_FILES = {
- "/lib/click-1.5.jar",
- "/lib/click-extras-1.5.jar",
+ "/lib/click-2.0.1-incubating.jar",
+ "/lib/click-extras-2.0.1-incubating.jar",
"/click.xml",
};