You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ep...@apache.org on 2006/09/21 02:12:33 UTC
svn commit: r448412 [3/4] - in
/maven/continuum/branches/release-integration/continuum: ./ continuum-api/
continuum-api/src/main/java/org/apache/maven/continuum/execution/
continuum-api/src/main/java/org/apache/maven/continuum/project/builder/
continuu...
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java Wed Sep 20 17:12:28 2006
@@ -16,6 +16,7 @@
* limitations under the License.
*/
+import org.apache.maven.continuum.project.ContinuumProjectState;
import org.apache.maven.continuum.web.model.ProjectSummary;
import org.extremecomponents.table.bean.Column;
import org.extremecomponents.table.cell.DisplayCell;
@@ -36,17 +37,43 @@
String contextPath = tableModel.getContext().getContextPath();
- if ( !project.isInQueue() && ( project.getState() == 1 || project.getState() == 2 || project.getState() == 3 ||
- project.getState() == 4 ) )
+ if ( project.isInQueue() )
{
- return "<a href=\"" + contextPath + "/buildProject.action?projectId=" + project.getId() + "\"><img src=\"" +
- contextPath +
- "/images/buildnow.gif\" alt=\"Build Now\" title=\"Build Now\" border=\"0\"></a>";
+ return image( contextPath, "In Queue", "buildnow_disabled.gif" );
}
- else
+
+ switch ( project.getState() )
{
- return "<img src=\"" + contextPath +
- "/images/buildnow_disabled.gif\" alt=\"Build Now\" title=\"Build Now\" border=\"0\">";
+ case ContinuumProjectState.NEW:
+ case ContinuumProjectState.OK:
+ case ContinuumProjectState.FAILED:
+ case ContinuumProjectState.ERROR:
+ {
+ return createActionLink( contextPath, project, "buildProject", "Build Now", "buildnow.gif" );
+ }
+
+ case ContinuumProjectState.BUILDING:
+ {
+ return createActionLink( contextPath, project, "cancelBuild", "Cancel Build", "cancelbuild.gif" );
+ }
+
+ default:
+ {
+ return image( contextPath, "Build Now", "buildnow_disabled.gif" );
+ }
}
+ }
+
+ private static String createActionLink( String contextPath, ProjectSummary project, String action, String label,
+ String image )
+ {
+ return "<a href='" + contextPath + "/" + action + ".action?projectId=" + project.getId() + "'>"
+ + image( contextPath, label, image ) + "</a>";
+ }
+
+ private static String image( String contextPath, String label, String image )
+ {
+ return "<img src='" + contextPath + "/images/" + image + "' alt=' " + label + "' title='" + image
+ + "' border='0' />";
}
}
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java Wed Sep 20 17:12:28 2006
@@ -18,6 +18,8 @@
import com.opensymphony.webwork.ServletActionContext;
import com.opensymphony.webwork.views.util.UrlHelper;
+
+import org.apache.maven.continuum.project.ContinuumProjectState;
import org.apache.maven.continuum.web.model.ProjectSummary;
import org.apache.maven.continuum.web.util.StateGenerator;
import org.extremecomponents.table.bean.Column;
@@ -39,35 +41,48 @@
{
ProjectSummary project = (ProjectSummary) tableModel.getCurrentRowBean();
- int latestBuildId = project.getLatestBuildId();
+ switch ( project.getState() )
+ {
+ case ContinuumProjectState.NEW:
+ case ContinuumProjectState.OK:
+ case ContinuumProjectState.FAILED:
+ case ContinuumProjectState.ERROR:
+ case ContinuumProjectState.BUILDING:
+ {
+ String state = StateGenerator.generate( project.getState(), tableModel.getContext().getContextPath() );
- String state = StateGenerator.generate( project.getState(), tableModel.getContext().getContextPath() );
+ if ( project.getLatestBuildId() != -1 && !StateGenerator.NEW.equals( state ) )
+ {
+ return createActionLink( "buildResult", project, state );
+ }
+ else
+ {
+ return state;
+ }
+ }
- if ( project.getState() == 1 || project.getState() == 2 || project.getState() == 3 || project.getState() == 4 )
- {
- if ( latestBuildId != -1 && !StateGenerator.NEW.equals( state ) )
+ default:
{
- HashMap params = new HashMap();
+ return " ";
+ }
+ }
+ }
- params.put( "projectId", new Integer( project.getId() ) );
+ private static String createActionLink( String action, ProjectSummary project, String state )
+ {
+ HashMap params = new HashMap();
- params.put( "projectName", project.getName() );
+ params.put( "projectId", new Integer( project.getId() ) );
- params.put( "buildId", new Integer( latestBuildId ) );
+ params.put( "projectName", project.getName() );
- String url = UrlHelper.buildUrl( "/buildResult.action", ServletActionContext.getRequest(),
- ServletActionContext.getResponse(), params );
+ params.put( "buildId", new Integer( project.getLatestBuildId() ) );
- return "<a href=\"" + url + "\">" + state + "</a>";
- }
- else
- {
- return state;
- }
- }
- else
- {
- return " ";
- }
+ String url = UrlHelper.buildUrl( "/" + action + ".action",
+ ServletActionContext.getRequest(),
+ ServletActionContext.getResponse(),
+ params );
+
+ return "<a href=\"" + url + "\">" + state + "</a>";
}
}
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/IfAuthorizedTag.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/IfAuthorizedTag.java?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/IfAuthorizedTag.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/IfAuthorizedTag.java Wed Sep 20 17:12:28 2006
@@ -1,5 +1,9 @@
package org.apache.maven.continuum.web.view.jsp.ui;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.codehaus.plexus.xwork.PlexusLifecycleListener;
+
import com.opensymphony.xwork.ActionContext;
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
@@ -47,9 +51,11 @@
{
ActionContext context = ActionContext.getContext();
+ PlexusContainer container = (PlexusContainer)context.getApplication().get( PlexusLifecycleListener.KEY ) ;
+
try
{
- Continuum continuum = (Continuum) context.getSession().get( "continuum" );
+ Continuum continuum = (Continuum) container.lookup( Continuum.ROLE );
if ( continuum != null )
{
@@ -61,6 +67,10 @@
{
throw new JspTagException("continuum object is null!");
}
+ }
+ catch ( ComponentLookupException cle)
+ {
+ throw new JspTagException( "unable to locate " + Continuum.ROLE, cle);
}
catch ( ContinuumException e )
{
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/xmlrpc/DefaultXmlRpcService.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/xmlrpc/DefaultXmlRpcService.java?view=diff&rev=448412&r1=448139&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/xmlrpc/DefaultXmlRpcService.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/xmlrpc/DefaultXmlRpcService.java Wed Sep 20 17:12:28 2006
@@ -26,7 +26,7 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
+ * @version $Id: DefaultXmlRpcService.java 442611 2006-09-12 14:57:31Z evenisse $
*/
public class DefaultXmlRpcService
extends AbstractLogEnabled
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/xmlrpc/XmlRpcService.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/xmlrpc/XmlRpcService.java?view=diff&rev=448412&r1=448139&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/xmlrpc/XmlRpcService.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/xmlrpc/XmlRpcService.java Wed Sep 20 17:12:28 2006
@@ -18,7 +18,7 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
+ * @version $Id: XmlRpcService.java 442611 2006-09-12 14:57:31Z evenisse $
*/
public interface XmlRpcService
{
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Wed Sep 20 17:12:28 2006
@@ -12,6 +12,9 @@
<role-hint>check-out-project</role-hint>
</component>
<component>
+ <role>org.apache.maven.continuum.web.xmlrpc.XmlRpcService</role>
+ </component>
+ <component>
<role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
<role-hint>prepare-release</role-hint>
</component>
@@ -23,6 +26,29 @@
<components>
<!--
+ | The XML-RPC service
+ |-->
+ <component>
+ <role>org.apache.maven.continuum.web.xmlrpc.XmlRpcService</role>
+ <implementation>org.apache.maven.continuum.web.xmlrpc.DefaultXmlRpcService</implementation>
+ <description></description>
+ <requirements>
+ <requirement>
+ <role>org.codehaus.plexus.xmlrpc.XmlRpcServer</role>
+ <field-name>xmlRpcServer</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.continuum.xmlrpc.ContinuumXmlRpc</role>
+ <field-name>handler</field-name>
+ </requirement>
+ </requirements>
+ <configuration>
+ <port>8000</port>
+ <handler-name>continuum</handler-name>
+ </configuration>
+ </component>
+
+ <!--
| The mail notifier
|-->
<component>
@@ -171,12 +197,50 @@
<implementation>org.codehaus.plexus.msn.DefaultMsnClient</implementation>
</component>
+ <!--
+ | Velocity component used by the mail notifier
+ |-->
+ <component>
+ <role>org.codehaus.plexus.velocity.VelocityComponent</role>
+ <implementation>org.codehaus.plexus.velocity.DefaultVelocityComponent</implementation>
+ <configuration>
+ <properties>
+ <property>
+ <name>resource.loader</name>
+ <value>threadContext</value>
+ </property>
+ <property>
+ <name>threadContext.resource.loader.class</name>
+ <value>org.codehaus.plexus.velocity.ContextClassLoaderResourceLoader</value>
+ </property>
+ <property>
+ <name>velocimacro.library</name>
+ <value>org/apache/maven/continuum/notification/mail/templates/common.vm</value>
+ </property>
+ </properties>
+ </configuration>
+ </component>
+
<component>
<role>org.apache.maven.continuum.web.util.WorkingCopyContentGenerator</role>
<implementation>org.apache.maven.continuum.web.util.WorkingCopyContentGenerator</implementation>
</component>
<component>
+ <role>org.codehaus.plexus.formica.validation.Validator</role>
+ <role-hint>url</role-hint>
+ <implementation>org.codehaus.plexus.formica.validation.UrlValidator</implementation>
+ <configuration>
+ <allowedSchemes>
+ <allowedScheme>http</allowedScheme>
+ <allowedScheme>https</allowedScheme>
+ <allowedScheme>ftp</allowedScheme>
+ <!-- <allowedScheme>file</allowedScheme> -->
+ </allowedSchemes>
+ </configuration>
+ </component>
+
+ <component>
<role>org.codehaus.plexus.jdo.JdoFactory</role>
<implementation>org.codehaus.plexus.jdo.DefaultJdoFactory</implementation>
<configuration>
@@ -191,6 +255,20 @@
<value>true</value>
</property>
<property>
+ <name>org.jpox.validateTables</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>org.jpox.validateColumns</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>org.jpox.validateConstraints</name>
+ <value>false</value>
+ </property>
+
+<!--
+ <property>
<name>org.jpox.autoStartMechanism</name>
<value>SchemaTable</value>
</property>
@@ -198,6 +276,7 @@
<name>org.jpox.autoStartMechanismMode</name>
<value>Ignored</value>
</property>
+-->
<!-- Apache Derby Configuration -->
<property>
<name>javax.jdo.option.ConnectionDriverName</name>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/localization/Continuum.properties?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/localization/Continuum.properties Wed Sep 20 17:12:28 2006
@@ -116,7 +116,7 @@
add.project.missing.repository.error = Missing 'repository' element in the POM.
add.project.missing.scm.error = Missing 'scm' element in the POM.
add.project.missing.scm.connection.error = Missing 'connection' sub-element in the 'scm' element in the POM.
-add.project.missing.notifier.type.error = Missing 'type' sub-element in the 'notifier' element in the POM.
+add.project.missing.notifier.type.error = Missing 'type' sub-element in the 'notifier' element in the POM.
add.project.missing.notifier.configuration.error = Missing 'configuration' sub-element in the 'notifier' element in the POM.
add.project.metadata.transfer.error = Transfer of Metadata has failed.
add.project.unknown.error = The specified resource cannot be accessed. Please try again later or contact your administrator.
@@ -333,6 +333,7 @@
schedules.table.description = Description
schedules.table.delay = Quiet Period
schedules.table.cronExpression = Cron Expression
+schedules.table.maxJobExecutionTime = Max Job Time
# ----------------------------------------------------------------------
# Page: Add/EditSchedule
@@ -348,10 +349,19 @@
schedule.description.message = Enter a description of the schedule
schedule.cronExpression.label = Cron Expression
schedule.cronExpression.message = Enter the cron expression. Format is described there : <a href="http://www.opensymphony.com/quartz/api/org/quartz/CronTrigger.html" target="_blank">Syntax<a>
+schedule.maxJobExecutionTime.label = Maximum job execution time (seconds)
+schedule.maxJobExecutionTime.message = Enter the maxmimum number of seconds a job may execute in this schedule before it's terminated.
schedule.quietPeriod.label = Quiet Period (seconds)
schedule.quietPeriod.message = Enter a quiet period period for this schedule
schedule.enabled.label = Enabled
schedule.enabled.message = Enable/Disable the schedule
+schedule.second.label = Second
+schedule.minute.label = Minute
+schedule.hour.label = Hour
+schedule.dayOfMonth.label = Day of Month
+schedule.month.label = Month
+schedule.dayOfWeek.label = Day of Week
+schedule.year.label = Year [optional]
# ----------------------------------------------------------------------
# Page: SurefireReport
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/IrcNotifierEditAction-ircNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/IrcNotifierEditAction-ircNotifierSave-validation.xml?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/IrcNotifierEditAction-ircNotifierSave-validation.xml (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/IrcNotifierEditAction-ircNotifierSave-validation.xml Wed Sep 20 17:12:28 2006
@@ -2,22 +2,26 @@
"-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+<!-- TODO: there was a problem with getting the message values from the properties file so
+ the error messages were just specified here -->
<validators>
<field name="host">
<field-validator type="required">
- <message key="ircNotifier.host.required"/>
+ <message>Host is required</message>
+ <!--message key="ircNotifier.host.required"/-->
</field-validator>
</field>
<field name="port">
- <field-validator type="int">
- <param name="min">0</param>
- <param name="max">65535</param>
- <message key="ircNotifier.port.invalid"/>
+ <field-validator type="regex">
+ <param name="expression"><![CDATA[([0-9])]]></param>
+ <message>Port must be an integer</message>
+ <!--message key="ircNotifier.port.invalid"/-->
</field-validator>
</field>
<field name="channel">
<field-validator type="required">
- <message key="ircNotifier.channel.required"/>
+ <message>Channel is required</message>
+ <!--message key="ircNotifier.channel.required"/-->
</field-validator>
</field>
</validators>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/JabberNotifierEditAction-jabberNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/JabberNotifierEditAction-jabberNotifierSave-validation.xml?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/JabberNotifierEditAction-jabberNotifierSave-validation.xml (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/JabberNotifierEditAction-jabberNotifierSave-validation.xml Wed Sep 20 17:12:28 2006
@@ -2,32 +2,39 @@
"-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+<!-- TODO: there was a problem with getting the message values from the properties file so
+ the error messages were just specified here -->
+
<validators>
<field name="host">
<field-validator type="required">
- <message key="jabberNotifier.host.required"/>
+ <message>Host is required</message>
+ <!--message key="jabberNotifier.host.required"/-->
</field-validator>
</field>
<field name="port">
- <field-validator type="int">
- <param name="min">0</param>
- <param name="max">65535</param>
- <message key="jabberNotifier.port.invalid"/>
+ <field-validator type="regex">
+ <param name="expression"><![CDATA[([0-9])]]></param>
+ <message>Port must be an integer</message>
+ <!--message key="jabberNotifier.port.invalid"/-->
</field-validator>
</field>
<field name="login">
<field-validator type="required">
- <message key="jabberNotifier.login.required"/>
+ <message>Login is required</message>
+ <!--message key="jabberNotifier.login.required"/-->
</field-validator>
</field>
<field name="password">
<field-validator type="required">
- <message key="jabberNotifier.password.required"/>
+ <message>Password is required</message>
+ <!--message key="jabberNotifier.password.required"/-->
</field-validator>
</field>
<field name="address">
<field-validator type="required">
- <message key="jabberNotifier.address.required"/>
+ <message>Address is required</message>
+ <!--message key="jabberNotifier.address.required"/-->
</field-validator>
</field>
</validators>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/MailNotifierEditAction-mailNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/MailNotifierEditAction-mailNotifierSave-validation.xml?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/MailNotifierEditAction-mailNotifierSave-validation.xml (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/MailNotifierEditAction-mailNotifierSave-validation.xml Wed Sep 20 17:12:28 2006
@@ -2,10 +2,14 @@
"-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+<!-- TODO: there was a problem with getting the message values from the properties file so
+ the error messages were just specified here -->
+
<validators>
<field name="address">
<field-validator type="required">
- <message key="mailNotifier.address.required"/>
+ <message>Address is required</message>
+ <!--message key="mailNotifier.address.required"/-->
</field-validator>
</field>
</validators>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/MsnNotifierEditAction-msnNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/MsnNotifierEditAction-msnNotifierSave-validation.xml?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/MsnNotifierEditAction-msnNotifierSave-validation.xml (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/MsnNotifierEditAction-msnNotifierSave-validation.xml Wed Sep 20 17:12:28 2006
@@ -2,20 +2,26 @@
"-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+<!-- TODO: there was a problem with getting the message values from the properties file so
+ the error messages were just specified here -->
+
<validators>
<field name="login">
<field-validator type="required">
- <message key="jabberNotifier.login.required"/>
+ <message>Login is required</message>
+ <!--message key="jabberNotifier.login.required"/-->
</field-validator>
</field>
<field name="password">
<field-validator type="required">
- <message key="jabberNotifier.password.required"/>
+ <message>Password is required</message>
+ <!--message key="jabberNotifier.password.required"/-->
</field-validator>
</field>
<field name="address">
<field-validator type="required">
- <message key="jabberNotifier.address.required"/>
+ <message>Address is required</message>
+ <!--message key="jabberNotifier.address.required"/-->
</field-validator>
</field>
</validators>
Added: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectEditAction-projectSave-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectEditAction-projectSave-validation.xml?view=auto&rev=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectEditAction-projectSave-validation.xml (added)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectEditAction-projectSave-validation.xml Wed Sep 20 17:12:28 2006
@@ -0,0 +1,21 @@
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+
+<validators>
+ <field name="name">
+ <field-validator type="required">
+ <message key="projectEdit.name.required"/>
+ </field-validator>
+ </field>
+ <field name="version">
+ <field-validator type="required">
+ <message key="projectEdit.version.required"/>
+ </field-validator>
+ </field>
+ <field name="scmUrl">
+ <field-validator type="required">
+ <message key="projectEdit.scmUrl.required"/>
+ </field-validator>
+ </field>
+</validators>
Propchange: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectEditAction-projectSave-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/template/default/controlfooter.ftl
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/template/default/controlfooter.ftl?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/template/default/controlfooter.ftl (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/template/default/controlfooter.ftl Wed Sep 20 17:12:28 2006
@@ -1,3 +1,3 @@
-${parameters.after?if_exists}<#t/>
+${parameters.desc?if_exists} ${parameters.after?if_exists}<#t/>
</td><#lt/>
</tr>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/xwork.xml?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/xwork.xml Wed Sep 20 17:12:28 2006
@@ -7,10 +7,8 @@
<interceptors>
<interceptor name="exception-logging" class="exceptionLogging"/>
<interceptor name="user" class="userInterceptor"/>
- <interceptor name="continuum" class="continuumInterceptor"/>
<interceptor-stack name="defaultContinuumStack">
<interceptor-ref name="user"/>
- <interceptor-ref name="continuum"/>
<interceptor-ref name="exception-logging"/>
<!--<interceptor-ref name="defaultStack"/>-->
@@ -92,14 +90,13 @@
<result name="success">projectView.jsp</result>
</action>
- <action name="projectEdit" class="projectEdit">
- <result name="input">projectEdit.jsp</result>
- <result name="success" type="chain">projectView</result>
+ <action name="projectEdit" class="projectEdit" method="edit">
+ <result name="success">projectEdit.jsp</result>
</action>
- <action name="projectSave" class="projectEdit">
- <result name="input">projectEdit.jsp</result>
+ <action name="projectSave" class="projectEdit" method="save">
<result name="success" type="chain">projectView</result>
+ <result name="input">projectEdit.jsp</result>
</action>
<!--
@@ -133,6 +130,7 @@
<action name="removeUser" class="userManagement" method="remove">
<result name="success" type="chain">users</result>
+ <result name="confirm">confirmation.jsp</result>
</action>
<!--
@@ -152,6 +150,7 @@
<action name="removeUserGroup" class="userGroupManagement" method="remove">
<result name="success" type="chain">userGroups</result>
+ <result name="confirm">confirmation.jsp</result>
</action>
<!--
@@ -175,8 +174,8 @@
</action>
<action name="removeGroupBuildDefinition" class="buildDefinition" method="removeFromGroup">
- <result name="confirm">deleteBuildDefinition.jsp</result>
- <result name="success" type="chain">projectGroupView</result>
+ <result name="confirm">confirmBuildDefinitionRemoval.jsp</result>
+ <result name="success" type="chain">projectGroupBuildDefinition</result>
</action>
@@ -204,6 +203,7 @@
</action>
<action name="removeProjectGroup" class="projectGroup" method="remove">
+ <result name="confirm">confirmGroupRemoval.jsp</result>
<result name="success" type="chain">groupSummary</result>
</action>
@@ -223,42 +223,38 @@
<result name="jabber_input">notifierJabber.jsp</result>
</action>
- <action name="mailNotifierEdit" class="mailNotifierEdit">
- <result name="input">notifierMail.jsp</result>
- <result name="success" type="chain">projectView</result>
+ <action name="mailNotifierEdit" class="mailNotifierEdit" method="edit">
+ <result name="success">notifierMail.jsp</result>
</action>
- <action name="mailNotifierSave" class="mailNotifierEdit">
+ <action name="mailNotifierSave" class="mailNotifierEdit" method="save">
<result name="input">notifierMail.jsp</result>
<result name="success" type="chain">projectView</result>
</action>
- <action name="ircNotifierEdit" class="ircNotifierEdit">
- <result name="input">notifierIrc.jsp</result>
- <result name="success" type="chain">projectView</result>
+ <action name="ircNotifierEdit" class="ircNotifierEdit" method="edit">
+ <result name="success">notifierIrc.jsp</result>
</action>
- <action name="ircNotifierSave" class="ircNotifierEdit">
+ <action name="ircNotifierSave" class="ircNotifierEdit" method="save">
<result name="input">notifierIrc.jsp</result>
<result name="success" type="chain">projectView</result>
</action>
- <action name="jabberNotifierEdit" class="jabberNotifierEdit">
- <result name="input">notifierJabber.jsp</result>
- <result name="success" type="chain">projectView</result>
+ <action name="jabberNotifierEdit" class="jabberNotifierEdit" method="edit">
+ <result name="success">notifierJabber.jsp</result>
</action>
- <action name="jabberNotifierSave" class="jabberNotifierEdit">
+ <action name="jabberNotifierSave" class="jabberNotifierEdit" method="save">
<result name="input">notifierJabber.jsp</result>
<result name="success" type="chain">projectView</result>
</action>
- <action name="msnNotifierEdit" class="msnNotifierEdit">
- <result name="input">notifierMsn.jsp</result>
- <result name="success" type="chain">projectView</result>
+ <action name="msnNotifierEdit" class="msnNotifierEdit" method="edit">
+ <result name="success">notifierMsn.jsp</result>
</action>
- <action name="msnNotifierSave" class="msnNotifierEdit">
+ <action name="msnNotifierSave" class="msnNotifierEdit" method="save">
<result name="input">notifierMsn.jsp</result>
<result name="success" type="chain">projectView</result>
</action>
@@ -292,6 +288,15 @@
<action name="saveSchedule" class="schedule" method="save">
<result name="success" type="chain">schedules</result>
+ </action>
+
+ <action name="removeSchedule" class="schedule" method="remove">
+ <result name="confirm">confirmation.jsp</result>
+ <result name="success" type="chain">schedules</result>
+ </action>
+
+ <action name="cancelBuild" class="cancelBuild">
+ <result name="success" type="chain">buildResults</result>
</action>
<!--
Propchange: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/WEB-INF/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Sep 20 17:12:28 2006
@@ -1,4 +1,4 @@
-
database
logs
temp
+working-directory
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/WEB-INF/web.xml?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/WEB-INF/web.xml Wed Sep 20 17:12:28 2006
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4">
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>Continuum Webapp</display-name>
@@ -48,23 +50,4 @@
<listener-class>org.codehaus.plexus.xwork.PlexusLifecycleListener</listener-class>
</listener>
- <taglib>
- <taglib-uri>continuum</taglib-uri>
- <taglib-location>/WEB-INF/continuum.tld</taglib-location>
- </taglib>
-
- <taglib>
- <taglib-uri>sitemesh-page</taglib-uri>
- <taglib-location>/WEB-INF/sitemesh-page.tld</taglib-location>
- </taglib>
-
- <taglib>
- <taglib-uri>sitemesh-decorator</taglib-uri>
- <taglib-location>/WEB-INF/sitemesh-decorator.tld</taglib-location>
- </taglib>
-
- <taglib>
- <taglib-uri>/tld/extremecomponents</taglib-uri>
- <taglib-location>/WEB-INF/extremecomponents.tld</taglib-location>
- </taglib>
</web-app>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/addMavenOneProject.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/addMavenOneProject.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/addMavenOneProject.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/addMavenOneProject.jsp Wed Sep 20 17:12:28 2006
@@ -24,9 +24,9 @@
<ww:textfield label="%{getText('add.m1.project.m1PomUrl.label')}" name="m1PomUrl">
<ww:param name="desc"><p><ww:text name="add.m1.project.m1PomUrl.message"/></p></ww:param>
</ww:textfield>
- <c1:data label="">
- <ww:param name="after"><strong><ww:text name="or"/></strong></ww:param>
- </c1:data>
+ <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>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp Wed Sep 20 17:12:28 2006
@@ -24,9 +24,9 @@
<ww:textfield label="%{getText('add.m2.project.m2PomUrl.label')}" name="m2PomUrl">
<ww:param name="desc"><p><ww:text name="add.m2.project.m2PomUrl.message"/></p></ww:param>
</ww:textfield>
- <c1:data label="">
- <ww:param name="after"><strong><ww:text name="or"/></strong></ww:param>
- </c1:data>
+ <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>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/buildResult.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/buildResult.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/buildResult.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/buildResult.jsp Wed Sep 20 17:12:28 2006
@@ -1,5 +1,5 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib prefix="c1" uri="continuum" %>
<html>
@@ -11,9 +11,9 @@
<div id="h3">
<div>
<p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
- <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="<ww:url value="/projectView.action?projectId="/><ww:property value="projectId"/>&projectName=<ww:property value="projectName"/>"><ww:text name="info"/></a>
- <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="<ww:url value="/buildResults.action?projectId="/><ww:property value="projectId"/>&projectName=<ww:property value="projectName"/>"><ww:text name="builds"/></a>
- <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="<ww:url value="/workingCopy.action?projectId="/><ww:property value="projectId"/>&projectName=<ww:property value="projectName"/>"><ww:text name="workingCopy"/></a>
+ <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href='<ww:url action="projectView"/>'><ww:text name="info"/></a>
+ <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href='<ww:url action="buildResults"/>'><ww:text name="builds"/></a>
+ <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href='<ww:url action="workingCopy"/>'><ww:text name="workingCopy"/></a>
</p>
</div>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/buildResults.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/buildResults.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/buildResults.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/buildResults.jsp Wed Sep 20 17:12:28 2006
@@ -1,5 +1,5 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<html>
<ww:i18n name="localization.Continuum">
@@ -10,9 +10,9 @@
<div id="h3">
<div>
<p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
- <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="<ww:url value="/projectView.action?projectId="/><ww:property value="projectId"/>&projectName=<ww:property value="projectName"/>"><ww:text name="info"/></a>
+ <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href='<ww:url action="projectView"/>'><ww:text name="info"/></a>
<b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><ww:text name="builds"/></b>
- <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="<ww:url value="/workingCopy.action?projectId="/><ww:property value="projectId"/>&projectName=<ww:property value="projectName"/>"><ww:text name="workingCopy"/></a>
+ <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href='<ww:url action="workingCopy"/>'><ww:text name="workingCopy"/></a>
</p>
</div>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp Wed Sep 20 17:12:28 2006
@@ -1,5 +1,5 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib uri="continuum" prefix="c1" %>
<ww:i18n name="localization.Continuum">
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/components/buildDefinitionSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/components/buildDefinitionSummaryComponent.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/components/buildDefinitionSummaryComponent.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/components/buildDefinitionSummaryComponent.jsp Wed Sep 20 17:12:28 2006
@@ -1,5 +1,5 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib uri="continuum" prefix="c1" %>
<ww:i18n name="localization.Continuum">
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/components/failureComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/components/failureComponent.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/components/failureComponent.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/components/failureComponent.jsp Wed Sep 20 17:12:28 2006
@@ -1,5 +1,5 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib uri="continuum" prefix="c1" %>
<ww:i18n name="localization.Continuum">
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp Wed Sep 20 17:12:28 2006
@@ -1,5 +1,5 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
<%@ taglib uri="continuum" prefix="c1" %>
<ww:i18n name="localization.Continuum">
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/configurationEdit.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/configurationEdit.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/configurationEdit.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/configurationEdit.jsp Wed Sep 20 17:12:28 2006
@@ -16,8 +16,8 @@
<ww:textfield label="Username" name="username"/>
<ww:textfield label="Full Name" name="fullName"/>
<ww:textfield label="Email" name="email"/>
- <ww:textfield label="Password" name="password"/>
- <ww:textfield label="Password(again)" name="passwordTwo"/>
+ <ww:password label="Password" name="password"/>
+ <ww:password label="Password(again)" name="passwordTwo"/>
</table>
</div>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/editSchedule.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/editSchedule.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/editSchedule.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/editSchedule.jsp Wed Sep 20 17:12:28 2006
@@ -3,7 +3,7 @@
<html>
<ww:i18n name="localization.Continuum">
<head>
-<title><ww:text name="editSchedule.page.title"/></title>
+<title><ww:text name="editSchedule.page.title"/></title>
</head>
<body>
<div class="app">
@@ -12,17 +12,34 @@
<div class="axial">
<ww:form action="saveSchedule" method="post">
- <input type="hidden" name="id" value="id"/>
- <table>
- <tbody>
+ <ww:hidden name="id"/>
+ <table>
<ww:textfield label="%{getText('schedule.name.label')}" name="name" required="true">
<ww:param name="desc"><p><ww:text name="schedule.name.message"/></p></ww:param>
</ww:textfield>
<ww:textfield label="%{getText('schedule.description.label')}" name="description" required="true">
<ww:param name="desc"><p><ww:text name="schedule.description.message"/></p></ww:param>
</ww:textfield>
- <ww:textfield label="%{getText('schedule.cronExpression.label')}" name="cronExpression" required="true">
- <ww:param name="desc"><p><ww:text name="schedule.cronExpression.message"/></p></ww:param>
+
+ <tr>
+ <th><ww:label theme="simple" value="%{getText('schedule.cronExpression.label')}:" required="true"/></th>
+ <td>
+ <table>
+ <ww:textfield label="%{getText('schedule.second.label')}" name="second" size="2"/>
+ <ww:textfield label="%{getText('schedule.minute.label')}" name="minute" size="2"/>
+ <ww:textfield label="%{getText('schedule.hour.label')}" name="hour" size="2"/>
+ <ww:textfield label="%{getText('schedule.dayOfMonth.label')}" name="dayOfMonth" size="2"/>
+ <ww:textfield label="%{getText('schedule.month.label')}" name="month" size="2"/>
+ <ww:textfield label="%{getText('schedule.dayOfWeek.label')}" name="dayOfWeek" size="2"/>
+ <ww:textfield label="%{getText('schedule.year.label')}" name="year" size="4">
+ <ww:param name="desc"><p><ww:text name="schedule.cronExpression.message"/></p></ww:param>
+ </ww:textfield>
+ </table>
+ </td>
+ </tr>
+
+ <ww:textfield label="%{getText('schedule.maxJobExecutionTime.label')}" name="maxJobExecutionTime" required="true">
+ <ww:param name="desc"><p><ww:text name="schedule.maxJobExecutionTime.message"/></p></ww:param>
</ww:textfield>
<ww:textfield label="%{getText('schedule.quietPeriod.label')}" name="delay">
<ww:param name="desc"><p><ww:text name="schedule.quietPeriod.message"/></p></ww:param>
@@ -30,8 +47,8 @@
<ww:checkbox label="%{getText('schedule.enabled.label')}" name="active" value="active" fieldValue="true">
<ww:param name="desc"><p><ww:text name="schedule.enabled.message"/></p></ww:param>
</ww:checkbox>
- </tbody>
- </table>
+ </table>
+
<div class="functnbar3">
<c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
</div>
@@ -42,4 +59,4 @@
</body>
</ww:i18n>
-</html>
\ No newline at end of file
+</html>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/groupSummary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/groupSummary.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/groupSummary.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/groupSummary.jsp Wed Sep 20 17:12:28 2006
@@ -1,6 +1,7 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
+<%@ taglib uri="continuum" prefix="c1" %>
<html>
<ww:i18n name="localization.Continuum">
<head>
@@ -25,7 +26,8 @@
<ww:param name="projectGroupId" value="%{'${group.id}'}"/>
</ww:url>
- <table border="2" cellspacing="2" cellpadding="3" width="100%">
+ <div class="body">
+ <table border="2" cellspacing="2" cellpadding="3" width="100%">
<tr>
<td>Name:</td>
<td><ww:a href="%{projectGroupSummaryUrl}">${group.name}</ww:a></td>
@@ -75,6 +77,7 @@
</table>
<hr/>
<p/>
+ </div>
</c:forEach>
</div>
</body>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/index.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/index.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/index.jsp Wed Sep 20 17:12:28 2006
@@ -1 +1 @@
-<% response.sendRedirect( "/summary.action" ); %>
+<% response.sendRedirect( request.getContextPath() + "/summary.action" ); %>
Propchange: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/navigations/DefaultBottom.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/navigations/DefaultBottom.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/navigations/DefaultBottom.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/navigations/DefaultBottom.jsp Wed Sep 20 17:12:28 2006
@@ -1,9 +1,24 @@
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ page import="java.util.Calendar" %>
+<%
+ int inceptionYear = 2005;
+ int currentYear = Calendar.getInstance().get( Calendar.YEAR );
+ String copyrightRange = String.valueOf( inceptionYear );
+ if ( inceptionYear != currentYear )
+ {
+ copyrightRange = copyrightRange + "-" + String.valueOf( currentYear );
+ }
+%>
+<ww:i18n name="localization.Continuum">
<div id="footer">
- <table border="0" cellpadding="4" cellspacing="0">
- <tbody><tr>
- <td>
- Continuum © 2005 Apache Software Foundation
- </td>
- </tr>
- </tbody></table>
+ <table with="100%" border="0" cellpadding="4" cellspacing="0">
+ <tbody>
+ <tr>
+ <td>
+ Continuum © <%= copyrightRange %> Apache Software Foundation
+ </td>
+ </tr>
+ </tbody>
+ </table>
</div>
+</ww:i18n>
\ No newline at end of file
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/navigations/Menu.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/navigations/Menu.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/navigations/Menu.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/navigations/Menu.jsp Wed Sep 20 17:12:28 2006
@@ -1,5 +1,5 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
<%@ taglib uri="continuum" prefix="c1" %>
<ww:i18n name="localization.Continuum">
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/notifierIrc.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/notifierIrc.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/notifierIrc.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/notifierIrc.jsp Wed Sep 20 17:12:28 2006
@@ -18,7 +18,7 @@
</h3>
<div class="axial">
- <ww:form action="ircNotifierSave.action" method="post">
+ <ww:form action="ircNotifierSave" method="post" validate="true">
<ww:hidden name="notifierId"/>
<ww:hidden name="projectId"/>
<ww:hidden name="notifierType"/>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/notifierJabber.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/notifierJabber.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/notifierJabber.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/notifierJabber.jsp Wed Sep 20 17:12:28 2006
@@ -18,7 +18,7 @@
</h3>
<div class="axial">
- <ww:form action="jabberNotifierSave.action" method="post">
+ <ww:form action="jabberNotifierSave" method="post" validate="true">
<ww:hidden name="notifierId"/>
<ww:hidden name="projectId"/>
<ww:hidden name="notifierType"/>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/notifierMail.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/notifierMail.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/notifierMail.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/notifierMail.jsp Wed Sep 20 17:12:28 2006
@@ -18,7 +18,7 @@
</h3>
<div class="axial">
- <ww:form action="mailNotifierSave.action" method="post">
+ <ww:form action="mailNotifierSave" method="post" validate="true">
<ww:hidden name="notifierId"/>
<ww:hidden name="projectId"/>
<ww:hidden name="notifierType"/>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/notifierMsn.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/notifierMsn.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/notifierMsn.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/notifierMsn.jsp Wed Sep 20 17:12:28 2006
@@ -18,7 +18,7 @@
</h3>
<div class="axial">
- <ww:form action="jabberNotifierSave.action" method="post">
+ <ww:form action="msnNotifierSave" method="post" validate="true">
<ww:hidden name="notifierId"/>
<ww:hidden name="projectId"/>
<ww:hidden name="notifierType"/>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/notifierSelectType.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/notifierSelectType.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/notifierSelectType.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/notifierSelectType.jsp Wed Sep 20 17:12:28 2006
@@ -15,7 +15,7 @@
<table>
<tbody>
<ww:select label="%{getText('notifier.type.label')}" name="notifierType"
- list="#{ 'mail' : 'Mail', 'irc' : 'IRC', 'jabber' : 'Jabber', 'msn' : 'MSN'}"/>
+ list="#@java.util.LinkedHashMap@{ 'mail' : 'Mail', 'irc' : 'IRC', 'jabber' : 'Jabber', 'msn' : 'MSN'}"/>
</tbody>
</table>
<div class="functnbar3">
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectEdit.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectEdit.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectEdit.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectEdit.jsp Wed Sep 20 17:12:28 2006
@@ -10,7 +10,7 @@
<h3><ww:text name="projectEdit.section.title"/></h3>
<div class="axial">
- <ww:form action="projectSave.action" method="post">
+ <ww:form action="projectSave" method="post" validate="true">
<table>
<tbody>
<ww:hidden name="projectId"/>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp Wed Sep 20 17:12:28 2006
@@ -1,5 +1,5 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib uri="continuum" prefix="c1" %>
<html>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectGroupMembers.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectGroupMembers.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectGroupMembers.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectGroupMembers.jsp Wed Sep 20 17:12:28 2006
@@ -1,5 +1,5 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
<%@ taglib uri="continuum" prefix="c1" %>
<html>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp Wed Sep 20 17:12:28 2006
@@ -1,5 +1,5 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
<%@ taglib uri="continuum" prefix="c1" %>
<html>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectGroupSummary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectGroupSummary.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectGroupSummary.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectGroupSummary.jsp Wed Sep 20 17:12:28 2006
@@ -1,5 +1,5 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib uri="continuum" prefix="c1" %>
<html>
@@ -47,7 +47,7 @@
<ww:param name="projectGroupId" value="projectGroupId"/>
</ww:url>
<ww:url id="removeProjectGroupUrl" action="removeProjectGroup">
- <ww:param name="projectGroupId" value="projectGroupId"/>
+ <ww:param name="projectGroupId" value="projectGroupId"/>
<ww:param name="confirmed" value="false"/>
</ww:url>
<ww:a href="%{buildProjectGroupUrl}">Build</ww:a> <ww:a href="%{removeProjectGroupUrl}">Remove</ww:a>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectView.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectView.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectView.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/projectView.jsp Wed Sep 20 17:12:28 2006
@@ -1,5 +1,5 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib uri="continuum" prefix="c1" %>
<html>
@@ -12,13 +12,13 @@
<div>
<p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
<b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><ww:text name="info"/></b>
- <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="<ww:url value="/buildResults.action?projectId="/><ww:property value="project.id"/>&projectName=<ww:property value="project.name"/>"><ww:text name="builds"/></a>
- <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="<ww:url value="/workingCopy.action?projectId="/><ww:property value="project.id"/>&projectName=<ww:property value="project.name"/>"><ww:text name="workingCopy"/></a>
+ <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href='<ww:url action="buildResults"/>'><ww:text name="builds"/></a>
+ <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href='<ww:url action="workingCopy"/>'><ww:text name="workingCopy"/></a>
</p>
</div>
<h3><ww:text name="projectView.section.title"/></h3>
-
+
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
<c1:data label="%{getText('projectView.project.name')}" name="project.name"/>
@@ -34,7 +34,7 @@
<tbody>
<tr>
<td>
- <form action="projectEdit!edit.action" method="post">
+ <form action="projectEdit.action" method="post">
<input type="hidden" name="projectId" value="<ww:property value="project.id"/>"/>
<input type="submit" name="edit-project" value="<ww:text name="edit"/>"/>
</form>
@@ -80,7 +80,7 @@
<ec:column property="from" title="projectView.notifier.from" cell="org.apache.maven.continuum.web.view.projectview.NotifierFromCell"/>
<ec:column property="actions" title=" ">
<c:if test="${!pageScope.notifier.fromProject}">
- <a href='<ww:url value="${notifier.type}NotifierEdit!default.action">
+ <a href='<ww:url value="${notifier.type}NotifierEdit.action">
<ww:param name="projectId" value="project.id"/>
<ww:param name="notifierId" value="${notifier.id}"/>
</ww:url>'>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/schedules.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/schedules.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/schedules.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/schedules.jsp Wed Sep 20 17:12:28 2006
@@ -1,5 +1,5 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<html>
<ww:i18n name="localization.Continuum">
@@ -21,13 +21,18 @@
<ec:column property="description" title="schedules.table.description"/>
<ec:column property="delay" title="schedules.table.delay"/>
<ec:column property="cronExpression" title="schedules.table.cronExpression"/>
+ <ec:column property="maxJobExecutionTime" title="schedules.table.maxJobExecutionTime"/>
<ec:column property="actions" title=" ">
- <ww:url id="editUrl" action="schedule">
+ <ww:url id="editScheduleUrl" action="schedule">
<ww:param name="id" value="${pageScope.schedule.id}"/>
</ww:url>
- <ww:a href="%{editUrl}">Edit</ww:a>
+ <ww:url id="removeScheduleUrl" action="removeSchedule">
+ <ww:param name="id" value="${pageScope.schedule.id}"/>
+ <ww:param name="name" value="%{'${pageScope.schedule.name}'}"/>
+ </ww:url>
+ <ww:a href="%{editScheduleUrl}">Edit</ww:a>
- <ww:text name="delete"/>
+ <ww:a href="%{removeScheduleUrl}">Delete</ww:a>
</ec:column>
</ec:row>
</ec:table>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/summary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/summary.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/summary.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/summary.jsp Wed Sep 20 17:12:28 2006
@@ -1,5 +1,5 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
<%@ taglib uri="continuum" prefix="c1" %>
<html>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/surefireReport.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/surefireReport.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/surefireReport.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/surefireReport.jsp Wed Sep 20 17:12:28 2006
@@ -1,5 +1,5 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib prefix="c1" uri="continuum" %>
<html>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/user.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/user.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/user.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/user.jsp Wed Sep 20 17:12:28 2006
@@ -1,5 +1,5 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
<%@ taglib uri="continuum" prefix="c1" %>
<html>
@@ -21,8 +21,8 @@
<ww:textfield label="Username" name="username"/>
<ww:textfield label="Full Name" name="fullName"/>
<ww:textfield label="Email" name="email"/>
- <ww:textfield label="Password" name="password"/>
- <ww:textfield label="Password(again)" name="passwordTwo"/>
+ <ww:password label="Password" name="password"/>
+ <ww:password label="Password(again)" name="passwordTwo"/>
<ww:select list="userGroups" label="User Group" name="userGroupId"/>
</table>
</div>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/userGroup.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/userGroup.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/userGroup.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/userGroup.jsp Wed Sep 20 17:12:28 2006
@@ -1,5 +1,5 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
<%@ taglib uri="continuum" prefix="c1" %>
<html>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/userGroups.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/userGroups.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/userGroups.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/userGroups.jsp Wed Sep 20 17:12:28 2006
@@ -1,5 +1,5 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
<%@ taglib uri="continuum" prefix="c1" %>
<html>
@@ -29,6 +29,7 @@
</ww:url>
<ww:url id="removeUrl" action="removeUserGroup">
<ww:param name="userGroupId" value="${pageScope.userGroup.id}"/>
+ <ww:param name="name" value="%{'${pageScope.userGroup.name}'}"/>
</ww:url>
<ww:a href="%{editUrl}">Edit</ww:a>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/users.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/users.jsp?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/users.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/users.jsp Wed Sep 20 17:12:28 2006
@@ -1,5 +1,5 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib uri="continuum" prefix="c1" %>
<html>
@@ -31,6 +31,7 @@
</ww:url>
<ww:url id="removeUrl" action="removeUser">
<ww:param name="userId" value="${pageScope.user.accountId}"/>
+ <ww:param name="username" value="%{'${pageScope.user.username}'}"/>
</ww:url>
<ww:a href="%{editUrl}">Edit</ww:a>
Modified: maven/continuum/branches/release-integration/continuum/continuum-xmlrpc/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-xmlrpc/pom.xml?view=diff&rev=448412&r1=448411&r2=448412
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-xmlrpc/pom.xml (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-xmlrpc/pom.xml Wed Sep 20 17:12:28 2006
@@ -7,7 +7,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>continuum-xmlrpc</artifactId>
<name>Continuum XMLRPC Interface</name>
- <version>1.1-SNAPSHOT</version>
<build>
<plugins>
<plugin>