Author: musachy
Date: Tue Apr 7 17:58:19 2009
New Revision: 762877
URL: http://svn.apache.org/viewvc?rev=762877&view=rev
Log:
Make @Action available for methods only. Update plugin xml
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/annotation/Action.java
struts/struts2/trunk/plugins/convention/src/main/resources/struts-plugin.xml
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/annotation/Action.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/annotation/Action.java?rev=762877&r1=762876&r2=762877&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/annotation/Action.java
(original)
+++
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/annotation/Action.java
Tue Apr 7 17:58:19 2009
@@ -52,7 +52,7 @@
* </pre>
* <!-- END SNIPPET: javadoc -->
*/
-...@target({ElementType.METHOD, ElementType.TYPE})
+...@target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface Action {
String DEFAULT_VALUE = "DEFAULT_VALUE";
Modified:
struts/struts2/trunk/plugins/convention/src/main/resources/struts-plugin.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/resources/struts-plugin.xml?rev=762877&r1=762876&r2=762877&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/convention/src/main/resources/struts-plugin.xml
(original)
+++
struts/struts2/trunk/plugins/convention/src/main/resources/struts-plugin.xml
Tue Apr 7 17:58:19 2009
@@ -23,10 +23,10 @@
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
- "http://struts.apache.org/dtds/struts-2.0.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
+ "http://struts.apache.org/dtds/struts-2.1.7.dtd";>
-<struts>
+<struts order="20">
<bean type="com.opensymphony.xwork2.UnknownHandler" name="convention"
class="org.apache.struts2.convention.ConventionUnknownHandler"/>
<bean type="org.apache.struts2.convention.ActionConfigBuilder"
name="convention"
class="org.apache.struts2.convention.PackageBasedActionConfigBuilder"/>
@@ -60,7 +60,7 @@
<constant name="struts.convention.relative.result.types"
value="dispatcher,velocity,freemarker"/>
<constant name="struts.convention.redirect.to.slash" value="true"/>
<constant name="struts.mapper.alwaysSelectFullNamespace" value="true"/>
- <constant name="struts.convention.action.includeJars" value="" />
+ <!-- <constant name="struts.convention.action.includeJars" /> -->
<constant name="struts.convention.action.fileProtocols" value="jar" />
<constant name="struts.convention.classes.reload" value="false" />
