You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ol...@apache.org on 2008/10/26 12:22:22 UTC
svn commit: r707968 - in
/continuum/branches/continuum-struts2/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/components/
java/org/apache/maven/continuum/web/view/jsp/ui/ resources/ webapp/WEB-INF/
Author: olamy
Date: Sun Oct 26 04:22:21 2008
New Revision: 707968
URL: http://svn.apache.org/viewvc?rev=707968&view=rev
Log:
fix submitCancelTag with s2
Modified:
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/SubmitCancel.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/SubmitCancelTag.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.properties
continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.xml
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/web.xml
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/SubmitCancel.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/SubmitCancel.java?rev=707968&r1=707967&r2=707968&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/SubmitCancel.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/SubmitCancel.java Sun Oct 26 04:22:21 2008
@@ -19,24 +19,25 @@
* under the License.
*/
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.struts2.components.Submit;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.UIBean;
+
+import com.opensymphony.xwork2.util.ValueStack;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
*/
public class SubmitCancel
- extends Submit
+ extends UIBean
{
private static final String TEMPLATE = "submitCancel";
private String cancel;
- public SubmitCancel( OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response )
+ public SubmitCancel( ValueStack stack, HttpServletRequest request, HttpServletResponse response )
{
super( stack, request, response );
}
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/SubmitCancelTag.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/SubmitCancelTag.java?rev=707968&r1=707967&r2=707968&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/SubmitCancelTag.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/SubmitCancelTag.java Sun Oct 26 04:22:21 2008
@@ -19,20 +19,22 @@
* under the License.
*/
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.maven.continuum.web.components.SubmitCancel;
import org.apache.struts2.components.Component;
-import org.apache.struts2.views.jsp.ui.SubmitTag;
+import org.apache.struts2.views.jsp.ui.AbstractUITag;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
*/
public class SubmitCancelTag
- extends SubmitTag
+ extends AbstractUITag
{
private String cancel;
@@ -53,4 +55,10 @@
{
this.cancel = cancel;
}
+
+ public Component getBean( ValueStack valueStack, HttpServletRequest request, HttpServletResponse response )
+ {
+ return new SubmitCancel( valueStack, request, response );
+ }
+
}
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.properties?rev=707968&r1=707967&r2=707968&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.properties (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.properties Sun Oct 26 04:22:21 2008
@@ -23,7 +23,7 @@
# Theme
struts.ui.theme = default
-struts.serve.static = true
+struts.serve.static = false
# Locale
#struts.locale=en_EN
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.xml?rev=707968&r1=707967&r2=707968&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.xml (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.xml Sun Oct 26 04:22:21 2008
@@ -79,7 +79,7 @@
<result name="requires-authorization">/WEB-INF/jsp/error/authorizationError.jsp</result>
- <result name="continuum-configuration-required" type="redirect-action">
+ <result name="continuum-configuration-required" type="redirect-action">
<param name="actionName">configuration</param>
<param name="namespace">/admin</param>
<param name="method">input</param>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/web.xml?rev=707968&r1=707967&r2=707968&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/web.xml Sun Oct 26 04:22:21 2008
@@ -37,32 +37,28 @@
<filter>
- <filter-name>struts2-cleanup</filter-name>
+ <filter-name>struts-cleanup</filter-name>
<filter-class>org.apache.struts2.dispatcher.ActionContextCleanUp</filter-class>
</filter>
-
<filter>
<filter-name>sitemesh</filter-name>
<filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
</filter>
-
<filter>
- <filter-name>struts2</filter-name>
+ <filter-name>struts</filter-name>
<filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
</filter>
<filter-mapping>
- <filter-name>struts2-cleanup</filter-name>
+ <filter-name>struts-cleanup</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-
<filter-mapping>
<filter-name>sitemesh</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-
<filter-mapping>
- <filter-name>struts2</filter-name>
+ <filter-name>struts</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>