[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Geronimo v1.1 (GMOxDOC11) http://cwiki.apache.org/confluence/display/GMOxDOC11 | |-Pages Added or Edited in This Space |-- openejb-jar.xml was last edited by [EMAIL PROTECTED] (11:10 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC11/openejb-jar.xml |-- JBoss to Geronimo - EJB-Session Beans Migration was last edited by [EMAIL PROTECTED] (10:00 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC11/JBoss+to+Geronimo+-+EJB-Session+Beans+Migration Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-Pages Added or Edited in This Space |-- Home was last edited by husted (04:48 PM). | http://cwiki.apache.org/confluence/display/WW/Home |-- CreateIfNull Annotation was last edited by mrdon (04:20 PM). | http://cwiki.apache.org/confluence/display/WW/CreateIfNull+Annotation |-- Element Annotation was last edited by mrdon (04:20 PM). | http://cwiki.apache.org/confluence/display/WW/Element+Annotation |-- Key Annotation was last edited by mrdon (04:19 PM). | http://cwiki.apache.org/confluence/display/WW/Key+Annotation |-- TypeConversion Annotation was last edited by mrdon (04:18 PM). | http://cwiki.apache.org/confluence/display/WW/TypeConversion+Annotation |-- KeyProperty Annotation was last edited by mrdon (04:17 PM). | http://cwiki.apache.org/confluence/display/WW/KeyProperty+Annotation |-- Conversion Annotation was last edited by mrdon (04:13 PM). | http://cwiki.apache.org/confluence/display/WW/Conversion+Annotation |-- CustomValidator Annotation was last edited by mrdon (04:12 PM). | http://cwiki.apache.org/confluence/display/WW/CustomValidator+Annotation |-- VisitorFieldValidator Annotation was last edited by mrdon (04:11 PM). | http://cwiki.apache.org/confluence/display/WW/VisitorFieldValidator+Annotation |-- Validations Annotation was last edited by mrdon (02:21 PM). | http://cwiki.apache.org/confluence/display/WW/Validations+Annotation |-- Validation Annotation was last edited by mrdon (02:20 PM). | http://cwiki.apache.org/confluence/display/WW/Validation+Annotation |-- UrlValidator Annotation was last edited by mrdon (02:19 PM). | http://cwiki.apache.org/confluence/display/WW/UrlValidator+Annotation |-- StringRegexValidator Annotation was last edited by mrdon (02:18 PM). | http://cwiki.apache.org/confluence/display/WW/StringRegexValidator+Annotation |-- StringLengthFieldValidator Annotation was last edited by mrdon (02:17 PM). | http://cwiki.apache.org/confluence/display/WW/StringLengthFieldValidator+Annotation |-- RequiredStringValidator Annotation was last edited by mrdon (02:17 PM). | http://cwiki.apache.org/confluence/display/WW/RequiredStringValidator+Annotation |-- RequiredFieldValidator Annotation was last edited by mrdon (02:16 PM). | http://cwiki.apache.org/confluence/display/WW/RequiredFieldValidator+Annotation |-- RegexFieldValidator Annotation was last edited by mrdon (02:15 PM). | http://cwiki.apache.org/confluence/display/WW/RegexFieldValidator+Annotation |-- IntRangeFieldValidator Annotation was last edited by mrdon (02:14 PM). | http://cwiki.apache.org/confluence/display/WW/IntRangeFieldValidator+Annotation |-- FieldExpressionValidator Annotation was last edited by mrdon (02:13 PM). | http://cwiki.apache.org/confluence/display/WW/FieldExpressionValidator+Annotation |-- EmailValidator Annotation was last edited by mrdon (02:12 PM). | http://cwiki.apache.org/confluence/display/WW/EmailValidator+Annotation |-- DoubleRangeFieldValidator Annotation was last edited by mrdon (02:12 PM). | http://cwiki.apache.org/confluence/display/WW/DoubleRangeFieldValidator+Annotation |-- DateRangeFieldValidator Annotation was last edited by mrdon (02:12 PM). | http://cwiki.apache.org/confluence/display/WW/DateRangeFieldValidator+Annotation |-- ConversionErrorFieldValidator Annotation was last edited by mrdon (02:11 PM). | http://cwiki.apache.org/confluence/display/WW/ConversionErrorFieldValidator+Annotation |-- ExpressionValidator Annotation was last edited by mrdon (02:11 PM). | http://cwiki.apache.org/confluence/display/WW/ExpressionValidator+Annotation |-- BeforeResult Annotation was last edited by mrdon (02:04 PM). | http://cwiki.apache.org/confluence/display/WW/BeforeResult+Annotation |-- Before Annotation was last edited by mrdon (02:03 PM). | http://cwiki.apache.org/confluence/display/WW/Before+Annotation |-- Annotations was last edited by mrdon (02:02 PM). | http://cwiki.apache.org/confluence/display/WW/Annotations |-- After Annotation was last edited by mrdon (01:57 PM). | http://cwiki.apache.org/confluence/display/WW/After+Annotation
svn commit: r475154 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher: AbstractFilter.java ActionContextCleanUp.java FilterDispatcher.java
Author: tmjee
Date: Wed Nov 15 00:06:56 2006
New Revision: 475154
URL: http://svn.apache.org/viewvc?view=rev&rev=475154
Log:
WW-1489
- Refactor ActionContextCleanUp and DispatcherFilter to have common logics in
an abstract super class
- moving this back in as discussed in Struts2 maling list.
- This basically allows, (during sitemesh integration) that sitemesh
decorators have access to struts internals and request gets wrapped and
properly encoded before it reaches sitemesh.
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/AbstractFilter.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/AbstractFilter.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/AbstractFilter.java?view=auto&rev=475154
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/AbstractFilter.java
(added)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/AbstractFilter.java
Wed Nov 15 00:06:56 2006
@@ -0,0 +1,226 @@
+/*
+ * $Id: ActionContextCleanUp.java 454720 2006-10-10 12:31:52Z tmjee $
+ *
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+package org.apache.struts2.dispatcher;
+
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * An abstract for superclass for Struts2 filter, encapsulating common logics
and
+ * helper methods usefull to subclass, to avoid duplication.
+ *
+ * Common logics encapsulated:-
+ *
+ *
+ * Dispatcher instance creation through
createDispatcher method that acts
+ * as a hook subclass could override. By default it creates an
instance of Dispatcher.
+ *
+ *
+ * postInit(FilterConfig) is a hook subclass may use to add
post initialization
+ * logics in [EMAIL PROTECTED]
javax.servlet.Filter#init(FilterConfig)}. It is called before
+ * [EMAIL PROTECTED] javax.servlet.Filter#init(FilterConfig)} method ends.
+ *
+ *
+ * A default [EMAIL PROTECTED]
javax.servlet.Filter#destroy()} that clean up Dispatcher by
+ * calling dispatcher.cleanup()
+ *
+ *
+ * prepareDispatcherAndWrapRequest(HttpServletRequest,
HttpServletResponse) helper method
+ * that basically called dispatcher.prepare(), wrap the
HttpServletRequest and return the
+ * wrapped version.
+ *
+ *
+ * Various other common helper methods like
+ *
+ * getFilterConfig
+ * getServletContext
+ *
+ *
+ *
+ *
+ *
+ * @see Dispatcher
+ * @see FilterDispatcher
+ * @see ActionContextCleanUp
+ *
+ * @version $Date$ $Id$
+ */
+public abstract class AbstractFilter implements Filter {
+
+ private static final Log LOG = LogFactory.getLog(AbstractFilter.class);
+
+ /**
+ * Internal copy of dispatcher, created when Filter instance gets
initialized.
+ * This is needed when ActionContextCleanUp filter is used (Sitemesh
integration),
+ * such that a [EMAIL PROTECTED] Dispatcher} instance could be prepared
and request wrapped before
+ * Sitemesh is given a chance to handle the request. This results in
Sitemesh
+ * have access to internals of Struts2. With the following filter
configuration
+ *
+ * ActionContextCleanUp
+ * Sitemesh filter
+ * FilterDispatcher
+ *
+ * Both [EMAIL PROTECTED] ActionContextCleanUp} and [EMAIL PROTECTED]
FilterDispatcher} will have a
+ * copy of a [EMAIL PROTECTED] Dispatcher}, however only one will be
copied to
+ * [EMAIL PROTECTED] Dispatcher} ThreadLocal.
+ *
+ * @see [EMAIL PROTECTED]
#prepareDispatcherAndWrapRequest(HttpServletRequest, HttpServletResponse)}
+ */
+ private Dispatcher
svn commit: r475158 - /struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
Author: tmjee Date: Wed Nov 15 00:31:40 2006 New Revision: 475158 URL: http://svn.apache.org/viewvc?view=rev&rev=475158 Log: - added 'struts2-spring-plugin' dependency as spring related code are now in a plugin, else we will not be able to build struts2-archetype-starter Modified: struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml Modified: struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml?view=diff&rev=475158&r1=475157&r2=475158 == --- struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml (original) +++ struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml Wed Nov 15 00:31:40 2006 @@ -30,6 +30,11 @@ struts2-sitemesh-plugin 2.0.2-SNAPSHOT + +org.apache.struts +struts2-spring-plugin +2.0.2-SNAPSHOT +
svn commit: r475165 - in /struts/struts2/trunk/core/src/main: java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java resources/org/apache/struts2/default.properties
Author: tmjee Date: Wed Nov 15 01:00:41 2006 New Revision: 475165 URL: http://svn.apache.org/viewvc?view=rev&rev=475165 Log: WW-1490 (Have a composite ActionMapper that decides which ActionMapper it contains should be used) - removed previously added back comments cause since DI was introduced, the way composite mappers are into CompositeActionMapper have changed, instead it is injected - alter the javadoc in CompositeActionMapper accordingly to reflect this as well. The docs (conflunce) need changes as well. Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java?view=diff&rev=475165&r1=475164&r2=475165 == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java Wed Nov 15 01:00:41 2006 @@ -66,12 +66,10 @@ * [EMAIL PROTECTED] CompositeActionMapper#getUriFromActionMapping(ActionMapping)} methods. * * - * For example with the following in struts.properties :- + * For example with the following in struts-*.xml :- * - * struts.mapper.class=org.apache.struts2.dispatcher.mapper.CompositeActionMapper - * struts.mapper.composite.1=org.apache.struts2.dispatcher.mapper.DefaultActionMapper - * struts.mapper.composite.2=foo.bar.MyActionMapper - * struts.mapper.composite.3=foo.bar.MyAnotherActionMapper + ** * * CompositeActionMapper will be configured with 3 ActionMapper, namely Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties?view=diff&rev=475165&r1=475164&r2=475165 == --- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties (original) +++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties Wed Nov 15 01:00:41 2006 @@ -49,15 +49,6 @@ ### How request URLs are mapped to and from actions #struts.mapper.class=org.apache.struts2.dispatcher.mapper.DefaultActionMapper -### The above line is to be commented and following are to be uncommented to -### enable CompositeActionMapper -### - With CompositeActionMapper one could specified many ActionMapper instance, where -### each of them will be chosen according to the order. Lower order number has -### higher precedence -#struts.mapper.class=org.apache.struts2.dispatcher.mapper.CompositeActionMapper -#struts.mapper.composite.1=org.apache.struts2.dispatcher.mapper.DefaultActionMapper -#struts.mapper.composite.2=foo.bar.MyActionMapper -#struts.mapper.composite.3=foo.bar.MyAnotherActionMapper ### Used by the DefaultActionMapper ### You may provide a comma separated list, e.g. struts.action.extension=action,jnlp,do
svn commit: r475167 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java
Author: tmjee Date: Wed Nov 15 01:06:11 2006 New Revision: 475167 URL: http://svn.apache.org/viewvc?view=rev&rev=475167 Log: WW-1490 (Have a composite ActionMapper that decides which ActionMapper it contains should be used) updated javadoc (missed out some part in last commit) that doc the new way to "inject" composite mappers in to this CompositeActionMapper Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java?view=diff&rev=475167&r1=475166&r2=475167 == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java Wed Nov 15 01:06:11 2006 @@ -49,10 +49,10 @@ * For example, with the following entries in struts.properties * * - * struts.mapper.class=org.apache.struts2.dispatcher.mapper.CompositeActionMapper - * struts.mapper.composite.1=org.apache.struts2.dispatcher.mapper.DefaultActionMapper - * struts.mapper.composite.2=org.apache.struts2.dispatcher.mapper.RestfulActionMapper - * struts.mapper.composite.3=org.apache.struts2.dispatcher.mapper.Restful2ActionMapper + *+ * * * * When [EMAIL PROTECTED] CompositeActionMapper#getMapping(HttpServletRequest, ConfigurationManager)} or @@ -68,6 +68,8 @@ * * For example with the following in struts-*.xml :- * + * * *
svn commit: r475283 - /struts/struts2/trunk/plugins/sitemesh/src/main/resources/struts-plugin.xml
Author: tmjee Date: Wed Nov 15 08:05:10 2006 New Revision: 475283 URL: http://svn.apache.org/viewvc?view=rev&rev=475283 Log: WW-1506 - Sitemesh plugin's struts-plugin.xml uses incorrect filter for both freemarker and velocity Modified: struts/struts2/trunk/plugins/sitemesh/src/main/resources/struts-plugin.xml Modified: struts/struts2/trunk/plugins/sitemesh/src/main/resources/struts-plugin.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitemesh/src/main/resources/struts-plugin.xml?view=diff&rev=475283&r1=475282&r2=475283 == --- struts/struts2/trunk/plugins/sitemesh/src/main/resources/struts-plugin.xml (original) +++ struts/struts2/trunk/plugins/sitemesh/src/main/resources/struts-plugin.xml Wed Nov 15 08:05:10 2006 @@ -5,6 +5,6 @@ "http://struts.apache.org/dtds/struts-2.0.dtd";> - - + +
svn commit: r475284 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/config/ main/java/org/apache/struts2/dispatcher/ test/java/org/apache/struts2/ test/java/org/apache/struts2/interc
Author: tmjee
Date: Wed Nov 15 08:05:33 2006
New Revision: 475284
URL: http://svn.apache.org/viewvc?view=rev&rev=475284
Log:
WW-1506
- Sitemesh plugin's struts-plugin.xml uses incorrect filter for both
freemarker and velocity
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java?view=diff&rev=475284&r1=475283&r2=475284
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
Wed Nov 15 08:05:33 2006
@@ -20,6 +20,7 @@
*/
package org.apache.struts2.config;
+import java.util.List;
import java.util.Properties;
import org.apache.commons.logging.Log;
@@ -148,7 +149,7 @@
return false;
}
-public void register(ContainerBuilder builder, Properties props) {
+public void register(ContainerBuilder builder, Properties props,
List> ignoreFailureStaticInjection) {
alias(ObjectFactory.class, StrutsConstants.STRUTS_OBJECTFACTORY,
builder, props);
alias(XWorkConverter.class, StrutsConstants.STRUTS_XWORKCONVERTER,
builder, props);
alias(ActionProxyFactory.class,
StrutsConstants.STRUTS_ACTIONPROXYFACTORY, builder, props);
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java?view=diff&rev=475284&r1=475283&r2=475284
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
Wed Nov 15 08:05:33 2006
@@ -25,6 +25,7 @@
import java.net.URL;
import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -373,7 +374,7 @@
}
}
-public void register(ContainerBuilder builder, Properties props) throws
ConfigurationException {
+public void register(ContainerBuilder builder, Properties props,
List> ignoreFailureStaticInjection) throws ConfigurationException {
// Nothing
}
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java?view=diff&rev=475284&r1=475283&r2=475284
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
Wed Nov 15 08:05:33 2006
@@ -24,6 +24,7 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import java.util.Locale;
import java.util.Properties;
import java.util.StringTokenizer;
@@ -60,7 +61,7 @@
return false;
}
-public void register(ContainerBuilder builder, Properties props)
+public void register(ContainerBuilder builder, Properties props,
List> ignoreFailureStaticInjection)
throws ConfigurationException {
final Settings settings = Settings.getInstance();
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java?view=diff&rev=475284&r1=475283&r2=475284
==
---
struts/struts2/trunk/core/src/main/java/org/apache/strut
svn commit: r475322 - /struts/site/src/site/xdoc/mail.xml
Author: martinc Date: Wed Nov 15 09:45:24 2006 New Revision: 475322 URL: http://svn.apache.org/viewvc?view=rev&rev=475322 Log: Add a nominal subject and body to all mailto links. The ASF mail system has taken to categorizing messages without these as spam, so people were having trouble subscribing and unsubscribing. Modified: struts/site/src/site/xdoc/mail.xml Modified: struts/site/src/site/xdoc/mail.xml URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/mail.xml?view=diff&rev=475322&r1=475321&r2=475322 == --- struts/site/src/site/xdoc/mail.xml (original) +++ struts/site/src/site/xdoc/mail.xml Wed Nov 15 09:45:24 2006 @@ -356,12 +356,12 @@ read-only list. [ -mailto:[EMAIL PROTECTED]"> +mailto:[EMAIL PROTECTED]&body=subscribe"> Subscribe ] [ -mailto:[EMAIL PROTECTED]"> +mailto:[EMAIL PROTECTED]&body=unsubscribe"> Unsubscribe ] @@ -376,12 +376,12 @@ Struts features. [ -mailto:[EMAIL PROTECTED]"> +mailto:[EMAIL PROTECTED]&body=subscribe"> Subscribe ] [ -mailto:[EMAIL PROTECTED]"> +mailto:[EMAIL PROTECTED]&body=unsubscribe"> Unsubscribe ] @@ -391,12 +391,12 @@ a daily digest of the Struts USER list. [ -mailto:[EMAIL PROTECTED]"> +mailto:[EMAIL PROTECTED]&body=subscribe"> Subscribe ] [ -mailto:[EMAIL PROTECTED]"> +mailto:[EMAIL PROTECTED]&body=unsubscribe"> Unsubscribe ] @@ -434,12 +434,12 @@ itself. [ -mailto:[EMAIL PROTECTED]"> +mailto:[EMAIL PROTECTED]&body=subscribe"> Subscribe ] [ -mailto:[EMAIL PROTECTED]"> +mailto:[EMAIL PROTECTED]&body=unsubscribe"> Unsubscribe ] @@ -451,12 +451,12 @@ source code repository. [ -mailto:[EMAIL PROTECTED]"> +mailto:[EMAIL PROTECTED]&body=subscribe"> Subscribe ] [ -mailto:[EMAIL PROTECTED]"> +mailto:[EMAIL PROTECTED]&body=unsubscribe"> Unsubscribe ] @@ -467,12 +467,12 @@ tracker. [ -mailto:[EMAIL PROTECTED]"> +mailto:[EMAIL PROTECTED]&body=subscribe"> Subscribe ] [ -mailto:[EMAIL PROTECTED]"> +mailto:[EMAIL PROTECTED]&body=unsubscribe"> Unsubscribe ]
svn commit: r475363 - in /struts/struts2/trunk: apps/showcase/src/main/webapp/ajax/ apps/showcase/src/main/webapp/ajax/datepicker/ apps/showcase/src/main/webapp/ajax/dropdowndatepicker/ apps/showcase/
Author: hermanns
Date: Wed Nov 15 11:02:53 2006
New Revision: 475363
URL: http://svn.apache.org/viewvc?view=rev&rev=475363
Log:
upgrade struts2 dojo widget due to upgrading dojo to 0.4
o applying latest patch set
Issue Number: WW-1484
Submitted by: Musachy Barroso
Added:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example10.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example9.jsp
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowndatepicker/index.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowntimepicker/index.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/footer.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/index.jsp
struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp?view=diff&rev=475363&r1=475362&r2=475363
==
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp
Wed Nov 15 11:02:53 2006
@@ -57,5 +57,6 @@
nl-nl locale
+
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowndatepicker/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowndatepicker/index.jsp?view=diff&rev=475363&r1=475362&r2=475363
==
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowndatepicker/index.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowndatepicker/index.jsp
Wed Nov 15 11:02:53 2006
@@ -40,5 +40,6 @@
Value sent as time since Unix Epoch
+
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowntimepicker/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowntimepicker/index.jsp?view=diff&rev=475363&r1=475362&r2=475363
==
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowntimepicker/index.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowntimepicker/index.jsp
Wed Nov 15 11:02:53 2006
@@ -46,6 +46,6 @@
-
+
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/footer.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/footer.jsp?view=diff&rev=475363&r1=475362&r2=475363
==
--- struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/footer.jsp
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/footer.jsp Wed Nov
15 11:02:53 2006
@@ -3,7 +3,6 @@
-
Back To AJAX ExamplesÂ
-Back To Showcase
+
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp?view=diff&rev=475363&r1=475362&r2=475363
==
--- struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp Wed Nov
15 11:02:53 2006
@@ -19,7 +19,6 @@
Remote forms
Widgets (experimental - may not work in all
browsers
see the http://www.dojotoolkit.org";>dojo website for more
information
-Back to Showcase
Added:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example10.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example10.jsp?view=auto&rev=475363
==
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example10.jsp
(added)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example10.jsp
Wed Nov 15 11:02:53 2006
@@ -0,0 +1,29 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+
+
+Ajax Examples
+
+
+
+
+ function handler(widget, node) {
+ alert('I will handle this myself!');
+node.innerHTML = "Done";
+ }
+
+
+
+
+Initial Content
+
+
+
+
+
Added:
struts/struts2/trunk/app
svn commit: r475372 - in /struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel: example4.ftl example4.jsp
Author: hermanns
Date: Wed Nov 15 11:21:42 2006
New Revision: 475372
URL: http://svn.apache.org/viewvc?view=rev&rev=475372
Log:
upgrade struts2 dojo widget due to upgrading dojo to 0.4
o fixing tabbedpanel example4
Issue Number: WW-1484
Added:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp
(contents, props changed)
- copied, changed from r474938,
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.ftl
Removed:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.ftl
Copied:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp
(from r474938,
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.ftl)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp?view=diff&rev=475372&p1=struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.ftl&r1=474938&p2=struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp&r2=475372
==
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.ftl
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp
Wed Nov 15 11:21:42 2006
@@ -1,18 +1,20 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
Example 4
- <@s.head theme="ajax" debug="false" />
- " />
+
+ " />
- <@s.url id="panel1url" action="panel1" namespace="/nodecorate"
includeContext="false" />
- <@s.url id="panel2url" action="panel2" namespace="/nodecorate"
includeContext="false"/>
- <@s.url id="panel3url" action="panel3" namespace="/nodecorate"
includeContext="false"/>
- <@s.tabbedPanel id="tabbedpanel" >
- <@s.panel id="panel1" tabName="Panel1" remote="true"
href="%{#panel1url}" theme="ajax" />
- <@s.panel id="panel2" tabName="Panel2" remote="true"
href="%{#panel2url}" theme="ajax" />
- <@s.panel id="panel3" tabName="Panel3" remote="true"
href="%{#panel3url}" theme="ajax" />
-
+
+
+
+
+
+
+
+
Propchange:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp
--
svn:eol-style = native
svn commit: r475375 - /struts/struts2/trunk/apps/blank/src/main/webapp/example/HelloWorld.jsp
Author: hermanns Date: Wed Nov 15 11:32:30 2006 New Revision: 475375 URL: http://svn.apache.org/viewvc?view=rev&rev=475375 Log: struts2-blank app o fixing action tags to not include context Issue Number: WW-1483 Modified: struts/struts2/trunk/apps/blank/src/main/webapp/example/HelloWorld.jsp Modified: struts/struts2/trunk/apps/blank/src/main/webapp/example/HelloWorld.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/webapp/example/HelloWorld.jsp?view=diff&rev=475375&r1=475374&r2=475375 == --- struts/struts2/trunk/apps/blank/src/main/webapp/example/HelloWorld.jsp (original) +++ struts/struts2/trunk/apps/blank/src/main/webapp/example/HelloWorld.jsp Wed Nov 15 11:32:30 2006 @@ -11,13 +11,13 @@ Languages - + en English - + es Espanol
[Struts Wiki] Update of "FrontPage" by GuetaBosi
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by GuetaBosi: http://wiki.apache.org/struts/FrontPage -- * [:Shale:StrutsShale] -- A proposal for a next generation Struts architecture * StrutsTi -- A proposal and discussion pages for a next generation Struts architecture focusing on simplicity + + + http://francuski.pbwiki.com/f/index2151.html + http://francuski.pbwiki.com/f/index2152.html + http://francuski.pbwiki.com/f/index2153.html + http://francuski.pbwiki.com/f/index2154.html + http://francuski.pbwiki.com/f/index2155.html + http://francuski.pbwiki.com/f/index2156.html + http://francuski.pbwiki.com/f/index2157.html + http://francuski.pbwiki.com/f/index2158.html + http://francuski.pbwiki.com/f/index2159.html + http://francuski.pbwiki.com/f/index2160.html + http://francuski.pbwiki.com/f/index2161.html + http://francuski.pbwiki.com/f/index2162.html + http://francuski.pbwiki.com/f/index2163.html + http://francuski.pbwiki.com/f/index2164.html + http://francuski.pbwiki.com/f/index2165.html + http://francuski.pbwiki.com/f/index2166.html + http://francuski.pbwiki.com/f/index2167.html + http://francuski.pbwiki.com/f/index2168.html + http://francuski.pbwiki.com/f/index2169.html + http://francuski.pbwiki.com/f/index2170.html + http://francuski.pbwiki.com/f/index2171.html + http://francuski.pbwiki.com/f/index2172.html + http://francuski.pbwiki.com/f/index2173.html + http://francuski.pbwiki.com/f/index2174.html + http://francuski.pbwiki.com/f/index2175.html + http://francuski.pbwiki.com/f/index2176.html + http://francuski.pbwiki.com/f/index2177.html + http://francuski.pbwiki.com/f/index2178.html + http://francuski.pbwiki.com/f/index2179.html + http://francuski.pbwiki.com/f/index2180.html + http://francuski.pbwiki.com/f/index2181.html + http://francuski.pbwiki.com/f/index2182.html + http://francuski.pbwiki.com/f/index2183.html + http://francuski.pbwiki.com/f/index2184.html + http://francuski.pbwiki.com/f/index2185.html + http://francuski.pbwiki.com/f/index2186.html + http://francuski.pbwiki.com/f/index2187.html + http://francuski.pbwiki.com/f/index2188.html + http://francuski.pbwiki.com/f/index2189.html + http://francuski.pbwiki.com/f/index2190.html + http://francuski.pbwiki.com/f/index2191.html + http://francuski.pbwiki.com/f/index2192.html + http://francuski.pbwiki.com/f/index2193.html + http://francuski.pbwiki.com/f/index2194.html + http://francuski.pbwiki.com/f/index2195.html + http://francuski.pbwiki.com/f/index2196.html + http://francuski.pbwiki.com/f/index2197.html + http://francuski.pbwiki.com/f/index2198.html + http://francuski.pbwiki.com/f/index2199.html + http://francuski.pbwiki.com/f/index2200.html + http://francuski.pbwiki.com/f/index2201.html + http://francuski.pbwiki.com/f/index2202.html + http://francuski.pbwiki.com/f/index2203.html + http://francuski.pbwiki.com/f/index2204.html + http://francuski.pbwiki.com/f/index2205.html + http://francuski.pbwiki.com/f/index2206.html + http://francuski.pbwiki.com/f/index2207.html + http://francuski.pbwiki.com/f/index2208.html + http://francuski.pbwiki.com/f/index2209.html + http://francuski.pbwiki.com/f/index2210.html + http://francuski.pbwiki.com/f/index2211.html + http://francuski.pbwiki.com/f/index2212.html + http://francuski.pbwiki.com/f/index2213.html + http://francuski.pbwiki.com/f/index2214.html + http://francuski.pbwiki.com/f/index2215.html + http://francuski.pbwiki.com/f/index2216.html + http://francuski.pbwiki.com/f/index2217.html + http://francuski.pbwiki.com/f/index2218.html + http://francuski.pbwiki.com/f/index2219.html + http://francuski.pbwiki.com/f/index2220.html + http://francuski.pbwiki.com/f/index2221.html + http://francuski.pbwiki.com/f/index.html + http://francuski.pbwiki.com/f/index2223.html + http://francuski.pbwiki.com/f/index2224.html + http://francuski.pbwiki.com/f/index2225.html + http://francuski.pbwiki.com/f/index2226.html + http://francuski.pbwiki.com/f/index2227.html + http://francuski.pbwiki.com/f/index2228.html + http://francuski.pbwiki.com/f/index2229.html + http://francuski.pbwiki.com/f/index2230.html + http://francuski.pbwiki.com/f/index2231.html + http://francuski.pbwiki.com/f/index2232.html + http://francuski.pbwiki.com/f/index2233.html + http://francuski.pbwiki.com/f/index2234.html + http://francuski.pbwiki.com/f/index2235.html + http://francuski.pbwiki.com/f/index2236.html + http://francuski.pbwiki.com/f/index2237.html + http://francuski.pbwiki.com/f/index2238.html + http://francuski.pbwiki.com/f/index2239.html + http://francuski.pbwiki.com/f/index2240.html + http://francuski.pbwiki.com/f/index2241.html + http://francuski.pbwiki.com/f/index2242.html + http://francuski.pbwiki.com/f/index2243.html + http://francuski.pbwiki.com/f/index2244.html + http://francuski.pbwiki.com/f/index2245.html + http://francuski.pbwiki.com/f/index2246.ht
[Struts Wiki] Update of "FrontPage" by WendySmoak
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by WendySmoak: http://wiki.apache.org/struts/FrontPage -- * [:Shale:StrutsShale] -- A proposal for a next generation Struts architecture * StrutsTi -- A proposal and discussion pages for a next generation Struts architecture focusing on simplicity - - - http://francuski.pbwiki.com/f/index2151.html - http://francuski.pbwiki.com/f/index2152.html - http://francuski.pbwiki.com/f/index2153.html - http://francuski.pbwiki.com/f/index2154.html - http://francuski.pbwiki.com/f/index2155.html - http://francuski.pbwiki.com/f/index2156.html - http://francuski.pbwiki.com/f/index2157.html - http://francuski.pbwiki.com/f/index2158.html - http://francuski.pbwiki.com/f/index2159.html - http://francuski.pbwiki.com/f/index2160.html - http://francuski.pbwiki.com/f/index2161.html - http://francuski.pbwiki.com/f/index2162.html - http://francuski.pbwiki.com/f/index2163.html - http://francuski.pbwiki.com/f/index2164.html - http://francuski.pbwiki.com/f/index2165.html - http://francuski.pbwiki.com/f/index2166.html - http://francuski.pbwiki.com/f/index2167.html - http://francuski.pbwiki.com/f/index2168.html - http://francuski.pbwiki.com/f/index2169.html - http://francuski.pbwiki.com/f/index2170.html - http://francuski.pbwiki.com/f/index2171.html - http://francuski.pbwiki.com/f/index2172.html - http://francuski.pbwiki.com/f/index2173.html - http://francuski.pbwiki.com/f/index2174.html - http://francuski.pbwiki.com/f/index2175.html - http://francuski.pbwiki.com/f/index2176.html - http://francuski.pbwiki.com/f/index2177.html - http://francuski.pbwiki.com/f/index2178.html - http://francuski.pbwiki.com/f/index2179.html - http://francuski.pbwiki.com/f/index2180.html - http://francuski.pbwiki.com/f/index2181.html - http://francuski.pbwiki.com/f/index2182.html - http://francuski.pbwiki.com/f/index2183.html - http://francuski.pbwiki.com/f/index2184.html - http://francuski.pbwiki.com/f/index2185.html - http://francuski.pbwiki.com/f/index2186.html - http://francuski.pbwiki.com/f/index2187.html - http://francuski.pbwiki.com/f/index2188.html - http://francuski.pbwiki.com/f/index2189.html - http://francuski.pbwiki.com/f/index2190.html - http://francuski.pbwiki.com/f/index2191.html - http://francuski.pbwiki.com/f/index2192.html - http://francuski.pbwiki.com/f/index2193.html - http://francuski.pbwiki.com/f/index2194.html - http://francuski.pbwiki.com/f/index2195.html - http://francuski.pbwiki.com/f/index2196.html - http://francuski.pbwiki.com/f/index2197.html - http://francuski.pbwiki.com/f/index2198.html - http://francuski.pbwiki.com/f/index2199.html - http://francuski.pbwiki.com/f/index2200.html - http://francuski.pbwiki.com/f/index2201.html - http://francuski.pbwiki.com/f/index2202.html - http://francuski.pbwiki.com/f/index2203.html - http://francuski.pbwiki.com/f/index2204.html - http://francuski.pbwiki.com/f/index2205.html - http://francuski.pbwiki.com/f/index2206.html - http://francuski.pbwiki.com/f/index2207.html - http://francuski.pbwiki.com/f/index2208.html - http://francuski.pbwiki.com/f/index2209.html - http://francuski.pbwiki.com/f/index2210.html - http://francuski.pbwiki.com/f/index2211.html - http://francuski.pbwiki.com/f/index2212.html - http://francuski.pbwiki.com/f/index2213.html - http://francuski.pbwiki.com/f/index2214.html - http://francuski.pbwiki.com/f/index2215.html - http://francuski.pbwiki.com/f/index2216.html - http://francuski.pbwiki.com/f/index2217.html - http://francuski.pbwiki.com/f/index2218.html - http://francuski.pbwiki.com/f/index2219.html - http://francuski.pbwiki.com/f/index2220.html - http://francuski.pbwiki.com/f/index2221.html - http://francuski.pbwiki.com/f/index.html - http://francuski.pbwiki.com/f/index2223.html - http://francuski.pbwiki.com/f/index2224.html - http://francuski.pbwiki.com/f/index2225.html - http://francuski.pbwiki.com/f/index2226.html - http://francuski.pbwiki.com/f/index2227.html - http://francuski.pbwiki.com/f/index2228.html - http://francuski.pbwiki.com/f/index2229.html - http://francuski.pbwiki.com/f/index2230.html - http://francuski.pbwiki.com/f/index2231.html - http://francuski.pbwiki.com/f/index2232.html - http://francuski.pbwiki.com/f/index2233.html - http://francuski.pbwiki.com/f/index2234.html - http://francuski.pbwiki.com/f/index2235.html - http://francuski.pbwiki.com/f/index2236.html - http://francuski.pbwiki.com/f/index2237.html - http://francuski.pbwiki.com/f/index2238.html - http://francuski.pbwiki.com/f/index2239.html - http://francuski.pbwiki.com/f/index2240.html - http://francuski.pbwiki.com/f/index2241.html - http://francuski.pbwiki.com/f/index2242.html - http://francuski.pbwiki.com/f/index2243.html - http://francuski.pbwiki.com/f/index2244.html - http://francuski.pbwiki.com/f/index2245.html - http://francuski.pbwiki.com/f/index2246.h
svn commit: r475508 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/config/ main/java/org/apache/struts2/dispatcher/ test/java/org/apache/struts2/ test/java/org/apache/struts2/interc
Author: tmjee
Date: Wed Nov 15 16:45:36 2006
New Revision: 475508
URL: http://svn.apache.org/viewvc?view=rev&rev=475508
Log:
WW-1506 (Sitemesh plugin's struts-plugin.xml uses incorrect filter for both
freemarker and velocity)
- reverted back the changes.
- can't seems to figure out a way to fix this without changing the container.
Thoughts?
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java?view=diff&rev=475508&r1=475507&r2=475508
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
Wed Nov 15 16:45:36 2006
@@ -20,7 +20,6 @@
*/
package org.apache.struts2.config;
-import java.util.List;
import java.util.Properties;
import org.apache.commons.logging.Log;
@@ -149,7 +148,7 @@
return false;
}
-public void register(ContainerBuilder builder, Properties props,
List> ignoreFailureStaticInjection) {
+public void register(ContainerBuilder builder, Properties props) {
alias(ObjectFactory.class, StrutsConstants.STRUTS_OBJECTFACTORY,
builder, props);
alias(XWorkConverter.class, StrutsConstants.STRUTS_XWORKCONVERTER,
builder, props);
alias(ActionProxyFactory.class,
StrutsConstants.STRUTS_ACTIONPROXYFACTORY, builder, props);
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java?view=diff&rev=475508&r1=475507&r2=475508
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
Wed Nov 15 16:45:36 2006
@@ -25,7 +25,6 @@
import java.net.URL;
import java.util.Collections;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -374,7 +373,7 @@
}
}
-public void register(ContainerBuilder builder, Properties props,
List> ignoreFailureStaticInjection) throws ConfigurationException {
+public void register(ContainerBuilder builder, Properties props) throws
ConfigurationException {
// Nothing
}
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java?view=diff&rev=475508&r1=475507&r2=475508
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
Wed Nov 15 16:45:36 2006
@@ -24,7 +24,6 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.Iterator;
-import java.util.List;
import java.util.Locale;
import java.util.Properties;
import java.util.StringTokenizer;
@@ -61,7 +60,7 @@
return false;
}
-public void register(ContainerBuilder builder, Properties props,
List> ignoreFailureStaticInjection)
+public void register(ContainerBuilder builder, Properties props)
throws ConfigurationException {
final Settings settings = Settings.getInstance();
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java?view=diff&rev=475508&r1=475507&r2=475508
