You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by tm...@apache.org on 2006/11/16 01:45:37 UTC
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/interceptor/
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<Class<?>> 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<Class<?>> 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<Class<?>> 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
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java Wed Nov 15 16:45:36 2006
@@ -88,16 +88,16 @@
* @see com.opensymphony.xwork2.config.providers.XmlConfigurationProvider#register(com.opensymphony.xwork2.inject.ContainerBuilder, java.util.Properties)
*/
@Override
- public void register(ContainerBuilder containerBuilder, Properties props, List<Class<?>> ignoreFailureStaticInjection) throws ConfigurationException {
+ public void register(ContainerBuilder containerBuilder, Properties props) throws ConfigurationException {
if (servletContext != null && !containerBuilder.contains(ServletContext.class)) {
- containerBuilder.factory(ServletContext.class, new Factory<ServletContext>() {
- public ServletContext create(Context context) throws Exception {
+ containerBuilder.factory(ServletContext.class, new Factory() {
+ public Object create(Context context) throws Exception {
return servletContext;
}
});
}
- super.register(containerBuilder, props, ignoreFailureStaticInjection);
+ super.register(containerBuilder, props);
}
/* (non-Javadoc)
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java?view=diff&rev=475508&r1=475507&r2=475508
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java Wed Nov 15 16:45:36 2006
@@ -329,7 +329,7 @@
public void loadPackages() throws ConfigurationException {}
public boolean needsReload() { return false; }
- public void register(ContainerBuilder builder, Properties props, List<Class<?>> ignoreFailureStaticInjection) throws ConfigurationException {
+ public void register(ContainerBuilder builder, Properties props) throws ConfigurationException {
props.putAll(initParams);
}
});
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java?view=diff&rev=475508&r1=475507&r2=475508
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java Wed Nov 15 16:45:36 2006
@@ -163,7 +163,7 @@
return false;
}
- public void register(ContainerBuilder builder, Properties props, List<Class<?>> ignoreFailureStaticInjection) throws ConfigurationException {
+ public void register(ContainerBuilder builder, Properties props) throws ConfigurationException {
if (!builder.contains(ObjectFactory.class)) {
builder.factory(ObjectFactory.class);
}
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java?view=diff&rev=475508&r1=475507&r2=475508
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java Wed Nov 15 16:45:36 2006
@@ -232,7 +232,7 @@
configuration.addPackageConfig("", wait);
}
- public void register(ContainerBuilder builder, Properties props, List<Class<?>> ignoreFailureStaticInjection) throws ConfigurationException {
+ public void register(ContainerBuilder builder, Properties props) throws ConfigurationException {
builder.factory(ObjectFactory.class);
builder.factory(ActionProxyFactory.class, DefaultActionProxyFactory.class);
}