svn commit: r1133947 - in /struts/struts2/trunk: ./ core/src/main/java/org/apache/struts2/config/ core/src/main/resources/ xwork-core/src/main/java/com/opensymphony/xwork2/ xwork-core/src/main/java/co
Author: jafl Date: Thu Jun 9 15:43:04 2011 New Revision: 1133947 URL: http://svn.apache.org/viewvc?rev=1133947&view=rev Log: WW-3264 add allowed-methods configuration for action Added: struts/struts2/trunk/core/src/main/resources/struts-2.3.dtd (with props) struts/struts2/trunk/xwork-core/src/main/resources/xwork-2.3.dtd struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderAllowedMethodsTest.java struts/struts2/trunk/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java struts/struts2/trunk/core/src/main/resources/struts-default.xml struts/struts2/trunk/pom.xml struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.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/providers/XmlConfigurationProvider.java 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?rev=1133947&r1=1133946&r2=1133947&view=diff == --- 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 Thu Jun 9 15:43:04 2011 @@ -79,6 +79,7 @@ public class StrutsXmlConfigurationProvi dtdMappings.put("-//Apache Software Foundation//DTD Struts Configuration 2.0//EN", "struts-2.0.dtd"); dtdMappings.put("-//Apache Software Foundation//DTD Struts Configuration 2.1//EN", "struts-2.1.dtd"); dtdMappings.put("-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN", "struts-2.1.7.dtd"); +dtdMappings.put("-//Apache Software Foundation//DTD Struts Configuration 2.3//EN", "struts-2.3.dtd"); setDtdMappings(dtdMappings); File file = new File(filename); if (file.getParent() != null) { Added: struts/struts2/trunk/core/src/main/resources/struts-2.3.dtd URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/struts-2.3.dtd?rev=1133947&view=auto == --- struts/struts2/trunk/core/src/main/resources/struts-2.3.dtd (added) +++ struts/struts2/trunk/core/src/main/resources/struts-2.3.dtd Thu Jun 9 15:43:04 2011 @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: struts/struts2/trunk/core/src/main/resources/struts-2.3.dtd -- svn:eol-style = native Modified: struts/struts2/trunk/core/src/main/resources/struts-default.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/struts-default.xml?rev=1133947&r1=1133946&r2=1133947&view=diff == --- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original) +++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Thu Jun 9 15:43:04 2011 @@ -22,8 +22,8 @@ */ --> http://struts.apache.org/dtds/struts-2.1.7.dtd";> +"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN" +"http://struts.apache.org/dtds/struts-2.3.dtd";> Modified: struts/struts2/trunk/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=1133947&r1=1133946&r2=1133947&view=diff == --- struts/struts2/trunk/pom.xml (original) +++ struts/struts2/trunk/pom.xml Thu Jun 9 15:43:04 2011 @@ -164,10 +164,12 @@ --> + maven-compiler-plugin Modified: struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java?rev=1133947&r1=1133946&r2=1133947&view=diff == --- struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java (original) +++ struts/struts2/trunk/xwork-core/src/main/java/com/open
svn commit: r1133949 - /struts/struts2/trunk/pom.xml
Author: jafl Date: Thu Jun 9 15:43:58 2011 New Revision: 1133949 URL: http://svn.apache.org/viewvc?rev=1133949&view=rev Log: WW-3264 revert change to root pom Modified: struts/struts2/trunk/pom.xml Modified: struts/struts2/trunk/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=1133949&r1=1133948&r2=1133949&view=diff == --- struts/struts2/trunk/pom.xml (original) +++ struts/struts2/trunk/pom.xml Thu Jun 9 15:43:58 2011 @@ -164,12 +164,10 @@ --> - maven-compiler-plugin
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache ActiveMQ (https://cwiki.apache.org/confluence/display/ACTIVEMQ) Pages - Configuring Wire Formats edited by dejanb (12:28 PM) https://cwiki.apache.org/confluence/display/ACTIVEMQ/Configuring+Wire+Formats Apache Amber (https://cwiki.apache.org/confluence/display/AMBER) Pages - People edited by lmo...@apache.org (10:42 AM) https://cwiki.apache.org/confluence/display/AMBER/People Deployments edited by lmo...@apache.org (10:37 AM) https://cwiki.apache.org/confluence/display/AMBER/Deployments Get Involved edited by lmo...@apache.org (10:24 AM) https://cwiki.apache.org/confluence/display/AMBER/Get+Involved Downloads edited by lmo...@apache.org (10:23 AM) https://cwiki.apache.org/confluence/display/AMBER/Downloads OAuth 2.0 Client Demo edited by lmo...@apache.org (10:23 AM) https://cwiki.apache.org/confluence/display/AMBER/OAuth+2.0+Client+Demo OAuth 2.0 Client created by lmo...@apache.org (10:09 AM) https://cwiki.apache.org/confluence/display/AMBER/OAuth+2.0+Client Index edited by lmo...@apache.org (10:23 AM) https://cwiki.apache.org/confluence/display/AMBER/Index OAuth 2.0 Dynamic Client Registration created by lmo...@apache.org (10:16 AM) https://cwiki.apache.org/confluence/display/AMBER/OAuth+2.0+Dynamic+Client+Registration OAuth 2.0 Extensions edited by lmo...@apache.org (10:15 AM) https://cwiki.apache.org/confluence/display/AMBER/OAuth+2.0+Extensions OAuth 2.0 Resource Server edited by lmo...@apache.org (10:13 AM) https://cwiki.apache.org/confluence/display/AMBER/OAuth+2.0+Resource+Server OAuth 2.0 Authorization Server edited by lmo...@apache.org (10:11 AM) https://cwiki.apache.org/confluence/display/AMBER/OAuth+2.0+Authorization+Server OAuth 2.0 Client Quickstart edited by lmo...@apache.org (10:10 AM) https://cwiki.apache.org/confluence/display/AMBER/OAuth+2.0+Client+Quickstart Graphics edited by lmo...@apache.org (10:05 AM) https://cwiki.apache.org/confluence/display/AMBER/Graphics Commercial Amber Offerings edited by lmo...@apache.org (10:03 AM) https://cwiki.apache.org/confluence/display/AMBER/Commercial+Amber+Offerings Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - Camel 2.8.0 Release edited by davsclaus (07:17 AM) https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.8.0+Release Recipient List edited by davsclaus (07:12 AM) https://cwiki.apache.org/confluence/display/CAMEL/Recipient+List Multicast edited by davsclaus (07:11 AM) https://cwiki.apache.org/confluence/display/CAMEL/Multicast Splitter edited by davsclaus (07:10 AM) https://cwiki.apache.org/confluence/display/CAMEL/Splitter Camel 3.0 - Roadmap edited by davsclaus (05:25 AM) https://cwiki.apache.org/confluence/display/CAMEL/Camel+3.0+-+Roadmap APNS edited by davsclaus (12:16 AM) https://cwiki.apache.org/confluence/display/CAMEL/APNS Apache Geronimo v3.0 (https://cwiki.apache.org/confluence/display/GMOxDOC30) Pages - Migrating from G 2.x to G 3.x edited by chirun...@gmail.com (01:25 AM) https://cwiki.apache.org/confluence/display/GMOxDOC30/Migrating+from+G+2.x+to+G+3.x Apache Mahout (https://cwiki.apache.org/confluence/display/MAHOUT) Comments https://cwiki.apache.org/confluence/display/MAHOUT/Recommender+Documentation (1) OFBiz (Open For Business) Project Open Wiki (https://cwiki.apache.org/confluence/display/OFBIZ) Pages - Code and test separation for Apache OFBiz edited by ganathr (12:10 AM) https://cwiki.apache.org/confluence/display/OFBIZ/Code+and+test+separation+for+Apache+OFBiz OODT (https://cwiki.apache.org/confluence/display/OODT) Pages - Release Process edited by ahart (12:14 AM) https://cwiki.apache.org/confluence/display/OODT/Release+Process Apache Tapestry (https://cwiki.apache.org/confluence/display/TAPESTRY) Pages - Injection in Detail edited by hlship (09:04 PM) https://cwiki.apache.org/confluence/display/TAPESTRY/Injection+in+Detail Apache Wicket (https://cwiki.apache.org/confluence/display/WICKET) Pages - Migration to Wicket 1.5 edited by stevemac007 (09:09 PM) https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5 Apache Struts 2 Documentation (https://cwiki.apache.org/confluence/display/WW) Pages ---