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/07/20 17:07:14 UTC
svn commit: r795868 - in
/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse: ./
cayenne-3.0M6/ click-2.0.1/ click-2.1.0/ click-2.1.0/lib/ spring-2.5.4/
spring-2.5.6/ spring-2.5.6/lib/ src/org/apache/click/eclipse/
src/org/apache/click/eclips...
Author: takezoe
Date: Mon Jul 20 15:07:13 2009
New Revision: 795868
URL: http://svn.apache.org/viewvc?rev=795868&view=rev
Log:
Update framework versions:
* Click 2.0.1 to 2.1.0
* Spring 2.5.4 to 2.5.6
Added:
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/cayenne-3.0M6/
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/click.dtd (with props)
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/click.xml (with props)
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/lib/
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/lib/click-2.1.0-RC1-incubating.jar (with props)
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/lib/click-extras-2.1.0-RC1-incubating.jar (with props)
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/lib/click-mock-2.1.0-RC1-incubating.jar (with props)
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/jstl-1.1.2.jar (with props)
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/spring-2.5.6.jar (with props)
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/spring-security-core-2.0.4.jar (with props)
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/standard-1.1.2.jar (with props)
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/spring-beans.xml (with props)
Removed:
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.0.1/
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.4/
Modified:
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/ (props changed)
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/ClickPlugin.properties
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin_ja.properties
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetInstallDataModelProvider.java
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetInstallDelegate.java
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetUtil.java
incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/wizard/ClickFacetWizardPage.java
Propchange: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jul 20 15:07:13 2009
@@ -1,2 +1,4 @@
-docs bin
-bin
+docs bin
+
+bin
+
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=795868&r1=795867&r2=795868&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 Mon Jul 20 15:07:13 2009
@@ -9,9 +9,9 @@
plugin.properties,\
documentation/,\
lib/,\
- cayenne-2.0.4/,\
- spring-2.5.4/,\
schema/,\
- click-2.0.1/
+ click-2.1.0/,\
+ spring-2.5.6/,\
+ cayenne-2.0.4/
src.includes = src/
Added: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/click.dtd
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/click.dtd?rev=795868&view=auto
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/click.dtd (added)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/click.dtd Mon Jul 20 15:07:13 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 (annotation|public|none) "annotation">
+
+ <!-- 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">
+
Propchange: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/click.dtd
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/click.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/click.xml?rev=795868&view=auto
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/click.xml (added)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/click.xml Mon Jul 20 15:07:13 2009
@@ -0,0 +1,27 @@
+<?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="org.apache.click.examples.page" autobinding="annotation"/>
+
+ <mode value="profile"/>
+
+</click-app>
Propchange: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/click.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/lib/click-2.1.0-RC1-incubating.jar
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/lib/click-2.1.0-RC1-incubating.jar?rev=795868&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/lib/click-2.1.0-RC1-incubating.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/lib/click-extras-2.1.0-RC1-incubating.jar
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/lib/click-extras-2.1.0-RC1-incubating.jar?rev=795868&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/lib/click-extras-2.1.0-RC1-incubating.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/lib/click-mock-2.1.0-RC1-incubating.jar
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/lib/click-mock-2.1.0-RC1-incubating.jar?rev=795868&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/lib/click-mock-2.1.0-RC1-incubating.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/jstl-1.1.2.jar
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/jstl-1.1.2.jar?rev=795868&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/jstl-1.1.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/spring-2.5.6.jar
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/spring-2.5.6.jar?rev=795868&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/spring-2.5.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/spring-security-core-2.0.4.jar
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/spring-security-core-2.0.4.jar?rev=795868&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/spring-security-core-2.0.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/standard-1.1.2.jar
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/standard-1.1.2.jar?rev=795868&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/standard-1.1.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/spring-beans.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/spring-beans.xml?rev=795868&view=auto
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/spring-beans.xml (added)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/spring-beans.xml Mon Jul 20 15:07:13 2009
@@ -0,0 +1,69 @@
+<?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.
+-->
+
+<beans:beans xmlns="http://www.springframework.org/schema/security"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
+ http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.4.xsd">
+
+ <context:component-scan base-package="org.apache.click.examples" scope-resolver="org.apache.click.extras.spring.PageScopeResolver"/>
+
+ <!-- Spring Security Setup -->
+
+ <http auto-config="true">
+ <!-- Uncomment the line below if you need login.htm to be accessed through HTTPS,
+ and ensure that HTTPS is enabled on the server. -->
+ <!--<intercept-url pattern="/springsecurity/login.htm" requires-channel="https" />-->
+
+ <!-- Access to pages under the /springsecurity/secure folder requires to be authenticated -->
+ <intercept-url pattern='/springsecurity/secure/**' access='IS_AUTHENTICATED_REMEMBERED'/>
+
+ <!-- Specify the login page url, failure url and default landing page url. -->
+ <form-login login-page='/springsecurity/login.htm' authentication-failure-url="/springsecurity/login.htm?auth-error=1" default-target-url="/"/>
+
+ <!-- Specify a virtual "logout" url which forwards to the logout.htm page. -->
+ <logout logout-url="/springsecurity/logout" logout-success-url="/springsecurity/logout.htm"/>
+ </http>
+
+ <beans:bean id="authenticationManager" class="org.springframework.security.providers.ProviderManager">
+ <beans:property name="providers">
+ <beans:list>
+ <beans:ref local="daoAuthenticationProvider" />
+ </beans:list>
+ </beans:property>
+ </beans:bean>
+
+
+ <beans:bean id="daoAuthenticationProvider" class="org.springframework.security.providers.dao.DaoAuthenticationProvider">
+ <beans:property name="userDetailsService" ref="userDetailsService"/>
+ </beans:bean>
+
+ <!-- Specify a simple property based authentication provider. For production
+ systems switch to LDAP or JDBC based providers. -->
+
+ <authentication-provider user-service-ref='userDetailsService'/>
+
+ <!-- This bean is optional; it isn't used by any other bean as it only listens and logs -->
+ <beans:bean id="loggerListener" class="org.springframework.security.event.authentication.LoggerListener" />
+
+</beans:beans>
Propchange: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/spring-beans.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin.properties
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin.properties?rev=795868&r1=795867&r2=795868&view=diff
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin.properties (original)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin.properties Mon Jul 20 15:07:13 2009
@@ -95,6 +95,7 @@
wizard.facet.description=Select additinal features for the Click project.
wizard.facet.useSpring=Use Spring Framework
wizard.facet.useCayenne=Use Apache Cayenne
+wizard.facet.usePerformanceFilter=Use PerformanceFilter
# for preference pages
preferences.template=Wizard Template
Modified: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin_ja.properties
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin_ja.properties?rev=795868&r1=795867&r2=795868&view=diff
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin_ja.properties (original)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin_ja.properties Mon Jul 20 15:07:13 2009
@@ -95,6 +95,7 @@
wizard.facet.description=Click\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u8ffd\u52a0\u3059\u308b\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
wizard.facet.useSpring=Spring Framework\u3092\u4f7f\u7528\u3059\u308b
wizard.facet.useCayenne=Apache Cayenne\u3092\u4f7f\u7528\u3059\u308b
+wizard.facet.usePerformanceFilter=PerformanceFilter\u3092\u4f7f\u7528\u3059\u308b
# for preference pages
preferences.template=\u30a6\u30a3\u30b6\u30fc\u30c9\u30fb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
Modified: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetInstallDataModelProvider.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetInstallDataModelProvider.java?rev=795868&r1=795867&r2=795868&view=diff
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetInstallDataModelProvider.java (original)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetInstallDataModelProvider.java Mon Jul 20 15:07:13 2009
@@ -30,11 +30,13 @@
public static final String USE_SPRING = "useSpring";
public static final String USE_CAYENNE = "useCayenne";
+ public static final String USE_PERFORMANCE_FILTER = "usePerformanceFilter";
public Set getPropertyNames() {
Set names = super.getPropertyNames();
names.add(USE_SPRING);
names.add(USE_CAYENNE);
+ names.add(USE_PERFORMANCE_FILTER);
return names;
}
@@ -45,6 +47,8 @@
return new Boolean(false);
} else if(propertyName.equals(USE_CAYENNE)){
return new Boolean(false);
+ } else if(propertyName.equals(USE_PERFORMANCE_FILTER)){
+ return new Boolean(false);
}
return super.getDefaultProperty(propertyName);
}
Modified: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetInstallDelegate.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetInstallDelegate.java?rev=795868&r1=795867&r2=795868&view=diff
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetInstallDelegate.java (original)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetInstallDelegate.java Mon Jul 20 15:07:13 2009
@@ -93,7 +93,8 @@
// Update web model
createServletAndModifyWebXML(project, config, monitor,
config.getBooleanProperty(ClickFacetInstallDataModelProvider.USE_SPRING),
- config.getBooleanProperty(ClickFacetInstallDataModelProvider.USE_CAYENNE));
+ config.getBooleanProperty(ClickFacetInstallDataModelProvider.USE_CAYENNE),
+ config.getBooleanProperty(ClickFacetInstallDataModelProvider.USE_PERFORMANCE_FILTER));
if (monitor != null) {
monitor.worked(1);
@@ -271,8 +272,9 @@
return true;
}
- private void createServletAndModifyWebXML(IProject project, final IDataModel config,
- IProgressMonitor monitor, boolean useSpring, boolean useCayenne) {
+ private void createServletAndModifyWebXML(
+ IProject project, final IDataModel config,IProgressMonitor monitor,
+ boolean useSpring, boolean useCayenne, boolean usePerformanceFilter) {
WebApp webApp = null;
WebArtifactEdit artifactEdit = null;
@@ -288,7 +290,12 @@
}
servlet = ClickUtils.createOrUpdateServletRef(webApp, config, servlet, useSpring);
-
+
+ // create performance filter
+ if(usePerformanceFilter){
+ // TODO Not implemented.
+ }
+
// init mappings
String[] listOfMappings = {"*.htm"};
ClickUtils.setUpURLMappings(webApp, listOfMappings, servlet);
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=795868&r1=795867&r2=795868&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 Mon Jul 20 15:07:13 2009
@@ -32,13 +32,13 @@
*/
public class ClickFacetUtil {
- public static String CLICK_DIR = "click-2.0.1";
+ public static String CLICK_DIR = "click-2.1.0";
public static String CAYENNE_DIR = "cayenne-2.0.4";
- public static String SPRING_DIR = "spring-2.5.4";
+ public static String SPRING_DIR = "spring-2.5.6";
public static final String[] COPY_FILES = {
- "/lib/click-2.0.1-incubating.jar",
- "/lib/click-extras-2.0.1-incubating.jar",
+ "/lib/click-2.1.0-RC1-incubating.jar",
+ "/lib/click-extras-2.1.0-RC1-incubating.jar",
"/click.xml",
};
@@ -52,10 +52,8 @@
public static final String[] SPRING_LIBS = {
"/lib/jstl-1.1.2.jar",
- "/lib/spring-beans-2.5.4.jar",
- "/lib/spring-context-2.5.4.jar",
- "/lib/spring-core-2.5.4.jar",
- "/lib/spring-web-2.5.4.jar",
+ "/lib/spring-2.5.6.jar",
+ "/lib/spring-security-core-2.0.4.jar",
"/lib/standard-1.1.2.jar",
};
Modified: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/wizard/ClickFacetWizardPage.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/wizard/ClickFacetWizardPage.java?rev=795868&r1=795867&r2=795868&view=diff
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/wizard/ClickFacetWizardPage.java (original)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/wizard/ClickFacetWizardPage.java Mon Jul 20 15:07:13 2009
@@ -37,6 +37,7 @@
private IDataModel model;
private Button useSpring;
private Button useCayenne;
+ private Button usePerformanceFilter;
public ClickFacetWizardPage() {
super("ClickFacetWizardPage");
@@ -51,6 +52,10 @@
public void createControl(Composite parent) {
Composite composite = new Composite(parent, SWT.NULL);
composite.setLayout(new GridLayout());
+
+ usePerformanceFilter = new Button(composite, SWT.CHECK);
+ usePerformanceFilter.setText(ClickPlugin.getString("wizard.facet.usePerformanceFilter"));
+
useSpring = new Button(composite, SWT.CHECK);
useSpring.setText(ClickPlugin.getString("wizard.facet.useSpring"));
@@ -61,6 +66,8 @@
}
public void transferStateToConfig() {
+ model.setBooleanProperty(ClickFacetInstallDataModelProvider.USE_PERFORMANCE_FILTER,
+ usePerformanceFilter.getSelection());
model.setBooleanProperty(ClickFacetInstallDataModelProvider.USE_SPRING,
useSpring.getSelection());
model.setBooleanProperty(ClickFacetInstallDataModelProvider.USE_CAYENNE,