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 2010/05/31 03:35:42 UTC
svn commit: r949642 - in
/click/trunk/tools/eclipse/org.apache.click.eclipse: ./ META-INF/
cayenne-3.0/ cayenne-3.0/lib/ cayenne-3.0M6/ click-2.1.0/ click-2.2.0/
click-2.2.0/lib/ src/org/apache/click/eclipse/core/facet/
Author: takezoe
Date: Mon May 31 01:35:42 2010
New Revision: 949642
URL: http://svn.apache.org/viewvc?rev=949642&view=rev
Log:
Click and Cayenne are upgraded.
Added:
click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0/
click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0/cayenne.xml (with props)
click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0/lib/
click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0/lib/ashwood-2.0.jar (with props)
click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0/lib/cayenne-server-3.0.jar (with props)
click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0/lib/commons-logging-1.1.1.jar (with props)
click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/
click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/click.dtd (with props)
click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/click.xml (with props)
click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/lib/
click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/lib/click-2.2.0.jar (with props)
click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/lib/click-extras-2.2.0.jar (with props)
click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/lib/click-mock-2.2.0.jar (with props)
Removed:
click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0M6/
click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/
Modified:
click/trunk/tools/eclipse/org.apache.click.eclipse/META-INF/MANIFEST.MF
click/trunk/tools/eclipse/org.apache.click.eclipse/build.properties
click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetUtil.java
Modified: click/trunk/tools/eclipse/org.apache.click.eclipse/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/click/trunk/tools/eclipse/org.apache.click.eclipse/META-INF/MANIFEST.MF?rev=949642&r1=949641&r2=949642&view=diff
==============================================================================
--- click/trunk/tools/eclipse/org.apache.click.eclipse/META-INF/MANIFEST.MF (original)
+++ click/trunk/tools/eclipse/org.apache.click.eclipse/META-INF/MANIFEST.MF Mon May 31 01:35:42 2010
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.apache.click.eclipse;singleton:=true
-Bundle-Version: 2.1.0.0
+Bundle-Version: 2.2.0.0
Bundle-Activator: org.apache.click.eclipse.ClickPlugin
Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
Modified: click/trunk/tools/eclipse/org.apache.click.eclipse/build.properties
URL: http://svn.apache.org/viewvc/click/trunk/tools/eclipse/org.apache.click.eclipse/build.properties?rev=949642&r1=949641&r2=949642&view=diff
==============================================================================
--- click/trunk/tools/eclipse/org.apache.click.eclipse/build.properties (original)
+++ click/trunk/tools/eclipse/org.apache.click.eclipse/build.properties Mon May 31 01:35:42 2010
@@ -27,8 +27,8 @@ bin.includes = META-INF/,\
documentation/,\
lib/,\
schema/,\
- click-2.1.0/,\
spring-2.5.6/,\
- cayenne-3.0M6/
+ cayenne-3.0/,\
+ click-2.2.0/
src.includes = src/
Added: click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0/cayenne.xml
URL: http://svn.apache.org/viewvc/click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0/cayenne.xml?rev=949642&view=auto
==============================================================================
--- click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0/cayenne.xml (added)
+++ click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0/cayenne.xml Mon May 31 01:35:42 2010
@@ -0,0 +1,21 @@
+<?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.
+-->
+<domains project-version="3.0">
+</domains>
Propchange: click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0/cayenne.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0/lib/ashwood-2.0.jar
URL: http://svn.apache.org/viewvc/click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0/lib/ashwood-2.0.jar?rev=949642&view=auto
==============================================================================
Binary file - no diff available.
Propchange: click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0/lib/ashwood-2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0/lib/cayenne-server-3.0.jar
URL: http://svn.apache.org/viewvc/click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0/lib/cayenne-server-3.0.jar?rev=949642&view=auto
==============================================================================
Binary file - no diff available.
Propchange: click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0/lib/cayenne-server-3.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0/lib/commons-logging-1.1.1.jar
URL: http://svn.apache.org/viewvc/click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0/lib/commons-logging-1.1.1.jar?rev=949642&view=auto
==============================================================================
Binary file - no diff available.
Propchange: click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0/lib/commons-logging-1.1.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/click.dtd
URL: http://svn.apache.org/viewvc/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/click.dtd?rev=949642&view=auto
==============================================================================
--- click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/click.dtd (added)
+++ click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/click.dtd Mon May 31 01:35:42 2010
@@ -0,0 +1,102 @@
+<?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.2.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*)>
+ <!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">
+
+ <!-- Application page interceptors. -->
+ <!ELEMENT page-interceptor (property*)>
+ <!ATTLIST page-interceptor classname CDATA #REQUIRED>
+ <!ATTLIST page-interceptor scope (application|request) "request">
Propchange: click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/click.dtd
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/click.xml
URL: http://svn.apache.org/viewvc/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/click.xml?rev=949642&view=auto
==============================================================================
--- click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/click.xml (added)
+++ click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/click.xml Mon May 31 01:35:42 2010
@@ -0,0 +1,32 @@
+<?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.
+-->
+<!DOCTYPE click-app PUBLIC
+ "-//Apache Software Foundation//DTD Click Configuration 2.1//EN"
+ "http://click.apache.org/dtds/click-2.2.dtd">
+
+<click-app charset="UTF-8">
+
+ <pages package="${rootPackage}" autobinding="annotation"/>
+
+ <mode value="profile"/>
+
+ <page-interceptor classname="org.apache.click.examples.interceptor.ProfilingInterceptor"/>
+
+</click-app>
Propchange: click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/click.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/lib/click-2.2.0.jar
URL: http://svn.apache.org/viewvc/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/lib/click-2.2.0.jar?rev=949642&view=auto
==============================================================================
Binary file - no diff available.
Propchange: click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/lib/click-2.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/lib/click-extras-2.2.0.jar
URL: http://svn.apache.org/viewvc/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/lib/click-extras-2.2.0.jar?rev=949642&view=auto
==============================================================================
Binary file - no diff available.
Propchange: click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/lib/click-extras-2.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/lib/click-mock-2.2.0.jar
URL: http://svn.apache.org/viewvc/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/lib/click-mock-2.2.0.jar?rev=949642&view=auto
==============================================================================
Binary file - no diff available.
Propchange: click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.2.0/lib/click-mock-2.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetUtil.java
URL: http://svn.apache.org/viewvc/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetUtil.java?rev=949642&r1=949641&r2=949642&view=diff
==============================================================================
--- click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetUtil.java (original)
+++ click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetUtil.java Mon May 31 01:35:42 2010
@@ -32,19 +32,19 @@ import org.eclipse.core.runtime.Path;
*/
public class ClickFacetUtil {
- public static String CLICK_DIR = "click-2.1.0";
- public static String CAYENNE_DIR = "cayenne-3.0M6";
+ public static String CLICK_DIR = "click-2.2.0";
+ public static String CAYENNE_DIR = "cayenne-3.0";
public static String SPRING_DIR = "spring-2.5.6";
public static final String[] COPY_FILES = {
- "/lib/click-2.1.0.jar",
- "/lib/click-extras-2.1.0.jar",
+ "/lib/click-2.2.0.jar",
+ "/lib/click-extras-2.2.0.jar",
"/click.xml",
};
public static final String[] CAYENNE_LIBS = {
"/lib/ashwood-2.0.jar",
- "/lib/cayenne-server-3.0M6.jar",
+ "/lib/cayenne-server-3.0.jar",
"/lib/commons-logging-1.1.1.jar",
};