You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@click.apache.org by sa...@apache.org on 2009/06/06 00:23:25 UTC
svn commit: r782155 - in /incubator/click/trunk/click: build/ examples/
examples/webapp/WEB-INF/ examples/webapp/WEB-INF/lib/
examples/webapp/assets/css/ extras/src/org/apache/click/extras/control/
Author: sabob
Date: Fri Jun 5 22:23:24 2009
New Revision: 782155
URL: http://svn.apache.org/viewvc?rev=782155&view=rev
Log:
updated to spring security
Modified:
incubator/click/trunk/click/build/build.properties
incubator/click/trunk/click/examples/build.xml
incubator/click/trunk/click/examples/webapp/WEB-INF/lib/ (props changed)
incubator/click/trunk/click/examples/webapp/WEB-INF/menu.xml
incubator/click/trunk/click/examples/webapp/WEB-INF/spring-beans.xml
incubator/click/trunk/click/examples/webapp/WEB-INF/web.xml
incubator/click/trunk/click/examples/webapp/assets/css/style.css
incubator/click/trunk/click/extras/src/org/apache/click/extras/control/Menu.java
Modified: incubator/click/trunk/click/build/build.properties
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/build/build.properties?rev=782155&r1=782154&r2=782155&view=diff
==============================================================================
--- incubator/click/trunk/click/build/build.properties (original)
+++ incubator/click/trunk/click/build/build.properties Fri Jun 5 22:23:24 2009
@@ -65,5 +65,5 @@
poi.version=3.0-FINAL
quartz.version=1.6.3
slf4j.version=1.5.6
-spring-security.version=1.0.7
+spring-security.version=2.0.4
standard.version=1.1.2
\ No newline at end of file
Modified: incubator/click/trunk/click/examples/build.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/examples/build.xml?rev=782155&r1=782154&r2=782155&view=diff
==============================================================================
--- incubator/click/trunk/click/examples/build.xml (original)
+++ incubator/click/trunk/click/examples/build.xml Fri Jun 5 22:23:24 2009
@@ -26,7 +26,7 @@
<property file="../build/build.properties"/>
<property name="name" value="click-examples"/>
- <property name="jar.acegi" value="acegi-security-${spring-security.version}.jar"/>
+ <property name="jar.spring-security" value="spring-security-core-${spring-security.version}.jar"/>
<property name="jar.annotation" value="geronimo-annotation_1.0_spec-${geronimo-common-annotations.version}.jar"/>
<property name="jar.ashwood" value="ashwood-${ashwood.version}.jar"/>
<property name="jar.cayenne" value="cayenne-server-${cayenne.version}.jar"/>
@@ -150,7 +150,7 @@
<target name="get-deps" description="download JAR dependencies">
<mkdir dir="${dir.weblib}"/>
<property name="repository" value="http://repo1.maven.org"/>
- <webDownloadMacro name="${jar.acegi}" path="org/acegisecurity/acegi-security/${spring-security.version}"/>
+ <webDownloadMacro name="${jar.spring-security}" path="org/springframework/security/spring-security-core/${spring-security.version}"/>
<webDownloadMacro name="${jar.annotation}" path="org/apache/geronimo/specs/geronimo-annotation_1.0_spec/${geronimo-common-annotations.version}"/>
<webDownloadMacro name="${jar.ashwood}" path="org/objectstyle/ashwood/ashwood/${ashwood.version}"/>
<webDownloadMacro name="${jar.cayenne}" path="org/apache/cayenne/cayenne-server/${cayenne.version}"/>
Propchange: incubator/click/trunk/click/examples/webapp/WEB-INF/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jun 5 22:23:24 2009
@@ -1,39 +1,40 @@
-freemarker-2.3.12.jar
jstl-1.1.2.jar
+freemarker-2.3.12.jar
spring-context-1.2.9.jar
+quartz-all-1.6.3.jar
ashwood-1.1.jar
+ashwood-2.0.jar
commons-logging-1.1.jar
spring-web-1.2.8.jar
poi-3.0-FINAL.jar
+spring-security-core-2.0.4.jar
spring-context-2.5.4.jar
-cayenne-nodeps-1.2.3.jar
cayenne-nodeps-1.2.2.jar
+cayenne-nodeps-1.2.3.jar
+spring-2.5.6.jar
cayenne-nodeps-2.0.3.jar
-spring-core-1.2.9.jar
standard-1.1.2.jar
+spring-core-1.2.9.jar
cayenne-nodeps-1.2.jar
-spring-web-2.5.4.jar
cayenne-server-3.0M2.jar
+spring-web-2.5.4.jar
+commons-logging-1.1.1.jar
spring-beans-2.5.4.jar
spring-beans-1.2.9.jar
cayenne-server-3.0M3.jar
+geronimo-annotation_1.0_spec-1.1.1.jar
hsqldb-1.8.0.1.jar
+cayenne-server-3.0M5.jar
cayenne-nodeps-2.0.4.jar
oro-2.0.8.jar
+acegi-security-1.0.7.jar
commons-logging-1.0.4.jar
spring-context-1.2.8.jar
spring-core-1.2.8.jar
cayenne-nodeps-1.2.1.jar
-jdom-1.0.jar
log4j-1.2.13.jar
+jdom-1.0.jar
spring-beans-1.2.8.jar
spring-web-1.2.9.jar
log4j-1.2.14.jar
spring-core-2.5.4.jar
-geronimo-annotation_1.0_spec-1.1.1.jar
-spring-2.5.6.jar
-acegi-security-1.0.7.jar
-quartz-all-1.6.3.jar
-ashwood-2.0.jar
-cayenne-server-3.0M5.jar
-commons-logging-1.1.1.jar
Modified: incubator/click/trunk/click/examples/webapp/WEB-INF/menu.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/examples/webapp/WEB-INF/menu.xml?rev=782155&r1=782154&r2=782155&view=diff
==============================================================================
--- incubator/click/trunk/click/examples/webapp/WEB-INF/menu.xml (original)
+++ incubator/click/trunk/click/examples/webapp/WEB-INF/menu.xml Fri Jun 5 22:23:24 2009
@@ -135,7 +135,7 @@
</menu>
<menu label=" Integration" path="#" imageSrc="/assets/images/cayenne.png">
- <menu label="ACEGI Security" path="acegi/secure/secure.htm"/>
+ <menu label="Spring Security (Acegi)" path="springsecurity/secure/secure.htm"/>
<menu separator="true"/>
<menu label="Apache Cayenne Form" path="cayenne/cayenne-form-page.htm"/>
<menu label="Cayenne Tabbed Form" path="cayenne/tabbed-cayenne-form-page.htm"/>
Modified: incubator/click/trunk/click/examples/webapp/WEB-INF/spring-beans.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/examples/webapp/WEB-INF/spring-beans.xml?rev=782155&r1=782154&r2=782155&view=diff
==============================================================================
--- incubator/click/trunk/click/examples/webapp/WEB-INF/spring-beans.xml (original)
+++ incubator/click/trunk/click/examples/webapp/WEB-INF/spring-beans.xml Fri Jun 5 22:23:24 2009
@@ -18,99 +18,53 @@
under the License.
-->
-<beans xmlns="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">
-
- <context:component-scan base-package="org.apache.click.examples" scope-resolver="org.apache.click.extras.spring.PageScopeResolver"/>
-
- <!-- ACEGI Security Beans -->
-
- <bean id="filterChainProxy" class="org.acegisecurity.util.FilterChainProxy">
- <property name="filterInvocationDefinitionSource">
- <value><![CDATA[
- CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
- PATTERN_TYPE_APACHE_ANT
- /**=httpSessionContextIntegrationFilter,logoutFilter,authenticationProcessingFilter,securityContextHolderAwareRequestFilter,exceptionTranslationFilter,filterInvocationInterceptor
- ]]></value>
- </property>
- </bean>
-
- <bean id="httpSessionContextIntegrationFilter" class="org.acegisecurity.context.HttpSessionContextIntegrationFilter" />
-
- <bean id="logoutFilter" class="org.acegisecurity.ui.logout.LogoutFilter">
- <constructor-arg value="/acegi/login.htm?logout=true" />
- <constructor-arg>
- <list>
- <bean class="org.acegisecurity.ui.logout.SecurityContextLogoutHandler" />
- </list>
- </constructor-arg>
- <property name="filterProcessesUrl" value="/j_acegi_logout" />
- </bean>
-
- <bean id="authenticationProcessingFilter" class="org.acegisecurity.ui.webapp.AuthenticationProcessingFilter">
- <property name="authenticationManager" ref="authenticationManager" />
- <property name="authenticationFailureUrl" value="/acegi/login.htm?auth-error=true" />
- <property name="defaultTargetUrl" value="/" />
- <property name="filterProcessesUrl" value="/j_acegi_security_check" />
- </bean>
-
- <bean id="securityContextHolderAwareRequestFilter" class="org.acegisecurity.wrapper.SecurityContextHolderAwareRequestFilter" />
-
- <bean id="exceptionTranslationFilter" class="org.acegisecurity.ui.ExceptionTranslationFilter">
- <property name="authenticationEntryPoint">
- <bean class="org.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint">
- <property name="loginFormUrl" value="/acegi/login.htm" />
- <property name="forceHttps" value="false" />
- </bean>
- </property>
- <property name="accessDeniedHandler">
- <bean class="org.acegisecurity.ui.AccessDeniedHandlerImpl">
- <property name="errorPage" value="/acegi/not-authorised.htm" />
- </bean>
- </property>
- </bean>
-
- <bean id="filterInvocationInterceptor" class="org.acegisecurity.intercept.web.FilterSecurityInterceptor">
- <property name="authenticationManager" ref="authenticationManager" />
- <property name="accessDecisionManager">
- <bean class="org.acegisecurity.vote.AffirmativeBased">
- <property name="allowIfAllAbstainDecisions" value="false" />
- <property name="decisionVoters">
- <list>
- <bean class="org.acegisecurity.vote.RoleVoter" />
- <bean class="org.acegisecurity.vote.AuthenticatedVoter" />
- </list>
- </property>
- </bean>
- </property>
- <property name="objectDefinitionSource">
- <value><![CDATA[
- CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
- PATTERN_TYPE_APACHE_ANT
- /acegi/secure/**=IS_AUTHENTICATED_REMEMBERED
- ]]></value>
- </property>
- </bean>
-
- <bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">
- <property name="providers">
- <list>
- <ref local="daoAuthenticationProvider" />
- </list>
- </property>
- </bean>
-
- <bean id="userDetailsService" class="org.apache.click.examples.acegi.UserDetailsService"/>
-
- <bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider">
- <property name="userDetailsService" ref="userDetailsService" />
- </bean>
+<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>
- <!-- This bean is optional; it isn't used by any other bean as it only listens and logs -->
- <bean id="loggerListener" class="org.acegisecurity.event.authentication.LoggerListener" />
-</beans>
\ No newline at end of file
+ <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'>
+ </authentication-provider>
+
+ <!-- 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>
Modified: incubator/click/trunk/click/examples/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/examples/webapp/WEB-INF/web.xml?rev=782155&r1=782154&r2=782155&view=diff
==============================================================================
--- incubator/click/trunk/click/examples/webapp/WEB-INF/web.xml (original)
+++ incubator/click/trunk/click/examples/webapp/WEB-INF/web.xml Fri Jun 5 22:23:24 2009
@@ -1,165 +1,161 @@
-<?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>
-
- <!--
- Spring configuration location.
- -->
- <context-param>
- <param-name>contextConfigLocation</param-name>
- <param-value>WEB-INF/spring-beans.xml</param-value>
- </context-param>
-
- <!-- Filters -->
-
- <!--
- 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.
- The "excludes-path" init parameter tells the filter which requests should
- be ignored by the filter.
- -->
- <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>
- <init-param>
- <param-name>exclude-paths</param-name>
- <param-value>*/excel-export.htm</param-value>
- </init-param>
- </filter>
-
- <!--
- Provides a ACEGI Security filter.
- -->
- <filter>
- <filter-name>FilterToBeanProxy</filter-name>
- <filter-class>org.acegisecurity.util.FilterToBeanProxy</filter-class>
- <init-param>
- <param-name>targetClass</param-name>
- <param-value>org.acegisecurity.util.FilterChainProxy</param-value>
- </init-param>
- </filter>
-
- <filter-mapping>
- <filter-name>FilterToBeanProxy</filter-name>
- <url-pattern>/acegi/*</url-pattern>
- </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>
-
- <!-- Listeners -->
-
- <!--
- The Quartz initialization listenger which loads the Quartz scheduler.
- -->
- <listener>
- <listener-class>org.quartz.ee.servlet.QuartzInitializerListener</listener-class>
- </listener>
-
- <!--
- The Spring Context Loader which initializes the Spring runtime.
- -->
- <listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
-
- <!--
- Provides an in memory databae initialization listener. In a production
- application a separate database would be used, and this listener would not
- be needed.
- -->
- <listener>
- <listener-class>org.apache.click.examples.util.DatabaseInitListener</listener-class>
- </listener>
-
- <!-- Servlets -->
-
- <!--
- The Spring Click Servlet which handles *.htm requests.
- -->
- <servlet>
- <servlet-name>ClickServlet</servlet-name>
- <servlet-class>org.apache.click.extras.spring.SpringClickServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>ClickServlet</servlet-name>
- <url-pattern>*.htm</url-pattern>
- </servlet-mapping>
-
- <!-- Wecome Files -->
-
- <welcome-file-list>
- <welcome-file>redirect.html</welcome-file>
- </welcome-file-list>
-
-</web-app>
+<?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>
+
+ <!--
+ Spring configuration location.
+ -->
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>WEB-INF/spring-beans.xml</param-value>
+ </context-param>
+
+ <!-- Filters -->
+
+ <!--
+ 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.
+ The "excludes-path" init parameter tells the filter which requests should
+ be ignored by the filter.
+ -->
+ <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>
+ <init-param>
+ <param-name>exclude-paths</param-name>
+ <param-value>*/excel-export.htm</param-value>
+ </init-param>
+ </filter>
+
+ <!--
+ Provides a Spring Security (Acegi) filter.
+ -->
+ <filter>
+ <filter-name>springSecurityFilterChain</filter-name>
+ <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>DataContextFilter</filter-name>
+ <servlet-name>ClickServlet</servlet-name>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>springSecurityFilterChain</filter-name>
+ <url-pattern>/*</url-pattern>
+ </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>
+
+ <!-- Listeners -->
+
+ <!--
+ The Quartz initialization listenger which loads the Quartz scheduler.
+ -->
+ <listener>
+ <listener-class>org.quartz.ee.servlet.QuartzInitializerListener</listener-class>
+ </listener>
+
+ <!--
+ The Spring Context Loader which initializes the Spring runtime.
+ -->
+ <listener>
+ <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+ </listener>
+
+ <!--
+ Provides an in memory databae initialization listener. In a production
+ application a separate database would be used, and this listener would not
+ be needed.
+ -->
+ <listener>
+ <listener-class>org.apache.click.examples.util.DatabaseInitListener</listener-class>
+ </listener>
+
+ <!-- Servlets -->
+
+ <!--
+ The Spring Click Servlet which handles *.htm requests.
+ -->
+ <servlet>
+ <servlet-name>ClickServlet</servlet-name>
+ <servlet-class>org.apache.click.extras.spring.SpringClickServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ClickServlet</servlet-name>
+ <url-pattern>*.htm</url-pattern>
+ </servlet-mapping>
+
+ <!-- Wecome Files -->
+
+ <welcome-file-list>
+ <welcome-file>redirect.html</welcome-file>
+ </welcome-file-list>
+
+</web-app>
Modified: incubator/click/trunk/click/examples/webapp/assets/css/style.css
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/examples/webapp/assets/css/style.css?rev=782155&r1=782154&r2=782155&view=diff
==============================================================================
--- incubator/click/trunk/click/examples/webapp/assets/css/style.css (original)
+++ incubator/click/trunk/click/examples/webapp/assets/css/style.css Fri Jun 5 22:23:24 2009
@@ -238,7 +238,7 @@
}
/*
- * ACEGI example style.
+ * Spring Security (Acegi) example style.
*/
div.dialogForm {
background-color: #f0f0f0;
Modified: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/Menu.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/org/apache/click/extras/control/Menu.java?rev=782155&r1=782154&r2=782155&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/org/apache/click/extras/control/Menu.java (original)
+++ incubator/click/trunk/click/extras/src/org/apache/click/extras/control/Menu.java Fri Jun 5 22:23:24 2009
@@ -159,7 +159,7 @@
* by the {@link RoleAccessController} which uses the JEE container is user in
* role facility. By providing your own AccessController you can have menu
* access control using other security frameworks such as JSecurity or Spring
- * ACEGI.
+ * Security (Acegi).
*
* <h3>Menu Configuration DTD</h3>
*