You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2008/10/23 07:05:43 UTC
svn commit: r707273 [2/7] - in /continuum/branches/continuum-struts2: ./
continuum-core/ continuum-core/src/test/resources/ continuum-webapp/
continuum-webapp/src/main/java/org/apache/continuum/web/action/
continuum-webapp/src/main/java/org/apache/cont...
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/ContinuumTabAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/ContinuumTabAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/ContinuumTabAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/ContinuumTabAction.java Wed Oct 22 22:05:36 2008
@@ -1,5 +1,7 @@
package org.apache.maven.continuum.web.action.component;
+import org.apache.maven.continuum.web.action.PlexusActionSupport;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,10 +21,8 @@
* under the License.
*/
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
-
/**
- * @plexus.component role="com.opensymphony.xwork.Action" role-hint="continuumTab"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="continuumTab"
*/
public class ContinuumTabAction
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/NotifierSummaryAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/NotifierSummaryAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/NotifierSummaryAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/NotifierSummaryAction.java Wed Oct 22 22:05:36 2008
@@ -43,7 +43,7 @@
*
* @author <a href='mailto:rahul.thakur.xdev@gmail.com'>Rahul Thakur</a>
* @version $Id$
- * @plexus.component role="com.opensymphony.xwork.Action" role-hint="notifierSummary"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="notifierSummary"
*/
public class NotifierSummaryAction
extends ContinuumActionSupport
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddGroupNotifierAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddGroupNotifierAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddGroupNotifierAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddGroupNotifierAction.java Wed Oct 22 22:05:36 2008
@@ -35,7 +35,7 @@
*
* @author <a href='mailto:rahul.thakur.xdev@gmail.com'>Rahul Thakur</a>
* @version $Id$
- * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addGroupNotifier"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addGroupNotifier"
* @since 1.1
*/
public class AddGroupNotifierAction
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java Wed Oct 22 22:05:36 2008
@@ -32,7 +32,7 @@
*
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id: AddNotifierAction.java 466640 2006-10-22 13:11:30Z jmcconnell $
- * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addProjectNotifier"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addProjectNotifier"
* @since 1.1
*/
public class AddProjectNotifierAction
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteGroupNotifierAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteGroupNotifierAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteGroupNotifierAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteGroupNotifierAction.java Wed Oct 22 22:05:36 2008
@@ -35,7 +35,7 @@
*
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id: DeleteNotifierAction.java 467122 2006-10-23 20:50:19Z jmcconnell $
- * @plexus.component role="com.opensymphony.xwork.Action" role-hint="deleteGroupNotifier"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteGroupNotifier"
* @since 1.1
*/
public class DeleteGroupNotifierAction
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteProjectNotifierAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteProjectNotifierAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteProjectNotifierAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteProjectNotifierAction.java Wed Oct 22 22:05:36 2008
@@ -35,7 +35,7 @@
*
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id: DeleteNotifierAction.java 467122 2006-10-23 20:50:19Z jmcconnell $
- * @plexus.component role="com.opensymphony.xwork.Action" role-hint="deleteProjectNotifier"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteProjectNotifier"
*/
public class DeleteProjectNotifierAction
extends ContinuumActionSupport
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.java Wed Oct 22 22:05:36 2008
@@ -31,7 +31,7 @@
*
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id: IrcNotifierEditAction.java 465060 2006-10-17 21:24:38Z jmcconnell $
- * @plexus.component role="com.opensymphony.xwork.Action" role-hint="ircGroupNotifierEdit"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="ircGroupNotifierEdit"
* @since 1.1
*/
public class IrcGroupNotifierEditAction
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.java Wed Oct 22 22:05:36 2008
@@ -27,7 +27,7 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
- * @plexus.component role="com.opensymphony.xwork.Action" role-hint="ircProjectNotifierEdit"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="ircProjectNotifierEdit"
*/
public class IrcProjectNotifierEditAction
extends AbstractProjectNotifierEditAction
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java Wed Oct 22 22:05:36 2008
@@ -32,7 +32,7 @@
*
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id: JabberNotifierEditAction.java 465060 2006-10-17 21:24:38Z jmcconnell $
- * @plexus.component role="com.opensymphony.xwork.Action" role-hint="jabberGroupNotifierEdit"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="jabberGroupNotifierEdit"
* @since 1.1
*/
public class JabberGroupNotifierEditAction
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java Wed Oct 22 22:05:36 2008
@@ -32,7 +32,7 @@
*
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id: JabberNotifierEditAction.java 465060 2006-10-17 21:24:38Z jmcconnell $
- * @plexus.component role="com.opensymphony.xwork.Action"role-hint="jabberProjectNotifierEdit"
+ * @plexus.component role="com.opensymphony.xwork2.Action"role-hint="jabberProjectNotifierEdit"
*/
public class JabberProjectNotifierEditAction
extends AbstractProjectNotifierEditAction
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.java Wed Oct 22 22:05:36 2008
@@ -33,7 +33,7 @@
*
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id: MailNotifierEditAction.java 465060 2006-10-17 21:24:38Z jmcconnell $
- * @plexus.component role="com.opensymphony.xwork.Action" role-hint="mailGroupNotifierEdit"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="mailGroupNotifierEdit"
* @since 1.1
*/
public class MailGroupNotifierEditAction
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.java Wed Oct 22 22:05:36 2008
@@ -33,7 +33,7 @@
*
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id: MailNotifierEditAction.java 465060 2006-10-17 21:24:38Z jmcconnell $
- * @plexus.component role="com.opensymphony.xwork.Action" role-hint="mailProjectNotifierEdit"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="mailProjectNotifierEdit"
* @since 1.1
*/
public class MailProjectNotifierEditAction
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.java Wed Oct 22 22:05:36 2008
@@ -32,7 +32,7 @@
*
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id: MsnNotifierEditAction.java 465060 2006-10-17 21:24:38Z jmcconnell $
- * @plexus.component role="com.opensymphony.xwork.Action" role-hint="msnGroupNotifierEdit"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="msnGroupNotifierEdit"
*/
public class MsnGroupNotifierEditAction
extends AbstractGroupNotifierEditAction
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.java Wed Oct 22 22:05:36 2008
@@ -32,7 +32,7 @@
*
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id: MsnNotifierEditAction.java 465060 2006-10-17 21:24:38Z jmcconnell $
- * @plexus.component role="com.opensymphony.xwork.Action" role-hint="msnProjectNotifierEdit"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="msnProjectNotifierEdit"
* @since 1.1
*/
public class MsnProjectNotifierEditAction
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction.java Wed Oct 22 22:05:36 2008
@@ -30,7 +30,7 @@
* specified {@link ProjectGroup}.
*
* @author <a href="mailto:hisidro@exist.com">Henry Isidro</a>
- * @plexus.component role="com.opensymphony.xwork.Action" role-hint="wagonGroupNotifierEdit"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="wagonGroupNotifierEdit"
*/
public class WagonGroupNotifierEditAction
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonProjectNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonProjectNotifierEditAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonProjectNotifierEditAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonProjectNotifierEditAction.java Wed Oct 22 22:05:36 2008
@@ -30,7 +30,7 @@
* specified {@link Project}.
*
* @author <a href="mailto:hisidro@exist.com">Henry Isidro</a>
- * @plexus.component role="com.opensymphony.xwork.Action" role-hint="wagonProjectNotifierEdit"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="wagonProjectNotifierEdit"
*/
public class WagonProjectNotifierEditAction
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/Data.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/Data.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/Data.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/Data.java Wed Oct 22 22:05:36 2008
@@ -19,8 +19,8 @@
* under the License.
*/
-import com.opensymphony.webwork.components.UIBean;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.components.UIBean;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -36,7 +36,7 @@
protected String valueLink;
- public Data( OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response )
+ public Data( 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/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=707273&r1=707272&r2=707273&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 Wed Oct 22 22:05:36 2008
@@ -19,8 +19,8 @@
* under the License.
*/
-import com.opensymphony.webwork.components.Submit;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+import org.apache.struts2.components.Submit;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/interceptor/ForceContinuumConfigurationInterceptor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/interceptor/ForceContinuumConfigurationInterceptor.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/interceptor/ForceContinuumConfigurationInterceptor.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/interceptor/ForceContinuumConfigurationInterceptor.java Wed Oct 22 22:05:36 2008
@@ -19,8 +19,8 @@
* under the License.
*/
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.interceptor.Interceptor;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.Interceptor;
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.configuration.ConfigurationService;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -30,7 +30,7 @@
*
* @author: Jesse McConnell <jm...@apache.org>
* @version: $ID:$
- * @plexus.component role="com.opensymphony.xwork.interceptor.Interceptor"
+ * @plexus.component role="com.opensymphony.xwork2.interceptor.Interceptor"
* role-hint="forceContinuumConfigurationInterceptor"
*/
public class ForceContinuumConfigurationInterceptor
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/CronExpressionValidator.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/CronExpressionValidator.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/CronExpressionValidator.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/CronExpressionValidator.java Wed Oct 22 22:05:36 2008
@@ -19,9 +19,9 @@
* under the License.
*/
-import com.opensymphony.xwork.validator.ValidationException;
-import com.opensymphony.xwork.validator.ValidatorContext;
-import com.opensymphony.xwork.validator.validators.ValidatorSupport;
+import com.opensymphony.xwork2.validator.ValidationException;
+import com.opensymphony.xwork2.validator.ValidatorContext;
+import com.opensymphony.xwork2.validator.validators.ValidatorSupport;
/**
* Validator class for the cron expression in the continuum schedules.
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java Wed Oct 22 22:05:36 2008
@@ -19,8 +19,8 @@
* under the License.
*/
-import com.opensymphony.xwork.validator.ValidationException;
-import com.opensymphony.xwork.validator.validators.ValidatorSupport;
+import com.opensymphony.xwork2.validator.ValidationException;
+import com.opensymphony.xwork2.validator.validators.ValidatorSupport;
import org.apache.maven.continuum.execution.ExecutorConfigurator;
import org.apache.maven.continuum.installation.InstallationException;
import org.apache.maven.continuum.installation.InstallationService;
@@ -34,7 +34,7 @@
/**
* @author <a href="mailto:olamy@codehaus.org">olamy</a>
* @version $Id$
- * @plexus.component role="com.opensymphony.xwork.validator.Validator" role-hint="org.apache.maven.continuum.web.validator.InstallationValidator"
+ * @plexus.component role="com.opensymphony.xwork2.validator.Validator" role-hint="org.apache.maven.continuum.web.validator.InstallationValidator"
* @since 19 juin 07
*/
public class InstallationValidator
@@ -51,7 +51,7 @@
private InstallationService installationService;
/**
- * @see com.opensymphony.xwork.validator.Validator#validate(java.lang.Object)
+ * @see com.opensymphony.xwork2.validator.Validator#validate(java.lang.Object)
*/
public void validate( Object object )
throws ValidationException
@@ -63,7 +63,7 @@
}
String varValue = (String) this.getFieldValue( "installation.varValue", object );
- if (StringUtils.isEmpty( varValue ))
+ if ( StringUtils.isEmpty( varValue ) )
{
return;
}
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/WagonUrlValidator.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/WagonUrlValidator.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/WagonUrlValidator.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/WagonUrlValidator.java Wed Oct 22 22:05:36 2008
@@ -19,8 +19,8 @@
* under the License.
*/
-import com.opensymphony.xwork.validator.ValidationException;
-import com.opensymphony.xwork.validator.validators.ValidatorSupport;
+import com.opensymphony.xwork2.validator.ValidationException;
+import com.opensymphony.xwork2.validator.validators.ValidatorSupport;
import java.net.MalformedURLException;
import java.net.URL;
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java Wed Oct 22 22:05:36 2008
@@ -19,17 +19,17 @@
* under the License.
*/
-import com.opensymphony.webwork.views.util.UrlHelper;
-import com.opensymphony.xwork.ActionContext;
+import com.opensymphony.xwork2.ActionContext;
import org.apache.maven.continuum.security.ContinuumRoleConstants;
import org.apache.maven.continuum.web.model.ProjectSummary;
+import org.apache.struts2.views.util.UrlHelper;
+import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.redback.authorization.AuthorizationException;
import org.codehaus.plexus.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystem;
import org.codehaus.plexus.redback.system.SecuritySystemConstants;
-import org.codehaus.plexus.xwork.PlexusLifecycleListener;
import org.extremecomponents.table.bean.Column;
import org.extremecomponents.table.cell.DisplayCell;
import org.extremecomponents.table.core.TableModel;
@@ -139,7 +139,7 @@
// do the authz bit
ActionContext context = ActionContext.getContext();
- PlexusContainer container = (PlexusContainer) context.getApplication().get( PlexusLifecycleListener.KEY );
+ PlexusContainer container = (PlexusContainer) context.getApplication().get( PlexusConstants.PLEXUS_KEY );
SecuritySession securitySession =
(SecuritySession) context.getSession().get( SecuritySystemConstants.SECURITY_SESSION_KEY );
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java Wed Oct 22 22:05:36 2008
@@ -19,20 +19,20 @@
* under the License.
*/
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.views.util.UrlHelper;
-import com.opensymphony.xwork.ActionContext;
+import com.opensymphony.xwork2.ActionContext;
import org.apache.maven.continuum.project.ContinuumProjectState;
import org.apache.maven.continuum.security.ContinuumRoleConstants;
import org.apache.maven.continuum.web.model.ProjectSummary;
import org.apache.maven.continuum.web.util.StateGenerator;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.views.util.UrlHelper;
+import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.redback.authorization.AuthorizationException;
import org.codehaus.plexus.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystem;
import org.codehaus.plexus.redback.system.SecuritySystemConstants;
-import org.codehaus.plexus.xwork.PlexusLifecycleListener;
import org.extremecomponents.table.bean.Column;
import org.extremecomponents.table.cell.DisplayCell;
import org.extremecomponents.table.core.TableModel;
@@ -113,7 +113,7 @@
// do the authz bit
ActionContext context = ActionContext.getContext();
- PlexusContainer container = (PlexusContainer) context.getApplication().get( PlexusLifecycleListener.KEY );
+ PlexusContainer container = (PlexusContainer) context.getApplication().get( PlexusConstants.PLEXUS_KEY );
SecuritySession securitySession =
(SecuritySession) context.getSession().get( SecuritySystemConstants.SECURITY_SESSION_KEY );
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DataTag.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DataTag.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DataTag.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DataTag.java Wed Oct 22 22:05:36 2008
@@ -19,10 +19,10 @@
* under the License.
*/
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.views.jsp.ui.AbstractUITag;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
import org.apache.maven.continuum.web.components.Data;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.views.jsp.ui.AbstractUITag;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -37,7 +37,7 @@
protected String valueLink;
- public Component getBean( OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res )
+ public Component getBean( ValueStack stack, HttpServletRequest req, HttpServletResponse res )
{
return new Data( stack, req, res );
}
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java Wed Oct 22 22:05:36 2008
@@ -19,10 +19,10 @@
* under the License.
*/
-import com.opensymphony.webwork.views.jsp.ui.TextareaTag;
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.TextProvider;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.TextProvider;
+import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.views.jsp.ui.TextareaTag;
import javax.servlet.jsp.JspException;
import java.io.IOException;
@@ -101,7 +101,7 @@
{
actualName = findString( nameAttr );
String msg = null;
- OgnlValueStack stack = getStack();
+ ValueStack stack = getStack();
//find the name on the valueStack, and cast it to a date
Object dateObj = stack.findValue( actualName );
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=707273&r1=707272&r2=707273&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 Wed Oct 22 22:05:36 2008
@@ -19,10 +19,10 @@
* under the License.
*/
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.views.jsp.ui.SubmitTag;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.OgnlValueStack;
import org.apache.maven.continuum.web.components.SubmitCancel;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.views.jsp.ui.SubmitTag;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/log4j.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/log4j.xml?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/log4j.xml (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/log4j.xml Wed Oct 22 22:05:36 2008
@@ -59,14 +59,10 @@
</logger>
<!-- CONTINUUM-1228 -->
- <logger name="com.opensymphony.xwork.util.OgnlUtil">
+ <logger name="com.opensymphony.xwork2.util.OgnlUtil">
<level value="error"/>
</logger>
- <logger name="com.opensymphony.webwork">
- <level value="info"/>
- </logger>
-
<logger name="org.codehaus.plexus.PlexusContainer">
<level value="info"/>
</logger>
Copied: continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.properties (from r706303, continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/webwork.properties)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.properties?p2=continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.properties&p1=continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/webwork.properties&r1=706303&r2=707273&rev=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/webwork.properties (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.properties Wed Oct 22 22:05:36 2008
@@ -17,24 +17,23 @@
# under the License.
#
-webwork.objectFactory = org.codehaus.plexus.spring.WebWorkPlexusInSpringObjectFactory
-#org.codehaus.plexus.xwork.PlexusObjectFactory
-#webwork.tag.altSyntax = true
+struts.objectFactory = org.codehaus.plexus.spring.Struts2PlexusInSpringObjectFactory
+#struts.tag.altSyntax = true
# Theme
-webwork.ui.theme = default
+struts.ui.theme = default
-webwork.serve.static = true
+struts.serve.static = true
# Locale
-#webwork.locale=en_EN
+#struts.locale=en_EN
# Upload
-webwork.multipart.parser = jakarta
+struts.multipart.parser = jakarta
# default saveDir is defined by javax.servlet.context.tempdir property
-#webwork.multipart.saveDir =
+#struts.multipart.saveDir =
# default max size is 2097152 (2MB)
-#webwork.multipart.maxSize =
+#struts.multipart.maxSize =
# Localization
-webwork.custom.i18n.resources=localization,org.codehaus.plexus.redback.xwork.default,org.apache.maven.continuum.redback.custom
+struts.custom.i18n.resources=localization,org.codehaus.plexus.redback.xwork.default,org.apache.maven.continuum.redback.custom
Copied: continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.xml (from r706303, continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/xwork.xml)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.xml?p2=continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.xml&p1=continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/xwork.xml&r1=706303&r2=707273&rev=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/xwork.xml (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.xml Wed Oct 22 22:05:36 2008
@@ -17,16 +17,17 @@
~ under the License.
-->
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
+<!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd">
-<xwork>
- <include file="webwork-default.xml"/>
+<struts>
+ <include file="struts-default.xml"/>
<!-- Include plexus-security xwork configurations. -->
- <include file="xwork-security.xml"/>
+ <include file="struts-security.xml"/>
- <package name="default" extends="webwork-default">
+ <package name="default" extends="struts-default">
<interceptors>
<interceptor name="exception-logging" class="exceptionLogging"/>
@@ -1050,4 +1051,4 @@
</action>
</package>
-</xwork>
+</struts>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/validators.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/validators.xml?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/validators.xml (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/validators.xml Wed Oct 22 22:05:36 2008
@@ -18,19 +18,19 @@
-->
<validators>
- <validator name="required" class="com.opensymphony.xwork.validator.validators.RequiredFieldValidator"/>
- <validator name="requiredstring" class="com.opensymphony.xwork.validator.validators.RequiredStringValidator"/>
- <validator name="int" class="com.opensymphony.xwork.validator.validators.IntRangeFieldValidator"/>
- <validator name="double" class="com.opensymphony.xwork.validator.validators.DoubleRangeFieldValidator"/>
- <validator name="date" class="com.opensymphony.xwork.validator.validators.DateRangeFieldValidator"/>
- <validator name="expression" class="com.opensymphony.xwork.validator.validators.ExpressionValidator"/>
- <validator name="fieldexpression" class="com.opensymphony.xwork.validator.validators.FieldExpressionValidator"/>
- <validator name="email" class="com.opensymphony.xwork.validator.validators.EmailValidator"/>
- <validator name="url" class="com.opensymphony.xwork.validator.validators.URLValidator"/>
- <validator name="visitor" class="com.opensymphony.xwork.validator.validators.VisitorFieldValidator"/>
- <validator name="conversion" class="com.opensymphony.xwork.validator.validators.ConversionErrorFieldValidator"/>
- <validator name="stringlength" class="com.opensymphony.xwork.validator.validators.StringLengthFieldValidator"/>
- <validator name="regex" class="com.opensymphony.xwork.validator.validators.RegexFieldValidator"/>
+ <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
+ <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>
+ <validator name="int" class="com.opensymphony.xwork2.validator.validators.IntRangeFieldValidator"/>
+ <validator name="double" class="com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator"/>
+ <validator name="date" class="com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator"/>
+ <validator name="expression" class="com.opensymphony.xwork2.validator.validators.ExpressionValidator"/>
+ <validator name="fieldexpression" class="com.opensymphony.xwork2.validator.validators.FieldExpressionValidator"/>
+ <validator name="email" class="com.opensymphony.xwork2.validator.validators.EmailValidator"/>
+ <validator name="url" class="com.opensymphony.xwork2.validator.validators.URLValidator"/>
+ <validator name="visitor" class="com.opensymphony.xwork2.validator.validators.VisitorFieldValidator"/>
+ <validator name="conversion" class="com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator"/>
+ <validator name="stringlength" class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/>
+ <validator name="regex" class="com.opensymphony.xwork2.validator.validators.RegexFieldValidator"/>
<validator name="cronexpression" class="org.apache.maven.continuum.web.validator.CronExpressionValidator"/>
<validator name="wagon-url" class="org.apache.maven.continuum.web.validator.WagonUrlValidator"/>
<validator name="installationValidator" class="org.apache.maven.continuum.web.validator.InstallationValidator"/>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/about.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/about.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/about.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/about.jsp Wed Oct 22 22:05:36 2008
@@ -17,27 +17,27 @@
~ under the License.
--%>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="continuum" prefix="c1" %>
<html>
- <ww:i18n name="localization.Continuum">
+ <s:i18n name="localization.Continuum">
<head>
- <title><ww:text name="about.page.title"/></title>
+ <title><s:text name="about.page.title"/></title>
</head>
<body>
<div id="axial" class="h3">
- <h3><ww:text name="about.section.title"/></h3>
+ <h3><s:text name="about.section.title"/></h3>
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
<c1:data label="%{getText('about.version.label')}">
- <ww:param name="after"><ww:text name="about.version.number"/></ww:param>
+ <s:param name="after"><s:text name="about.version.number"/></s:param>
</c1:data>
<c1:data label="%{getText('about.buildnumber.label')}">
- <ww:param name="after"><ww:text name="about.buildnumber"/></ww:param>
+ <s:param name="after"><s:text name="about.buildnumber"/></s:param>
</c1:data>
</table>
</div>
</div>
</body>
- </ww:i18n>
+ </s:i18n>
</html>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp Wed Oct 22 22:05:36 2008
@@ -18,64 +18,64 @@
--%>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="continuum" prefix="c1" %>
-<ww:i18n name="localization.Continuum">
+<s:i18n name="localization.Continuum">
<html>
<head>
- <title><ww:text name="add.m1.project.page.title"/></title>
+ <title><s:text name="add.m1.project.page.title"/></title>
</head>
<body>
<div class="app">
<div id="axial" class="h3">
- <h3><ww:text name="add.m1.project.section.title"/></h3>
+ <h3><s:text name="add.m1.project.section.title"/></h3>
<div class="axial">
- <ww:form method="post" action="addMavenOneProject.action" name="addMavenOneProject" enctype="multipart/form-data">
+ <s:form method="post" action="addMavenOneProject.action" name="addMavenOneProject" enctype="multipart/form-data">
<c:if test="${!empty actionErrors}">
<div class="errormessage">
- <c:forEach items="${actionErrors}" var="actionError">
- <p><ww:text name="${actionError}"/></p>
- </c:forEach>
+ <s:iterator value="actionErrors">
+ <p><s:text name="<s:property/>" /></p>
+ </s:iterator>
</div>
</c:if>
<table>
<tbody>
- <ww:textfield label="%{getText('add.m1.project.m1PomUrl.label')}" name="m1PomUrl">
- <ww:param name="desc">
+ <s:textfield label="%{getText('add.m1.project.m1PomUrl.label')}" name="m1PomUrl">
+ <s:param name="desc">
<table cellspacing="0" cellpadding="0">
<tbody>
<tr>
- <td><ww:text name="add.m1.project.m1PomUrl.username.label"/>: </td>
+ <td><s:text name="add.m1.project.m1PomUrl.username.label"/>: </td>
<td><input type="text" name="scmUsername" size="20" id="addMavenOneProject_scmUsername"/><td>
</tr>
<tr>
- <td><ww:text name="add.m1.project.m1PomUrl.password.label"/>: </td>
+ <td><s:text name="add.m1.project.m1PomUrl.password.label"/>: </td>
<td><input type="password" name="scmPassword" size="20" id="addMavenOneProject_scmPassword"/><td>
</tr>
</tbody>
<tr>
<td></td>
- <td><ww:checkbox label="%{getText('projectEdit.project.scmUseCache.label')}" name="scmUseCache"/><td>
+ <td><s:checkbox label="%{getText('projectEdit.project.scmUseCache.label')}" name="scmUseCache"/><td>
</tr>
</table>
- <p><ww:text name="add.m1.project.m1PomUrl.message"/></p>
- </ww:param>
- </ww:textfield>
- <ww:label>
- <ww:param name="after"><strong><ww:text name="or"/></strong></ww:param>
- </ww:label>
- <ww:file label="%{getText('add.m1.project.m1PomFile.label')}" name="m1PomFile">
- <ww:param name="desc"><p><ww:text name="add.m1.project.m1PomFile.message"/></p></ww:param>
- </ww:file>
- <ww:if test="disableGroupSelection == true">
- <ww:hidden name="selectedProjectGroup"/>
- <ww:hidden name="disableGroupSelection"/>
- <ww:textfield label="%{getText('add.m1.project.projectGroup')}" name="projectGroupName" disabled="true"/>
- </ww:if>
- <ww:else>
- <ww:select label="%{getText('add.m1.project.projectGroup')}" name="selectedProjectGroup" list="projectGroups" listKey="id" listValue="name"/>
- </ww:else>
- <ww:select label="%{getText('add.m1.project.buildDefinitionTemplate')}" name="buildDefinitionTemplateId"
+ <p><s:text name="add.m1.project.m1PomUrl.message"/></p>
+ </s:param>
+ </s:textfield>
+ <s:label>
+ <s:param name="after"><strong><s:text name="or"/></strong></s:param>
+ </s:label>
+ <s:file label="%{getText('add.m1.project.m1PomFile.label')}" name="m1PomFile">
+ <s:param name="desc"><p><s:text name="add.m1.project.m1PomFile.message"/></p></s:param>
+ </s:file>
+ <s:if test="disableGroupSelection == true">
+ <s:hidden name="selectedProjectGroup"/>
+ <s:hidden name="disableGroupSelection"/>
+ <s:textfield label="%{getText('add.m1.project.projectGroup')}" name="projectGroupName" disabled="true"/>
+ </s:if>
+ <s:else>
+ <s:select label="%{getText('add.m1.project.projectGroup')}" name="selectedProjectGroup" list="projectGroups" listKey="id" listValue="name"/>
+ </s:else>
+ <s:select label="%{getText('add.m1.project.buildDefinitionTemplate')}" name="buildDefinitionTemplateId"
list="buildDefinitionTemplates" listKey="id" listValue="name" headerKey="-1"
headerValue="%{getText('add.m1.project.defaultBuildDefinition')}"/>
</tbody>
@@ -83,10 +83,10 @@
<div class="functnbar3">
<c1:submitcancel value="%{getText('add')}" cancel="%{getText('cancel')}"/>
</div>
- </ww:form>
+ </s:form>
</div>
</div>
</div>
</body>
</html>
-</ww:i18n>
+</s:i18n>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp Wed Oct 22 22:05:36 2008
@@ -18,26 +18,24 @@
--%>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="continuum" prefix="c1" %>
-<ww:i18n name="localization.Continuum">
+<s:i18n name="localization.Continuum">
<html>
<head>
- <title><ww:text name="add.m2.project.page.title"/></title>
+ <title><s:text name="add.m2.project.page.title"/></title>
</head>
<body>
<div class="app">
<div id="axial" class="h3">
- <h3><ww:text name="add.m2.project.section.title"/></h3>
+ <h3><s:text name="add.m2.project.section.title"/></h3>
<div class="axial">
- <ww:form method="post" action="addMavenTwoProject.action" name="addMavenTwoProject" enctype="multipart/form-data">
+ <s:form method="post" action="addMavenTwoProject.action" name="addMavenTwoProject" enctype="multipart/form-data">
<c:if test="${!empty actionErrors || !empty errorMessages}">
<div class="errormessage">
- <c:forEach items="${actionErrors}" var="actionError">
- <p>
- <ww:text name="${actionError}">${actionError}</ww:text>
- </p>
- </c:forEach>
+ <s:iterator value="actionErrors">
+ <p><s:text name="<s:property/>">${actionError}</s:text></p>
+ </s:iterator>
<c:forEach items="${errorMessages}" var="errorMessage">
<p>${errorMessage}</p>
</c:forEach>
@@ -45,44 +43,44 @@
</c:if>
<table>
<tbody>
- <ww:textfield label="%{getText('add.m2.project.m2PomUrl.label')}" name="m2PomUrl">
- <ww:param name="desc">
+ <s:textfield label="%{getText('add.m2.project.m2PomUrl.label')}" name="m2PomUrl">
+ <s:param name="desc">
<table cellspacing="0" cellpadding="0">
<tbody>
<tr>
- <td><ww:text name="add.m2.project.m2PomUrl.username.label"/>: </td>
+ <td><s:text name="add.m2.project.m2PomUrl.username.label"/>: </td>
<td><input type="text" name="scmUsername" size="20" id="addMavenTwoProject_scmUsername"/><td>
</tr>
<tr>
- <td><ww:text name="add.m2.project.m2PomUrl.password.label"/>: </td>
+ <td><s:text name="add.m2.project.m2PomUrl.password.label"/>: </td>
<td><input type="password" name="scmPassword" size="20" id="addMavenTwoProject_scmPassword"/><td>
</tr>
</tbody>
<tr>
<td></td>
- <td><ww:checkbox label="%{getText('projectEdit.project.scmUseCache.label')}" name="scmUseCache"/><td>
+ <td><s:checkbox label="%{getText('projectEdit.project.scmUseCache.label')}" name="scmUseCache"/><td>
</tr>
</table>
- <p><ww:text name="add.m2.project.m2PomUrl.message"/></p>
- </ww:param>
- </ww:textfield>
- <ww:label>
- <ww:param name="after"><strong><ww:text name="or"/></strong></ww:param>
- </ww:label>
- <ww:file label="%{getText('add.m2.project.m2PomFile.label')}" name="m2PomFile">
- <ww:param name="desc"><p><ww:text name="add.m2.project.m2PomFile.message"/></p></ww:param>
- </ww:file>
- <ww:if test="disableGroupSelection == true">
- <ww:hidden name="selectedProjectGroup"/>
- <ww:hidden name="disableGroupSelection"/>
- <ww:textfield label="%{getText('add.m2.project.projectGroup')}" name="projectGroupName" disabled="true"/>
- </ww:if>
- <ww:else>
- <ww:select label="%{getText('add.m2.project.projectGroup')}" name="selectedProjectGroup"
+ <p><s:text name="add.m2.project.m2PomUrl.message"/></p>
+ </s:param>
+ </s:textfield>
+ <s:label>
+ <s:param name="after"><strong><s:text name="or"/></strong></s:param>
+ </s:label>
+ <s:file label="%{getText('add.m2.project.m2PomFile.label')}" name="m2PomFile">
+ <s:param name="desc"><p><s:text name="add.m2.project.m2PomFile.message"/></p></s:param>
+ </s:file>
+ <s:if test="disableGroupSelection == true">
+ <s:hidden name="selectedProjectGroup"/>
+ <s:hidden name="disableGroupSelection"/>
+ <s:textfield label="%{getText('add.m2.project.projectGroup')}" name="projectGroupName" disabled="true"/>
+ </s:if>
+ <s:else>
+ <s:select label="%{getText('add.m2.project.projectGroup')}" name="selectedProjectGroup"
list="projectGroups" listKey="id" listValue="name"/>
- </ww:else>
- <ww:checkbox label="%{getText('add.m2.project.nonRecursiveProject')}" name="nonRecursiveProject" />
- <ww:select label="%{getText('add.m2.project.buildDefinitionTemplate')}" name="buildDefinitionTemplateId"
+ </s:else>
+ <s:checkbox label="%{getText('add.m2.project.nonRecursiveProject')}" name="nonRecursiveProject" />
+ <s:select label="%{getText('add.m2.project.buildDefinitionTemplate')}" name="buildDefinitionTemplateId"
list="buildDefinitionTemplates" listKey="id" listValue="name" headerKey="-1"
headerValue="%{getText('add.m2.project.defaultBuildDefinition')}"/>
</tbody>
@@ -90,10 +88,10 @@
<div class="functnbar3">
<c1:submitcancel value="%{getText('add')}" cancel="%{getText('cancel')}"/>
</div>
- </ww:form>
+ </s:form>
</div>
</div>
</div>
</body>
</html>
-</ww:i18n>
+</s:i18n>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp Wed Oct 22 22:05:36 2008
@@ -17,83 +17,83 @@
~ under the License.
--%>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<ww:i18n name="localization.Continuum">
+<s:i18n name="localization.Continuum">
<html>
<head>
<title>
- <ww:if test="projectType == \"shell\"">
- <ww:text name="add.shell.project.page.title"/>
- </ww:if>
- <ww:else>
- <ww:text name="add.ant.project.page.title"/>
- </ww:else>
+ <s:if test="projectType == \"shell\"">
+ <s:text name="add.shell.project.page.title"/>
+ </s:if>
+ <s:else>
+ <s:text name="add.ant.project.page.title"/>
+ </s:else>
</title>
</head>
<body>
<div class="app">
<div id="axial" class="h3">
<h3>
- <ww:if test="projectType == \"shell\"">
- <ww:text name="add.shell.project.section.title"/>
- </ww:if>
- <ww:else>
- <ww:text name="add.ant.project.section.title"/>
- </ww:else>
+ <s:if test="projectType == \"shell\"">
+ <s:text name="add.shell.project.section.title"/>
+ </s:if>
+ <s:else>
+ <s:text name="add.ant.project.section.title"/>
+ </s:else>
</h3>
<div class="axial">
- <ww:form method="post" action="addProject" validate="true">
+ <s:form method="post" action="addProject" validate="true">
<c:if test="${!empty actionErrors}">
<div class="errormessage">
- <c:forEach items="${actionErrors}" var="actionError">
- <p><ww:text name="${actionError}"/></p>
- </c:forEach>
+ <s:iterator value="actionErrors">
+ <p><s:text name="<s:property/>" /></p>
+ </s:iterator>
</div>
</c:if>
<table>
<tbody>
- <ww:textfield label="%{getText('projectName.label')}" name="projectName" required="true">
- <ww:param name="desc"><p><ww:text name="projectName.message"/></p></ww:param>
- </ww:textfield>
- <ww:textfield label="%{getText('projectVersion.label')}" name="projectVersion" required="true">
- <ww:param name="desc"><p><ww:text name="projectVersion.message"/></p></ww:param>
- </ww:textfield>
- <ww:textfield label="%{getText('projectScmUrl.label')}" name="projectScmUrl" required="true">
- <ww:param name="desc"><p><ww:text name="projectScmUrl.message"/></p></ww:param>
- </ww:textfield>
- <ww:textfield label="%{getText('projectScmUsername.label')}" name="projectScmUsername">
- <ww:param name="desc"><p><ww:text name="projectScmUsername.message"/></p></ww:param>
- </ww:textfield>
- <ww:password label="%{getText('projectScmPassword.label')}" name="projectScmPassword">
- <ww:param name="desc"><p><ww:text name="projectScmPassword.message"/></p></ww:param>
- </ww:password>
- <ww:textfield label="%{getText('projectScmTag.label')}" name="projectScmTag">
- <ww:param name="desc"><p><ww:text name="projectScmTag.message"/></p></ww:param>
- </ww:textfield>
- <ww:checkbox label="%{getText('projectScmUseCache.label')}" name="projectScmUseCache"/>
- <ww:if test="disableGroupSelection == true">
- <ww:hidden name="selectedProjectGroup"/>
- <ww:hidden name="disableGroupSelection"/>
- <ww:textfield label="%{getText('projectGroup.name.label')}" name="projectGroupName" disabled="true"/>
- </ww:if>
- <ww:else>
- <ww:select label="%{getText('projectGroup.name.label')}" name="selectedProjectGroup" list="projectGroups" listKey="id" listValue="name"/>
- </ww:else>
- <ww:select label="%{getText('add.project.buildDefinitionTemplate')}" name="buildDefinitionTemplateId"
+ <s:textfield label="%{getText('projectName.label')}" name="projectName" required="true">
+ <s:param name="desc"><p><s:text name="projectName.message"/></p></s:param>
+ </s:textfield>
+ <s:textfield label="%{getText('projectVersion.label')}" name="projectVersion" required="true">
+ <s:param name="desc"><p><s:text name="projectVersion.message"/></p></s:param>
+ </s:textfield>
+ <s:textfield label="%{getText('projectScmUrl.label')}" name="projectScmUrl" required="true">
+ <s:param name="desc"><p><s:text name="projectScmUrl.message"/></p></s:param>
+ </s:textfield>
+ <s:textfield label="%{getText('projectScmUsername.label')}" name="projectScmUsername">
+ <s:param name="desc"><p><s:text name="projectScmUsername.message"/></p></s:param>
+ </s:textfield>
+ <s:password label="%{getText('projectScmPassword.label')}" name="projectScmPassword">
+ <s:param name="desc"><p><s:text name="projectScmPassword.message"/></p></s:param>
+ </s:password>
+ <s:textfield label="%{getText('projectScmTag.label')}" name="projectScmTag">
+ <s:param name="desc"><p><s:text name="projectScmTag.message"/></p></s:param>
+ </s:textfield>
+ <s:checkbox label="%{getText('projectScmUseCache.label')}" name="projectScmUseCache"/>
+ <s:if test="disableGroupSelection == true">
+ <s:hidden name="selectedProjectGroup"/>
+ <s:hidden name="disableGroupSelection"/>
+ <s:textfield label="%{getText('projectGroup.name.label')}" name="projectGroupName" disabled="true"/>
+ </s:if>
+ <s:else>
+ <s:select label="%{getText('projectGroup.name.label')}" name="selectedProjectGroup" list="projectGroups" listKey="id" listValue="name"/>
+ </s:else>
+ <s:select label="%{getText('add.project.buildDefinitionTemplate')}" name="buildDefinitionTemplateId"
list="buildDefinitionTemplates" listKey="id" listValue="name" headerKey="-1"
headerValue="%{getText('add.project.defaultBuildDefinition')}"/>
</tbody>
</table>
- <input type="hidden" name="projectType" value="<ww:property value="projectType"/>">
+ <input type="hidden" name="projectType" value="<s:property value="projectType"/>">
<div class="functnbar3">
<c1:submitcancel value="%{getText('add')}" cancel="%{getText('cancel')}"/>
</div>
- </ww:form>
+ </s:form>
</div>
</div>
</div>
</body>
</html>
-</ww:i18n>
+</s:i18n>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp Wed Oct 22 22:05:36 2008
@@ -17,20 +17,20 @@
~ under the License.
--%>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib uri="continuum" prefix="c1" %>
<html>
<head>
<title>Configure Appearance</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<h1>Appearance</h1>
<div style="float: right">
- <a href="<ww:url action='editAppearance' />">Edit</a>
+ <a href="<s:url action='editAppearance' />">Edit</a>
</div>
<h2>Company Details</h2>
@@ -38,31 +38,31 @@
The logo in the top right of the screen is controlled by your selected 'company POM'.
</p>
-<ww:set name="companyPom" value="companyPom"/>
+<s:set name="companyPom" value="companyPom"/>
<c:if test="${empty (companyPom.groupId) || empty (companyPom.artifactId)}">
<p>
- You have not yet specified a company POM. <a href="<ww:url action='editAppearance' />">Select a Company POM</a>
+ You have not yet specified a company POM. <a href="<s:url action='editAppearance' />">Select a Company POM</a>
</p>
</c:if>
<c:if test="${!empty (companyPom.groupId) && !empty (companyPom.artifactId)}">
<p>
Your selected company POM is below. If you would like to change the organization name, url or logo, you can
- <a href="<ww:url action='editCompanyPom'/>">edit the POM</a>.
+ <a href="<s:url action='editCompanyPom'/>">edit the POM</a>.
</p>
- <ww:set name="companyModel" value="companyModel"/>
+ <s:set name="companyModel" value="companyModel"/>
<table>
- <ww:label name="companyPom.groupId" label="Group ID"/>
- <ww:label name="companyPom.artifactId" label="Artifact ID"/>
+ <s:label name="companyPom.groupId" label="Group ID"/>
+ <s:label name="companyPom.artifactId" label="Artifact ID"/>
<c:if test="${companyModel != null}">
- <ww:label name="companyModel.version" label="Version"/>
+ <s:label name="companyModel.version" label="Version"/>
</c:if>
</table>
<div style="float: right">
- <a href="<ww:url action='editCompanyPom' />">Edit Company POM</a>
+ <a href="<s:url action='editCompanyPom' />">Edit Company POM</a>
</div>
<h3>POM Information</h3>
@@ -89,17 +89,17 @@
</c:when>
<c:otherwise>
Company POM '${companyPom.groupId}:${companyPom.artifactId}' doesn't exist.
- <a href="<ww:url action='editCompanyPom' />">Create company POM</a>
+ <a href="<s:url action='editCompanyPom' />">Create company POM</a>
</c:otherwise>
</c:choose>
</c:if>
-<ww:form action="saveFooter!saveFooter.action" method="get" namespace="/admin">
+<s:form action="saveFooter!saveFooter.action" method="get" namespace="/admin">
<div id="axial" class="h3">
<h3>footer content</h3>
<div class="axial">
<table>
<tbody>
- <ww:textarea cols="120" rows="3" label="HTML Content" name="footer" />
+ <s:textarea cols="120" rows="3" label="HTML Content" name="footer" />
</tbody>
</table>
<div class="functnbar3">
@@ -107,7 +107,7 @@
</div>
</div>
</div>
-</ww:form>
+</s:form>
</body>
</html>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp Wed Oct 22 22:05:36 2008
@@ -18,21 +18,21 @@
--%>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<html>
- <ww:i18n name="localization.Continuum">
+ <s:i18n name="localization.Continuum">
<head>
- <title><ww:text name="buildDefinition.templates.page.title"/></title>
+ <title><s:text name="buildDefinition.templates.page.title"/></title>
</head>
<body>
<div>
<h3>
- <ww:text name="buildDefinition.templates.section.title"/>
+ <s:text name="buildDefinition.templates.section.title"/>
</h3>
<ec:table items="templates"
var="template"
@@ -44,32 +44,32 @@
<ec:row>
<ec:column property="name" title="buildDefinition.template.name"/>
<ec:column property="editAction" title=" " width="1%">
- <ww:url id="editUrl" action="editBuildDefinitionTemplate" method="edit" namespace="/">
- <ww:param name="buildDefinitionTemplate.id">${pageScope.template.id}</ww:param>
- </ww:url>
- <ww:a href="%{editUrl}"><img src="<ww:url value='/images/edit.gif' includeParams="none"/>" alt="<ww:text name='edit'/>" title="<ww:text name='edit'/>" border="0"></ww:a>
+ <s:url id="editUrl" action="editBuildDefinitionTemplate" method="edit" namespace="/">
+ <s:param name="buildDefinitionTemplate.id">${pageScope.template.id}</s:param>
+ </s:url>
+ <s:a href="%{editUrl}"><img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0"></s:a>
</ec:column>
<!-- TODO list attached buildDefs -->
<ec:column property="deleteAction" title=" " width="1%">
- <ww:if test="${template.continuumDefault == true}">
- <img src="<ww:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<ww:text name='disabled'/>" title="<ww:text name='disabled'/>" border="0" />
- </ww:if>
- <ww:else>
- <ww:url id="deleteUrl" action="deleteDefinitionTemplate" method="delete" namespace="/">
- <ww:param name="buildDefinitionTemplate.id">${pageScope.template.id}</ww:param>
- </ww:url>
- <ww:a href="%{deleteUrl}"><img src="<ww:url value='/images/delete.gif' includeParams="none"/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0"></ww:a>
- </ww:else>
+ <s:if test="${template.continuumDefault == true}">
+ <img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='disabled'/>" title="<s:text name='disabled'/>" border="0" />
+ </s:if>
+ <s:else>
+ <s:url id="deleteUrl" action="deleteDefinitionTemplate" method="delete" namespace="/">
+ <s:param name="buildDefinitionTemplate.id">${pageScope.template.id}</s:param>
+ </s:url>
+ <s:a href="%{deleteUrl}"><img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"></s:a>
+ </s:else>
</ec:column>
</ec:row>
</ec:table>
<div class="functnbar3">
- <ww:form action="buildDefinitionTemplate!input.action" method="post">
- <ww:submit value="%{getText('add')}"/>
- </ww:form>
+ <s:form action="buildDefinitionTemplate!input.action" method="post">
+ <s:submit value="%{getText('add')}"/>
+ </s:form>
</div>
<h3>
- <ww:text name="buildDefinition.templates.buildDefinitions.section.title"/>
+ <s:text name="buildDefinition.templates.buildDefinitions.section.title"/>
</h3>
<ec:table items="buildDefinitionSummaries"
var="buildDefinitionSummary"
@@ -90,32 +90,32 @@
<ec:column property="description" title="buildDefinition.template.buildDefinition.description"/>
<ec:column property="type" title="buildDefinition.template.buildDefinition.type"/>
<ec:column property="editAction" title=" " width="1%">
- <ww:url id="editUrl" action="editBuildDefinitionAsTemplate" method="editBuildDefinition" namespace="/">
- <ww:param name="buildDefinition.id">${pageScope.buildDefinitionSummary.id}</ww:param>
- </ww:url>
- <ww:a href="%{editUrl}"><img src="<ww:url value='/images/edit.gif' includeParams="none"/>" alt="<ww:text name='edit'/>" title="<ww:text name='edit'/>" border="0"></ww:a>
+ <s:url id="editUrl" action="editBuildDefinitionAsTemplate" method="editBuildDefinition" namespace="/">
+ <s:param name="buildDefinition.id">${pageScope.buildDefinitionSummary.id}</s:param>
+ </s:url>
+ <s:a href="%{editUrl}"><img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0"></s:a>
</ec:column>
<ec:column property="deleteAction" title=" " width="1%">
- <ww:if test="${buildDefinitionSummary.isDefault == true}">
- <img src="<ww:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<ww:text name='disabled'/>" title="<ww:text name='disabled'/>" border="0" />
- </ww:if>
- <ww:else>
- <ww:url id="deleteUrl" action="deleteBuildDefinitionAsTemplate" method="deleteBuildDefinition" namespace="/">
- <ww:param name="buildDefinition.id">${pageScope.buildDefinitionSummary.id}</ww:param>
- </ww:url>
- <ww:a href="%{deleteUrl}"><img src="<ww:url value='/images/delete.gif' includeParams="none"/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0"></ww:a>
- </ww:else>
+ <s:if test="${buildDefinitionSummary.isDefault == true}">
+ <img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='disabled'/>" title="<s:text name='disabled'/>" border="0" />
+ </s:if>
+ <s:else>
+ <s:url id="deleteUrl" action="deleteBuildDefinitionAsTemplate" method="deleteBuildDefinition" namespace="/">
+ <s:param name="buildDefinition.id">${pageScope.buildDefinitionSummary.id}</s:param>
+ </s:url>
+ <s:a href="%{deleteUrl}"><img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"></s:a>
+ </s:else>
</ec:column>
</ec:row>
</ec:table>
<div class="functnbar3">
- <ww:form action="buildDefinitionAsTemplate!inputBuildDefinition.action" method="post">
- <ww:submit value="%{getText('add')}"/>
- </ww:form>
+ <s:form action="buildDefinitionAsTemplate!inputBuildDefinition.action" method="post">
+ <s:submit value="%{getText('add')}"/>
+ </s:form>
</div>
</div>
</body>
- </ww:i18n>
+ </s:i18n>
</html>
\ No newline at end of file