svn commit: r1534531 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/
Author: lukaszlenart
Date: Tue Oct 22 08:02:45 2013
New Revision: 1534531
URL: http://svn.apache.org/r1534531
Log:
Add toString method for better debugging
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ExceptionMappingConfig.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorConfig.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorMapping.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorStackConfig.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultConfig.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/UnknownHandlerConfig.java
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ExceptionMappingConfig.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ExceptionMappingConfig.java?rev=1534531&r1=1534530&r2=1534531&view=diff
==
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ExceptionMappingConfig.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ExceptionMappingConfig.java
Tue Oct 22 08:02:45 2013
@@ -112,6 +112,12 @@ public class ExceptionMappingConfig exte
return hashCode;
}
+@Override
+public String toString() {
+return "ExceptionMappingConfig: [" + name + "] handle ["
++ exceptionClassName + "] to result [" + result + "] with
params " + params;
+}
+
/**
* The builder for this object. An instance of this object is the only
way to construct a new instance. The
* purpose is to enforce the immutability of the object. The methods are
structured in a way to support chaining.
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorConfig.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorConfig.java?rev=1534531&r1=1534530&r2=1534531&view=diff
==
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorConfig.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorConfig.java
Tue Oct 22 08:02:45 2013
@@ -98,6 +98,11 @@ public class InterceptorConfig extends L
return result;
}
+@Override
+public String toString() {
+return "InterceptorConfig: [" + name + "] => [" + className + "] with
params " + params;
+}
+
/**
* The builder for this object. An instance of this object is the only
way to construct a new instance. The
* purpose is to enforce the immutability of the object. The methods are
structured in a way to support chaining.
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorMapping.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorMapping.java?rev=1534531&r1=1534530&r2=1534531&view=diff
==
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorMapping.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorMapping.java
Tue Oct 22 08:02:45 2013
@@ -62,4 +62,10 @@ public class InterceptorMapping implemen
result = (name != null ? name.hashCode() : 0);
return result;
}
+
+@Override
+public String toString() {
+return "InterceptorMapping: [" + name + "] => [" +
interceptor.getClass().getName() + ']';
+}
+
}
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorStackConfig.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorStackConfig.java?rev=1534531&r1=1534530&r2=1534531&view=diff
==
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorStackConfig.java
(original)
+++
struts/struts2/trunk/xwork-core/
svn commit: r1534634 - in /struts/struts2/trunk: archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/ core/src/main/java/org/apache/struts2/config/ core/src/
Author: lukaszlenart
Date: Tue Oct 22 13:42:51 2013
New Revision: 1534634
URL: http://svn.apache.org/r1534634
Log:
WW-4152 Solves problem with NPE as a side effect of concurrency issue, removes
old code, use simpler dependency graph
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/PropertiesConfigurationProvider.java
- copied, changed from r1534132,
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/PropertiesConfigurationProviderTest.java
- copied, changed from r1534132,
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/LegacyPropertiesConfigurationProviderTest.java
Removed:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/LegacyPropertiesConfigurationProviderTest.java
Modified:
struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.properties
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DefaultPropertiesProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DefaultSettings.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DelegatingSettings.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/PropertiesSettings.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Settings.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/TestSettings.java
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/location/LocatableProperties.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/location/LocationImpl.java
Modified:
struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.properties?rev=1534634&r1=1534633&r2=1534634&view=diff
==
---
struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.properties
(original)
+++
struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.properties
Tue Oct 22 13:42:51 2013
@@ -4,11 +4,6 @@
###(can be overridden by a struts.properties file in the root of the classpath)
###
-### Specifies the Configuration used to configure Struts 2.0
-### one could extend org.apache.struts2.config.Configuration
-### to build one's customize way of getting the configurations parameters into
Struts 2.0
-# struts.configuration=org.apache.struts2.config.DefaultConfiguration
-
### This can be used to set your default locale and encoding scheme
# struts.locale=en_US
struts.i18n.encoding=UTF-8
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DefaultPropertiesProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DefaultPropertiesProvider.java?rev=1534634&r1=1534633&r2=1534634&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DefaultPropertiesProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DefaultPropertiesProvider.java
Tue Oct 22 13:42:51 2013
@@ -29,7 +29,7 @@ import com.opensymphony.xwork2.util.loca
/**
* Loads the default properties, separate from the usual struts.properties
loading
*/
-public class DefaultPropertiesProvider extends
LegacyPropertiesConfigurationProvider {
+public class DefaultPropertiesProvider extends PropertiesConfigurationProvider
{
public void destroy() {
}
@@ -37,17 +37,13 @@ public class DefaultPropertiesProvider e
public void init(Configuration configuration) throws
ConfigurationException {
}
-public void register(ContainerBuilder builder, LocatableProperties props)
-throws ConfigurationException {
-
-Settings defaultSettings = null;
+public void register(ContainerBuilder builder, LocatableProperties props)
throws ConfigurationException {
try {
-defaultSettings = new
PropertiesSettings("org/apache/struts2/d
svn commit: r1534635 - /struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
Author: lukaszlenart Date: Tue Oct 22 13:43:38 2013 New Revision: 1534635 URL: http://svn.apache.org/r1534635 Log: WW-4152 Removes unused option Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties 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?rev=1534635&r1=1534634&r2=1534635&view=diff == --- 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 Tue Oct 22 13:43:38 2013 @@ -24,11 +24,6 @@ ###(can be overridden by a struts.properties file in the root of the classpath) ### -### Specifies the Configuration used to configure Struts -### one could extend org.apache.struts2.config.Configuration -### to build one's customize way of getting the configurations parameters into Struts -# struts.configuration=org.apache.struts2.config.DefaultConfiguration - ### This can be used to set your default locale and encoding scheme # struts.locale=en_US struts.i18n.encoding=UTF-8
[CONF] Confluence Changes in the last 24 hours
Apache Ambari (Incubating) Pages Page: Instructions for installing Ambari-1.4.1 bits edited by Siddharth Wagle[04:08 PM] (view changes) Page: Ambari User Guides edited by Yusaku Sako[12:30 AM] (view changes) Apache Buildr Pages Page: Run the Eclipse (ecj) compiler created by liam christopher[12:03 AM] Apache Cloudstack Pages Page: Who uses Apache CloudStack? edited by John Kinsella[04:56 PM] (view changes) Page: Cloudstack 4.3 Release edited by Animesh[12:30 AM] (view changes) Apache Hive Pages Page: HiveODBC edited by Lars Francke[07:03 AM] (view changes) Apache Kafka Pages Page: Ecosystem edited by Otis Gospodnetic[05:08 PM] (view changes) Apache OpenOffice Community Pages Page: Tips for branch ia2 edited by Steve Yin[08:47 AM] (view changes) Apache Pig Pages Page: HowToRelease edited by Daniel[07:35 PM] (view changes) Traffic Server Pages Page: WebProxyCacheTuning edited by Adam W. Dace[04:40 AM] (view changes) Apache ZooKeeper Pages Page: PoweredBy edited by Otis Gospodnetic[06:07 PM] (view changes)
