You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2014/05/20 16:02:06 UTC
svn commit: r1596252 [4/4] - in /continuum/trunk: ./
continuum-buildagent/continuum-buildagent-webapp/src/appserver-base/conf/
continuum-jetty/ continuum-jetty/src/main/assembly/ continuum-webapp-test/
continuum-webapp-test/src/appserver-base/conf/ con...
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -55,7 +54,7 @@
<s:hidden name="fromGroupPage"/>
<table>
<tbody>
- <s:textfield label="%{getText('notifier.mail.recipient.address.label')}" name="address" />
+ <s:textfield label="%{getText('notifier.mail.recipient.address.label')}" name="address" size="100"/>
<s:checkbox label="%{getText('notifier.mail.recipient.committers.label')}" name="committers" value="committers" fieldValue="true"/>
<s:checkbox label="%{getText('notifier.mail.recipient.developers.label')}" name="developers" value="developers" fieldValue="true"/>
<s:checkbox label="%{getText('notifier.event.sendOnSuccess')}" name="sendOnSuccess" value="sendOnSuccess" fieldValue="true"/>
@@ -66,7 +65,8 @@
</tbody>
</table>
<div class="functnbar3">
- <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('save')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</div>
</s:form>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -51,9 +50,9 @@
<s:hidden name="fromGroupPage"/>
<table>
<tbody>
- <s:textfield label="%{getText('notifier.msn.login.label')}" name="login" requiredLabel="true"/>
- <s:password label="%{getText('notifier.msn.password.label')}" name="password" requiredLabel="true"/>
- <s:textfield label="%{getText('notifier.msn.address.label')}" name="address" requiredLabel="true"/>
+ <s:textfield label="%{getText('notifier.msn.login.label')}" name="login" requiredLabel="true" size="100"/>
+ <s:password label="%{getText('notifier.msn.password.label')}" name="password" requiredLabel="true" size="100"/>
+ <s:textfield label="%{getText('notifier.msn.address.label')}" name="address" requiredLabel="true" size="100"/>
<s:checkbox label="%{getText('notifier.event.sendOnSuccess')}" name="sendOnSuccess" value="sendOnSuccess" fieldValue="true"/>
<s:checkbox label="%{getText('notifier.event.sendOnFailure')}" name="sendOnFailure" value="sendOnFailure" fieldValue="true"/>
<s:checkbox label="%{getText('notifier.event.sendOnError')}" name="sendOnError" value="sendOnError" fieldValue="true"/>
@@ -62,7 +61,8 @@
</tbody>
</table>
<div class="functnbar3">
- <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('save')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</div>
</s:form>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -28,10 +27,10 @@
<div id="axial" class="h3">
<s:if test="projectId > 0">
- <s:url id="actionUrl" value="addProjectNotifier!execute" includeParams="none" />
+ <s:url id="actionUrl" value="addProjectNotifier_submit" includeParams="none" />
</s:if>
<s:else>
- <s:url id="actionUrl" value="addProjectGroupNotifier!execute" includeParams="none" />
+ <s:url id="actionUrl" value="addProjectGroupNotifier_submit" includeParams="none" />
</s:else>
<h3><s:text name="notifier.section.add.title"/></h3>
@@ -48,7 +47,8 @@
</tbody>
</table>
<div class="functnbar3">
- <c1:submitcancel value="%{getText('submit')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('submit')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</div>
</s:form>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierWagon.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierWagon.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierWagon.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierWagon.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -53,8 +52,8 @@
<table>
<tbody>
- <s:textfield label="%{getText('notifier.wagon.url.label')}" name="url" requiredLabel="true" />
- <s:textfield label="%{getText('notifier.wagon.id.label')}" name="id" requiredLabel="true" />
+ <s:textfield label="%{getText('notifier.wagon.url.label')}" name="url" requiredLabel="true" size="100" />
+ <s:textfield label="%{getText('notifier.wagon.id.label')}" name="id" requiredLabel="true" size="100" />
<s:checkbox label="%{getText('notifier.event.sendOnSuccess')}" name="sendOnSuccess" value="sendOnSuccess" fieldValue="true"/>
<s:checkbox label="%{getText('notifier.event.sendOnFailure')}" name="sendOnFailure" value="sendOnFailure" fieldValue="true"/>
<s:checkbox label="%{getText('notifier.event.sendOnError')}" name="sendOnError" value="sendOnError" fieldValue="true"/>
@@ -63,7 +62,8 @@
</table>
<div class="functnbar3">
- <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('save')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</div>
</s:form>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectEdit.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectEdit.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectEdit.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -56,19 +55,20 @@
<s:form name="editProject" action="projectSave" method="post" validate="true">
<table>
<tbody>
- <s:textfield label="%{getText('projectEdit.project.name.label')}" name="name" requiredLabel="true"/>
- <s:textfield label="%{getText('projectEdit.project.version.label')}" name="version" requiredLabel="true"/>
+ <s:textfield label="%{getText('projectEdit.project.name.label')}" name="name" requiredLabel="true" size="100"/>
+ <s:textfield label="%{getText('projectEdit.project.version.label')}" name="version" requiredLabel="true" size="100"/>
<s:textfield label="%{getText('projectEdit.project.scmUrl.label')}" name="scmUrl" requiredLabel="true"
- onchange="checkUseCache()"/>
+ onchange="checkUseCache()" size="100"/>
<s:checkbox label="%{getText('projectEdit.project.scmUseCache.label')}" name="scmUseCache"
- onclick="checkUseCache()"/>
- <s:textfield label="%{getText('projectEdit.project.scmUsername.label')}" name="scmUsername"/>
- <s:password label="%{getText('projectEdit.project.scmPassword.label')}" name="scmPassword"/>
- <s:textfield label="%{getText('projectEdit.project.scmTag.label')}" name="scmTag"/>
+ onclick="checkUseCache()" size="100"/>
+ <s:textfield label="%{getText('projectEdit.project.scmUsername.label')}" name="scmUsername" size="100"/>
+ <s:password label="%{getText('projectEdit.project.scmPassword.label')}" name="scmPassword" size="100"/>
+ <s:textfield label="%{getText('projectEdit.project.scmTag.label')}" name="scmTag" size="100"/>
</tbody>
</table>
<div class="functnbar3">
- <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('save')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</div>
<s:hidden name="projectId"/>
</s:form>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp Tue May 20 14:02:03 2014
@@ -19,7 +19,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -40,15 +39,16 @@
</c:if>
<table>
<tbody>
- <s:textfield label="%{getText('projectGroup.name.label')}" name="name" requiredLabel="true"/>
- <s:textfield label="%{getText('projectGroup.groupId.label')}" name="groupId" requiredLabel="true"/>
- <s:textfield label="%{getText('projectGroup.description.label')}" name="description"/>
+ <s:textfield label="%{getText('projectGroup.name.label')}" name="name" requiredLabel="true" size="100"/>
+ <s:textfield label="%{getText('projectGroup.groupId.label')}" name="groupId" requiredLabel="true" size="100"/>
+ <s:textfield label="%{getText('projectGroup.description.label')}" name="description" size="100"/>
<s:select label="%{getText('projectGroup.repository.label')}" name="repositoryId" list="repositories"
listKey="id" listValue="name"/>
</tbody>
</table>
<div class="functnbar3">
- <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('save')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</div>
</s:form>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupBuildDefinition.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupBuildDefinition.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupBuildDefinition.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupBuildDefinition.jsp Tue May 20 14:02:03 2014
@@ -20,7 +20,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ 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>
<s:i18n name="localization.Continuum">
<head>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp Tue May 20 14:02:03 2014
@@ -19,7 +19,6 @@
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<html>
<s:i18n name="localization.Continuum">
@@ -35,7 +34,7 @@
<s:if test="projectInCOQueue">
<div class="label">
<p><s:text name="%{getText('project.in.checkout.queue.error')}"/></p>
- </div >
+ </div>
</s:if>
<c:if test="${!empty actionErrors}">
<div class="errormessage">
@@ -45,41 +44,39 @@
</div>
</c:if>
<table>
- <tbody>
- <s:hidden name="projectGroupId"/>
- <s:textfield label="%{getText('projectGroup.name.label')}" name="name" requiredLabel="true" disabled="%{projectInCOQueue}"/>
- <c1:data label="%{getText('projectGroup.groupId.label')}" name="projectGroup.groupId"/>
- <s:textfield label="%{getText('projectGroup.description.label')}" name="description" disabled="%{projectInCOQueue}"/>
- <s:select label="%{getText('projectGroup.repository.label')}" name="repositoryId" list="repositories"
- listKey="id" listValue="name" disabled="%{disabledRepositories}"/>
- <s:textfield label="%{getText('projectGroup.url.label')}" name="url" disabled="%{projectInCOQueue}"/>
- </tbody>
+ <s:hidden name="projectGroupId"/>
+ <s:textfield label="%{getText('projectGroup.name.label')}" name="name" requiredLabel="true" disabled="%{projectInCOQueue}" size="100"/>
+ <s:textfield label="%{getText('projectGroup.groupId.label')}" disabled="true" name="projectGroup.groupId" size="100"/>
+ <s:textfield label="%{getText('projectGroup.description.label')}" name="description" disabled="%{projectInCOQueue}" size="100"/>
+ <s:select label="%{getText('projectGroup.repository.label')}" name="repositoryId" list="repositories"
+ listKey="id" listValue="name" disabled="%{disabledRepositories}"/>
+ <s:textfield label="%{getText('projectGroup.url.label')}" name="url" disabled="%{projectInCOQueue}" size="100"/>
</table>
-
<c:if test="${!empty projectList}">
- <h3><s:text name="projectGroup.edit.section.projects.title"/></h3>
- <div class="eXtremeTable">
- <table id="projects_table" border="1" cellspacing="2" cellpadding="3" class="tableRegion" width="100%">
- <thead>
- <tr>
- <td class="tableHeader"><s:text name="projectGroup.edit.project.name"/></td>
- <td class="tableHeader"><s:text name="projectGroup.edit.move.to.group"/></td>
- </tr>
- </thead>
- <tbody class="tableBody">
- <s:iterator value="projectList" status="rowCounter">
- <tr class="<s:if test="#rowCounter.odd == true">odd</s:if><s:else>even</s:else>">
- <td><s:select cssStyle="width:200px" label="%{name}" name="projects[%{id}]" list="projectGroups" value="%{projectGroup.id}" disabled="%{projectInCOQueue}"/></td>
+ <h3><s:text name="projectGroup.edit.section.projects.title"/></h3>
+ <div class="eXtremeTable">
+ <table id="projects_table" border="1" cellspacing="2" cellpadding="3" class="tableRegion" width="100%">
+ <thead>
+ <tr>
+ <td class="tableHeader"><s:text name="projectGroup.edit.project.name"/></td>
+ <td class="tableHeader"><s:text name="projectGroup.edit.move.to.group"/></td>
</tr>
- </s:iterator>
- </tbody>
- </table>
- </div>
+ </thead>
+ <tbody class="tableBody">
+ <s:iterator value="projectList" status="rowCounter">
+ <tr class="<s:if test="#rowCounter.odd == true">odd</s:if><s:else>even</s:else>">
+ <td><s:select cssStyle="width:200px" label="%{name}" name="projects[%{id}]" list="projectGroups" value="%{projectGroup.id}" disabled="%{projectInCOQueue}"/></td>
+ </tr>
+ </s:iterator>
+ </tbody>
+ </table>
+ </div>
</c:if>
<div class="functnbar3">
<c:choose>
<c:when test="${!projectInCOQueue}">
- <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('save')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</c:when>
<c:otherwise>
<input type="button" value="<s:text name="back"/>" onClick="history.go(-1)">
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp Tue May 20 14:02:03 2014
@@ -20,7 +20,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
-<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
<html>
@@ -90,7 +89,7 @@
<c:when
test="${pageScope.project.state == 1 || pageScope.project.state == 10 || pageScope.project.state == 2 || pageScope.project.state == 3 || pageScope.project.state == 4}">
<s:token/>
- <s:url id="removeProjectUrl" action="deleteProject!default.action">
+ <s:url id="removeProjectUrl" action="deleteProject_default.action">
<s:param name="projectId"><c:out value="${pageScope.project.id}"/></s:param>
<s:param name="projectName"><c:out value="${pageScope.project.name}"/></s:param>
<s:param name="struts.token.name">token</s:param>
@@ -117,7 +116,7 @@
<redback:ifAuthorized permission="continuum-manage-users">
<h3><s:text name="projectGroup.members.users.title"/></h3>
- <s:form action="projectGroupMembers" theme="xhtml" method="post">
+ <s:form action="projectGroupMembers" method="post">
<s:hidden name="ascending" />
<s:hidden name="projectGroupId" />
<tr>
@@ -131,13 +130,11 @@
</td>
<td>
<table cellpadding="0" cellspacing="0">
- <s:textfield name="filterKey" />
+ <s:textfield name="filterKey" size="100" />
</table>
</td>
<td colspan="2" align="right">
- <table cellpadding="0" cellspacing="0">
- <s:submit value="%{getText('projectGroup.members.users.search.button')}"/>
- </table>
+ <s:submit value="%{getText('projectGroup.members.users.search.button')}" theme="simple"/>
</td>
</tr>
</s:form>
@@ -148,7 +145,7 @@
<thead>
<tr>
<th nowrap="true">
- <s:form id="sortlist" name="sortlist" action="projectGroupMembers" theme="xhtml" method="post">
+ <s:form id="sortlist" name="sortlist" action="projectGroupMembers" method="post">
<s:if test="ascending">
<s:a href="javascript:document.forms['sortlist'].submit()"><img src="<s:url value='/images/icon_sortdown.gif' includeParams="none"/>" title="<s:text name='sort.descending'/>" border="0"></s:a> <s:text name="user.username.label"/>
</s:if>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupNotifier.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupNotifier.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupNotifier.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupNotifier.jsp Tue May 20 14:02:03 2014
@@ -20,7 +20,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ 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>
<s:i18n name="localization.Continuum">
<head>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp Tue May 20 14:02:03 2014
@@ -20,7 +20,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
-<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp Tue May 20 14:02:03 2014
@@ -20,7 +20,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
-<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
<html>
@@ -33,8 +32,8 @@
<meta http-equiv="refresh" content="30"/>
<script type="text/javascript">
- <c:url var="addM2ProjectUrl" value="/addMavenTwoProjectInput!input.action" />
- <c:url var="addM1ProjectUrl" value="/addMavenOneProjectInput!input.action" />
+ <c:url var="addM2ProjectUrl" value="/addMavenTwoProjectInput.action" />
+ <c:url var="addM1ProjectUrl" value="/addMavenOneProjectInput.action" />
<c:url var="addProjectUrl" value="/addProjectInput.action" />
function goToAddProject()
@@ -85,13 +84,28 @@
<h3><s:text name="projectGroup.information.title"><s:param><c:out value="${projectGroup.name}"/></s:param></s:text></h3>
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <c1:data label="%{getText('projectGroup.name.label')}" name="projectGroup.name"/>
- <c1:data label="%{getText('projectGroup.groupId.label')}" name="projectGroup.groupId"/>
- <c1:data label="%{getText('projectGroup.description.label')}" name="projectGroup.description"/>
- <c1:data label="%{getText('projectGroup.repository.label')}" name="projectGroup.localRepository.name"/>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectGroup.name.label'/>:</label></th>
+ <td><s:property value="projectGroup.name"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectGroup.groupId.label'/>:</label></th>
+ <td><s:property value="projectGroup.groupId"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectGroup.description.label'/>:</label></th>
+ <td><s:property value="projectGroup.description"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectGroup.repository.label'/>:</label></th>
+ <td><s:property value="projectGroup.localRepository.name"/></td>
+ </tr>
<s:if test="url != null">
<s:url id="projectHomepageUrl" value="%{url}" includeContext="false" includeParams="none"/>
- <c1:data label="%{getText('projectGroup.url.label')}" name="url" valueLink="%{'${projectHomepageUrl}'}"/>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectGroup.url.label'/>:</label></th>
+ <td><a href="${projectHomepageUrl}"><s:property value="url"/></a></td>
+ </tr>
</s:if>
</table>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp Tue May 20 14:02:03 2014
@@ -20,7 +20,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
<html>
@@ -39,16 +38,37 @@
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <c1:data label="%{getText('projectView.project.name')}" name="project.name"/>
- <c1:data label="%{getText('projectView.project.description')}" name="project.description"/>
- <c1:data label="%{getText('projectView.project.version')}" name="project.version"/>
- <c1:data label="%{getText('projectView.project.scmUrl')}" name="project.scmUrl"/>
- <c1:data label="%{getText('projectView.project.scmTag')}" name="project.scmTag"/>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectView.project.name'/>:</label></th>
+ <td><s:property value="project.name"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectView.project.description'/>:</label></th>
+ <td><s:property value="project.description"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectView.project.version'/>:</label></th>
+ <td><s:property value="project.version"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectView.project.scmUrl'/>:</label></th>
+ <td><s:property value="project.scmUrl"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectView.project.scmTag'/>:</label></th>
+ <td><s:property value="project.scmTag"/></td>
+ </tr>
<s:url id="projectGroupSummaryUrl" value="/projectGroupSummary.action">
<s:param name="projectGroupId"><c:out value="${project.projectGroup.id}"/></s:param>
</s:url>
- <c1:data label="%{getText('projectView.project.group')}" name="project.projectGroup.name" valueLink="%{'${projectGroupSummaryUrl}'}"/>
- <c1:data label="%{getText('projectView.project.lastBuildDateTime')}" name="lastBuildDateTime" />
+ <tr class="b">
+ <th><label class="label"><s:text name='projectView.project.group'/>:</label></th>
+ <td><a href="${projectGroupSummaryUrl}"><s:property value="project.projectGroup.name"/></a></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectView.project.lastBuildDateTime'/>:</label></th>
+ <td><s:property value="lastBuildDateTime"/></td>
+ </tr>
</table>
<redback:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
@@ -136,7 +156,7 @@
<redback:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
<c:choose>
<c:when test="${!pageScope.notifier.fromProject}">
- <s:url id="removeUrl" action="deleteProjectNotifier!default.action" namespace="/">
+ <s:url id="removeUrl" action="deleteProjectNotifier_default.action" namespace="/">
<s:param name="projectId"><c:out value="${project.id}"/></s:param>
<s:param name="projectGroupId"><c:out value="${project.projectGroup.id}"/></s:param>
<s:param name="notifierType"><c:out value="${notifier.type}"/></s:param>
@@ -160,7 +180,7 @@
</c:if>
<div class="functnbar3">
<redback:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
- <s:form action="addProjectNotifier!default.action" method="post">
+ <s:form action="addProjectNotifier.action" method="post">
<input type="hidden" name="projectId" value="<s:property value="project.id"/>"/>
<input type="hidden" name="projectGroupId" value="<s:property value="project.projectGroup.id"/>"/>
<s:submit value="%{getText('add')}" theme="simple"/>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.jsp Tue May 20 14:02:03 2014
@@ -31,8 +31,8 @@
<s:hidden name="releaseId"/>
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <s:textfield label="%{getText('releasePerformFromScm.goals.label')}" name="goals"/>
- <s:textfield label="%{getText('releasePrepare.arguments.label')}" name="arguments"/>
+ <s:textfield label="%{getText('releasePerformFromScm.goals.label')}" name="goals" size="100"/>
+ <s:textfield label="%{getText('releasePrepare.arguments.label')}" name="arguments" size="100"/>
<s:checkbox label="%{getText('releasePerformFromScm.useReleaseProfile.label')}" name="useReleaseProfile"/>
</table>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp Tue May 20 14:02:03 2014
@@ -31,15 +31,15 @@
<s:hidden name="projectId"/>
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <s:textfield label="%{getText('releasePerformFromScm.scmUrl.label')}" name="scmUrl"/>
- <s:textfield label="%{getText('releasePerformFromScm.scmUsername.label')}" name="scmUsername"/>
- <s:password label="%{getText('releasePerformFromScm.scmPassword.label')}" name="scmPassword"/>
- <s:textfield label="%{getText('releasePerformFromScm.scmTag.label')}" name="scmTag"/>
+ <s:textfield label="%{getText('releasePerformFromScm.scmUrl.label')}" name="scmUrl" size="100"/>
+ <s:textfield label="%{getText('releasePerformFromScm.scmUsername.label')}" name="scmUsername" size="100"/>
+ <s:password label="%{getText('releasePerformFromScm.scmPassword.label')}" name="scmPassword" size="100"/>
+ <s:textfield label="%{getText('releasePerformFromScm.scmTag.label')}" name="scmTag" size="100"/>
<c:if test="${!empty (scmTagBase)}">
- <s:textfield label="%{getText('releasePerformFromScm.scmTagBase.label')}" name="scmTagBase"/>
+ <s:textfield label="%{getText('releasePerformFromScm.scmTagBase.label')}" name="scmTagBase" size="100"/>
</c:if>
- <s:textfield label="%{getText('releasePerformFromScm.goals.label')}" name="goals"/>
- <s:textfield label="%{getText('releasePrepare.arguments.label')}" name="arguments"/>
+ <s:textfield label="%{getText('releasePerformFromScm.goals.label')}" name="goals" size="100"/>
+ <s:textfield label="%{getText('releasePrepare.arguments.label')}" name="arguments" size="100"/>
<s:checkbox label="%{getText('releasePerformFromScm.useReleaseProfile.label')}" name="useReleaseProfile"/>
<s:select label="%{getText('releasePerformFromScm.buildEnvironment.label')}" name="profileId" list="profiles" listValue="name"
listKey="id" headerKey="-1" headerValue=""/>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp Tue May 20 14:02:03 2014
@@ -32,15 +32,15 @@
<input type="hidden" name="autoVersionSubmodules" value="<s:property value="autoVersionSubmodules"/>"/>
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <s:textfield label="%{getText('releasePrepare.scmUsername.label')}" name="scmUsername"/>
- <s:password label="%{getText('releasePrepare.scmPassword.label')}" name="scmPassword"/>
- <s:textfield label="%{getText('releasePrepare.scmTag.label')}" name="scmTag" requiredLabel="true"/>
+ <s:textfield label="%{getText('releasePrepare.scmUsername.label')}" name="scmUsername" size="100"/>
+ <s:password label="%{getText('releasePrepare.scmPassword.label')}" name="scmPassword" size="100"/>
+ <s:textfield label="%{getText('releasePrepare.scmTag.label')}" name="scmTag" requiredLabel="true" size="100"/>
<c:if test="${!empty (scmTagBase)}">
- <s:textfield label="%{getText('releasePrepare.scmTagBase.label')}" name="scmTagBase"/>
+ <s:textfield label="%{getText('releasePrepare.scmTagBase.label')}" name="scmTagBase" size="100"/>
</c:if>
- <s:textfield label="%{getText('releasePrepare.scmCommentPrefix.label')}" name="scmCommentPrefix"/>
- <s:textfield label="%{getText('releasePrepare.prepareGoals.label')}" name="prepareGoals" requiredLabel="true"/>
- <s:textfield label="%{getText('releasePrepare.arguments.label')}" name="arguments"/>
+ <s:textfield label="%{getText('releasePrepare.scmCommentPrefix.label')}" name="scmCommentPrefix" size="100"/>
+ <s:textfield label="%{getText('releasePrepare.prepareGoals.label')}" name="prepareGoals" requiredLabel="true" size="100"/>
+ <s:textfield label="%{getText('releasePrepare.arguments.label')}" name="arguments" size="100"/>
<s:select label="%{getText('releasePrepare.buildEnvironment.label')}" name="profileId" list="profiles" listValue="name"
listKey="id" headerKey="-1" headerValue=""/>
<s:checkbox label="%{getText('releasePrepare.useEditMode.label')}" name="scmUseEditMode" fieldValue="false"/>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp Tue May 20 14:02:03 2014
@@ -30,31 +30,37 @@
<h4><s:text name="releaseViewResult.summary"/></h4>
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <c1:data label="%{getText('releaseViewResult.projectName')}">
- <s:param name="after"><s:property value="projectName"/></s:param>
- </c1:data>
- <c1:data label="%{getText('releaseViewResult.releaseGoal')}">
- <s:param name="after"><s:property value="releaseGoal"/></s:param>
- </c1:data>
- <c1:data label="%{getText('releaseViewResult.startTime')}">
- <s:param name="after"><c1:date name="result.startTime"/></s:param>
- </c1:data>
- <c1:data label="%{getText('releaseViewResult.endTime')}">
- <s:param name="after"><c1:date name="result.endTime"/></s:param>
- </c1:data>
- <c1:data label="%{getText('releaseViewResult.state')}">
- <s:param name="after">
+ <tr class="b">
+ <th><label class="label"><s:text name='releaseViewResult.projectName'/>:</label></th>
+ <td><s:property value="projectName"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='releaseViewResult.releaseGoal'/>:</label></th>
+ <td><s:property value="releaseGoal"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='releaseViewResult.startTime'/>:</label></th>
+ <td><c1:date name="result.startTime"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='releaseViewResult.endTime'/>:</label></th>
+ <td><c1:date name="result.endTime"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='releaseViewResult.state'/>:</label></th>
+ <td>
<s:if test="result.resultCode == 0">
<s:text name="releaseViewResult.success"/>
</s:if>
<s:else>
<s:text name="releaseViewResult.error"/>
</s:else>
- </s:param>
- </c1:data>
- <c1:data label="%{getText('releaseViewResult.username')}">
- <s:param name="after"><s:property value="username"/></s:param>
- </c1:data>
+ </td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='releaseViewResult.username'/>:</label></th>
+ <td><s:property value="username"/></td>
+ </tr>
</table>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp Tue May 20 14:02:03 2014
@@ -17,7 +17,6 @@
~ under the License.
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib prefix="c1" uri="continuum" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -31,9 +30,18 @@
</h3>
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <c1:data label="%{getText('scmResult.projectGroupName')}" name="projectGroupName"/>
- <c1:data label="%{getText('scmResult.scmRootAddress')}" name="projectScmRoot.scmRootAddress"/>
- <c1:data label="%{getText('scmResult.state')}" name="state"/>
+ <tr class="b">
+ <th><label class="label"><s:text name='scmResult.projectGroupName'/>:</label></th>
+ <td><s:property value="projectGroupName"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='scmResult.scmRootAddress'/>:</label></th>
+ <td><s:property value="projectScmRoot.scmRootAddress"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='scmResult.state'/>:</label></th>
+ <td>${state}</td>
+ </tr>
</table>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/surefireReport.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/surefireReport.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/surefireReport.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/surefireReport.jsp Tue May 20 14:02:03 2014
@@ -20,7 +20,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ 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>
<s:i18n name="localization.Continuum">
<head>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml Tue May 20 14:02:03 2014
@@ -90,7 +90,9 @@
<!-- TODO: some Spring technique for this? -->
<listener-class>org.apache.continuum.web.startup.ContinuumStartup</listener-class>
</listener>
-
+ <listener>
+ <listener-class>org.apache.struts2.dispatcher.ng.listener.StrutsListener</listener-class>
+ </listener>
<context-param>
<param-name>contextClass</param-name>
<param-value>org.codehaus.plexus.spring.PlexusWebApplicationContext</param-value>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/css/tigris.css
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/css/tigris.css?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/css/tigris.css (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/css/tigris.css Tue May 20 14:02:03 2014
@@ -797,6 +797,7 @@ dd {
color: gray;
font-weight: bold;
font-size: 11px;
+ font-style: normal;
padding: 0px 0px 1px 19px;
}
Modified: continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/pom.xml?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/pom.xml (original)
+++ continuum/trunk/pom.xml Tue May 20 14:02:03 2014
@@ -44,7 +44,7 @@
<!-- Note, when later moving beyond 2.2.1, the continuum-artifact-manager module should be removed -->
<maven.version>2.2.1</maven.version>
<spring.version>2.5.6</spring.version>
- <struts.version>2.3.14.2</struts.version>
+ <struts.version>2.3.16</struts.version>
<wagon.version>1.0-beta-6</wagon.version>
<maven-scm.version>1.4</maven-scm.version>
<redback.version>1.3-M3</redback.version>