You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2009/01/11 10:52:35 UTC
svn commit: r733441 [8/8] - in
/continuum/branches/continuum-distributed-builds: ./
continuum-api/src/main/java/org/apache/continuum/configuration/
continuum-api/src/main/java/org/apache/continuum/dao/
continuum-api/src/main/java/org/apache/continuum/t...
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp Sun Jan 11 01:52:08 2009
@@ -36,7 +36,7 @@
<c:when test="${!empty actionErrors}">
<div class="errormessage">
<s:iterator value="actionErrors">
- <p><s:text name="<s:property/>" /></p>
+ <p><s:property/></p>
</s:iterator>
</div>
<input type="button" value="Back" onClick="history.go(-1)">
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp
('svn:executable' removed)
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp Sun Jan 11 01:52:08 2009
@@ -30,14 +30,13 @@
<h3><s:text name="buildDefinition.template.section.title"/></h3>
<div class="axial">
- <s:form action="saveBuildDefinitionTemplate" method="post" validate="true" name="buildDefinitionTemplate"
- onsubmit="customOnsubmit_saveBuildDefinitionTemplate();">
+ <s:form action="saveBuildDefinitionTemplate" method="post" name="buildDefinitionTemplate" validate="false">
<c:choose>
<c:when test="${!empty actionErrors}">
<div class="errormessage">
<s:iterator value="actionErrors">
- <p><s:text name="<s:property/>" /></p>
+ <p><s:property/></p>
</s:iterator>
</div>
<input type="button" value="Back" onClick="history.go(-1)">
@@ -81,4 +80,10 @@
</div>
</body>
</s:i18n>
+ <script type="text/javascript">
+ customOnsubmit = function(){
+ // no op
+ }
+ </script>
</html>
+
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp
('svn:executable' removed)
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp Sun Jan 11 01:52:08 2009
@@ -19,36 +19,37 @@
<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
+<s:i18n name="localization.Continuum">
<head>
- <title>Edit Company POM</title>
+ <title><s:text name="companyPom.page.title"/></title>
<s:head/>
</head>
<body>
-<h1>Company POM</h1>
+<h1><s:text name="companyPom.section.title"/></h1>
<s:actionmessage/>
<s:form method="post" action="saveCompanyPom" namespace="/admin" validate="true" theme="xhtml">
- <s:label name="companyModel.groupId" label="Group ID"/>
- <s:label name="companyModel.artifactId" label="Artifact ID"/>
+ <s:label name="companyModel.groupId" label="%{getText('appearance.companyPom.groupId')}"/>
+ <s:label name="companyModel.artifactId" label="%{getText('appearance.companyPom.artifactId')}"/>
<tr>
- <td>Version</td>
+ <td><s:text name="appearance.companyPom.version"/></td>
<td>
<s:property value="companyModel.version"/>
- <i>(The version will automatically be incremented when you save this form)</i>
+ <i>(<s:text name="companyPom.autoIncrementVersion"/>)</i>
</td>
</tr>
<tr>
<td></td>
- <td><h2>Organization</h2></td>
+ <td><h2><s:text name="companyPom.organization"/></h2></td>
</tr>
- <s:textfield name="companyModel.organization.name" size="40" label="Name"/>
- <s:textfield name="companyModel.organization.url" size="70" label="URL"/>
+ <s:textfield name="companyModel.organization.name" size="40" label="%{getText('appearance.companyPom.organizationName.label')}"/>
+ <s:textfield name="companyModel.organization.url" size="70" label="%{getText('appearance.companyPom.organizationUrl.label')}"/>
<%-- TODO: how to get it to be a string, not a String[]? --%>
- <s:textfield name="companyModel.properties['organization.logo']" size="70" label="Logo URL"/>
- <s:submit value="Save"/>
+ <s:textfield name="companyModel.properties['organization.logo']" size="70" label="%{getText('appearance.companyPom.organizationLogoUrl.label')}"/>
+ <s:submit value="%{getText('save')}"/>
</s:form>
</body>
-
-</html>
\ No newline at end of file
+</s:i18n>
+</html>
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp Sun Jan 11 01:52:08 2009
@@ -37,11 +37,11 @@
<div class="axial">
<s:if test="hasActionErrors()">
- <h3>Action Error</h3>
+ <h3><s:text name="profile.actionError"/></h3>
+ <p>
+ <s:actionerror/>
+ </p>
</s:if>
- <p>
- <s:actionerror/>
- </p>
</div>
<table>
<tr>
@@ -83,13 +83,13 @@
width="100%"
autoIncludeParameters="false">
<ec:row highlightRow="true">
- <ec:column property="nameEdit" title="Installation Name" style="white-space: nowrap" width="50%">
+ <ec:column property="nameEdit" title="profile.installation.name.label" style="white-space: nowrap" width="50%">
<a href="editInstallation!edit.action?installation.installationId=<c:out value="${profileInstallation.installationId}"/>">
<c:out value="${profileInstallation.name}"/>
</a>
(<c:out value="${profileInstallation.varValue}"/>)
</ec:column>
- <ec:column property="type" title="Type" style="white-space: nowrap" width="49%"/>
+ <ec:column property="type" title="installation.type.label" style="white-space: nowrap" width="49%"/>
<ec:column property="id" title=" " width="1%">
<a href="removeBuildEnvInstallation!removeInstallation.action?profile.id=<c:out value="${profile.id}"/>&installationId=<c:out value="${profileInstallation.installationId}"/>">
<img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0" />
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp Sun Jan 11 01:52:08 2009
@@ -35,7 +35,7 @@
<c:if test="${!empty actionErrors}">
<div class="errormessage">
<s:iterator value="actionErrors">
- <p><s:text name="<s:property/>" /></p>
+ <p><s:property/></p>
</s:iterator>
</div>
</c:if>
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp Sun Jan 11 01:52:08 2009
@@ -42,10 +42,10 @@
sortable="false"
filterable="false">
<ec:row highlightRow="true">
- <ec:column property="name" title="Name" style="white-space: nowrap" />
- <ec:column property="type" title="Type" style="white-space: nowrap" />
- <ec:column property="varName" title="Env Var Name" style="white-space: nowrap" />
- <ec:column property="varValue" title="Value/Path" style="white-space: nowrap" />
+ <ec:column property="name" title="installation.name.label" style="white-space: nowrap" />
+ <ec:column property="type" title="installation.type.label" style="white-space: nowrap" />
+ <ec:column property="varName" title="installation.varName.label" style="white-space: nowrap" />
+ <ec:column property="varValue" title="installation.value.label" style="white-space: nowrap" />
<ec:column property="id" title=" " width="1%">
<a href="editInstallation!edit.action?installation.installationId=<c:out value="${installation.installationId}"/>">
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp Sun Jan 11 01:52:08 2009
@@ -31,7 +31,7 @@
<c:if test="${!empty actionErrors}">
<div class="errormessage">
<s:iterator value="actionErrors">
- <p><s:text name="<s:property/>" /></p>
+ <p><s:property/></p>
</s:iterator>
</div>
</c:if>
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp Sun Jan 11 01:52:08 2009
@@ -36,7 +36,7 @@
<c:if test="${!empty actionErrors}">
<div class="errormessage">
<s:iterator value="actionErrors">
- <p><s:text name="<s:property/>" /></p>
+ <p><s:property/></p>
</s:iterator>
</div>
</c:if>
@@ -50,8 +50,8 @@
sortable="false"
filterable="false">
<ec:row highlightRow="true">
- <ec:column property="name" title="Name" style="white-space: nowrap" />
- <ec:column property="Installations" title="Installations" style="white-space: nowrap">
+ <ec:column property="name" title="profile.name.label" style="white-space: nowrap" />
+ <ec:column property="Installations" title="profilesList.installations.label" style="white-space: nowrap">
<ul>
<s:if test='profile.jdk != null'>
<li><c:out value="${profile.jdk.name}"/> (<c:out value="${profile.jdk.type}"/>)</li>
@@ -64,7 +64,7 @@
<li><c:out value="${envVar.name}" /></li>
</c:forEach>
</s:if>
- <ul>
+ </ul>
</ec:column>
<ec:column property="id" title=" " width="1%">
<a href="editBuildEnv!edit.action?profile.id=<c:out value="${pageScope.profile.id}"/>">
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp Sun Jan 11 01:52:08 2009
@@ -34,7 +34,7 @@
<c:if test="${!empty actionErrors}">
<div class="errormessage">
<s:iterator value="actionErrors">
- <p><s:text name="<s:property/>" /></p>
+ <p><s:property/></p>
</s:iterator>
</div>
</c:if>
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp Sun Jan 11 01:52:08 2009
@@ -36,7 +36,7 @@
<c:when test="${!empty actionErrors}">
<div class="errormessage">
<s:iterator value="actionErrors">
- <p><s:text name="<s:property/>" /></p>
+ <p><s:property/></p>
</s:iterator>
</div>
<input type="button" value="Back" onClick="history.go(-1)">
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp Sun Jan 11 01:52:08 2009
@@ -26,7 +26,7 @@
<div class="axial">
<table>
<tr>
- <td><center>This Component Failed to Render</center></td>
+ <td><center><s:text name="failureComponent.section.title"/></center></td>
</tr>
</table>
</div>
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp Sun Jan 11 01:52:08 2009
@@ -24,7 +24,7 @@
<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
<s:i18n name="localization.Continuum">
- <h3>Project Group Notifiers of ${projectGroup.name} group</h3>
+ <h3><s:text name="projectGroupNotifierSummaryComponent.groupNotifiers"><s:param>${projectGroup.name}</s:param></s:text></h3>
<c:if test="${not empty projectGroupNotifierSummaries}">
<ec:table items="projectGroupNotifierSummaries"
var="projectGroupNotifierSummary"
@@ -84,7 +84,7 @@
</redback:ifAuthorized>
<c:if test="${not empty projectNotifierSummaries}">
- <h3>Project Notifiers</h3>
+ <h3><s:text name="projectGroupNotifierSummaryComponent.projectNotifiers"/></h3>
<ec:table items="projectNotifierSummaries"
var="projectNotifierSummary"
showExports="false"
@@ -93,7 +93,7 @@
filterable="false"
sortable="false">
<ec:row>
- <ec:column property="projectName" title="PROJECT NAME">
+ <ec:column property="projectName" title="projectView.project.name">
<s:url id="projectUrl" action="projectView" namespace="/" includeParams="none">
<s:param name="projectId">${pageScope.projectNotifierSummary.projectId}</s:param>
</s:url>
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildResultsRemoval.jsp
('svn:executable' removed)
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmDeleteProjects.jsp
('svn:executable' removed)
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp Sun Jan 11 01:52:08 2009
@@ -32,19 +32,19 @@
<link rel="stylesheet" type="text/css" href="<s:url value="/css/extremecomponents.css" includeParams="none"/>" media="screen"/>
<link rel="shortcut icon" href="<s:url value="/favicon.ico" includeParams="none"/>" type="image/x-icon"/>
<script type="text/javascript" src="<s:url value="/js/prototype.js" includeParams="none"/>"></script>
-
+ <s:head/>
<decorator:head/>
</head>
<body onload="<decorator:getProperty property="body.onload" />" marginwidth="0" marginheight="0" class="composite">
-<%@ include file="/WEB-INF/jsp/navigations/DefaultTop.jsp" %>
+<s:include value="/WEB-INF/jsp/navigations/DefaultTop.jsp"/>
<table id="main" border="0" cellpadding="4" cellspacing="0" width="100%">
<tbody>
<tr valign="top">
<td id="leftcol" width="180">
<br/> <br/>
- <%@ include file="/WEB-INF/jsp/navigations/Menu.jsp" %>
+ <s:include value="/WEB-INF/jsp/navigations/Menu.jsp"/>
</td>
<td width="86%">
<br/>
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp Sun Jan 11 01:52:08 2009
@@ -35,7 +35,7 @@
<c:if test="${!empty actionErrors}">
<div class="errormessage">
<s:iterator value="actionErrors">
- <p><s:text name="<s:property/>" /></p>
+ <p><s:property/></p>
</s:iterator>
</div>
</c:if>
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/authorizationError.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/authorizationError.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp Sun Jan 11 01:52:08 2009
@@ -187,7 +187,7 @@
</redback:ifAnyAuthorized>
<div id="projectmenu" class="toolgroup">
- <div class="label">Legend</div>
+ <div class="label"><s:text name="legend.title"/></div>
<div id="legend">
<div id="litem1" class="body"><s:text name="legend.buildNow"/></div>
<div id="litem2" class="body"><s:text name="legend.buildHistory"/></div>
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp Sun Jan 11 01:52:08 2009
@@ -64,8 +64,8 @@
<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"/>
<s:checkbox label="%{getText('notifier.event.sendOnWarning')}" name="sendOnWarning" value="sendOnWarning" fieldValue="true"/>
- <ww:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
- <ww:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
+ <s:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
+ <s:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
</tbody>
</table>
<div class="functnbar3">
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp Sun Jan 11 01:52:08 2009
@@ -63,8 +63,8 @@
<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"/>
<s:checkbox label="%{getText('notifier.event.sendOnWarning')}" name="sendOnWarning" value="sendOnWarning" fieldValue="true"/>
- <ww:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
- <ww:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
+ <s:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
+ <s:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
</tbody>
</table>
<div class="functnbar3">
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp Sun Jan 11 01:52:08 2009
@@ -58,8 +58,8 @@
<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"/>
<s:checkbox label="%{getText('notifier.event.sendOnWarning')}" name="sendOnWarning" value="sendOnWarning" fieldValue="true"/>
- <ww:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
- <ww:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
+ <s:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
+ <s:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
</tbody>
</table>
<div class="functnbar3">
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp Sun Jan 11 01:52:08 2009
@@ -58,8 +58,8 @@
<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"/>
<s:checkbox label="%{getText('notifier.event.sendOnWarning')}" name="sendOnWarning" value="sendOnWarning" fieldValue="true"/>
- <ww:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
- <ww:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
+ <s:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
+ <s:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
</tbody>
</table>
<div class="functnbar3">
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp Sun Jan 11 01:52:08 2009
@@ -35,7 +35,7 @@
<c:if test="${!empty actionErrors}">
<div class="errormessage">
<s:iterator value="actionErrors">
- <p><s:text name="<s:property/>" /></p>
+ <p><s:property/></p>
</s:iterator>
</div>
</c:if>
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp Sun Jan 11 01:52:08 2009
@@ -40,7 +40,7 @@
<c:if test="${!empty actionErrors}">
<div class="errormessage">
<s:iterator value="actionErrors">
- <p><s:text name="<s:property/>" /></p>
+ <p><s:property/></p>
</s:iterator>
</div>
</c:if>
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp Sun Jan 11 01:52:08 2009
@@ -96,7 +96,7 @@
</table>
</div>
- <h3><ww:text name="projectGroup.scmRoot.title"/></h3>
+ <h3><s:text name="projectGroup.scmRoot.title"/></h3>
<ec:table items="projectScmRoots"
var="projectScmRoot"
showExports="false"
@@ -116,7 +116,7 @@
<c:if test="${!empty actionErrors}">
<div class="errormessage">
<s:iterator value="actionErrors">
- <p><s:text name="<s:property/>" /></p>
+ <p><s:property/></p>
</s:iterator>
</div>
</c:if>
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInProgress.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInitialized.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseProject.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp Sun Jan 11 01:52:08 2009
@@ -21,17 +21,14 @@
<html>
<s:i18n name="localization.Continuum">
<head>
- <title><ww:text name="scmResult.page.title"/></title>
+ <title><s:text name="scmResult.page.title"/></title>
</head>
<body>
<div id="h3">
-
<s:action name="projectGroupTab" executeResult="true"/>
-
<h3>
- <ww:text name="scmResult.section.title"/>
+ <s:text name="scmResult.section.title"/>
</h3>
-
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
<c1:data label="%{getText('scmResult.projectGroupName')}" name="projectGroupName"/>
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/test/resources/log4j.xml
('svn:executable' removed)
Modified: continuum/branches/continuum-distributed-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java Sun Jan 11 01:52:08 2009
@@ -30,6 +30,8 @@
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.Iterator;
@@ -43,16 +45,13 @@
public class ConfiguredBeanProcessorFactory
implements RequestProcessorFactoryFactory, Initializable, Contextualizable
{
+ private Logger log = LoggerFactory.getLogger( ConfiguredBeanProcessorFactory.class );
+
/**
* @plexus.requirement role="org.apache.maven.continuum.xmlrpc.server.ContinuumXmlRpcComponent"
*/
private Map xmlrpcComponents;
- /**
- * @plexus.requirement
- */
- private Listener listener;
-
private Map componentsMapping = new HashMap();
PlexusContainer container;
@@ -91,7 +90,7 @@
protected Object getRequestProcessor( Class cls )
throws XmlRpcException
{
- listener.getLogger().debug( "Load '" + cls.getName() + "' handler." );
+ log.debug( "Load '" + cls.getName() + "' handler." );
Object obj = null;
try
@@ -100,7 +99,7 @@
}
catch ( ComponentLookupException e )
{
- listener.getLogger().error( "Can't load component.", e );
+ log.error( "Can't load component.", e );
}
if ( obj == null )
@@ -120,7 +119,7 @@
throws ComponentLookupException
{
String key = getComponentKey( cls );
- listener.getLogger().debug( "load component:" );
+ log.debug( "load component:" + key );
return container.lookup( ContinuumXmlRpcComponent.class.getName(), key );
}
Modified: continuum/branches/continuum-distributed-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java Sun Jan 11 01:52:08 2009
@@ -28,6 +28,8 @@
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.lang.reflect.Method;
import java.util.Iterator;
@@ -42,16 +44,13 @@
extends PropertyHandlerMapping
implements Contextualizable
{
+ private Logger log = LoggerFactory.getLogger( PropertiesHandlerMapping.class );
+
/**
* @plexus.requirement role="org.apache.maven.continuum.xmlrpc.server.ContinuumXmlRpcComponent"
*/
private Map xmlrpcComponents;
- /**
- * @plexus.requirement
- */
- private Listener listener;
-
private PlexusContainer container;
public void load()
@@ -61,17 +60,20 @@
{
String key = (String) i.next();
Class cl = xmlrpcComponents.get( key ).getClass();
- listener.getLogger().debug( key + " => " + cl.getName() );
+ if ( log.isDebugEnabled() )
+ {
+ log.debug( key + " => " + cl.getName() );
+ }
registerPublicMethods( key, cl );
}
- if ( listener.getLogger().isDebugEnabled() )
+ if ( log.isDebugEnabled() )
{
String[] methods = getListMethods();
for ( int i = 0; i < methods.length; i++ )
{
- listener.getLogger().debug( methods[i] );
+ log.debug( methods[i] );
}
}
}
Modified: continuum/branches/continuum-distributed-builds/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/pom.xml?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/pom.xml Sun Jan 11 01:52:08 2009
@@ -734,7 +734,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.0-beta1</version>
+ <version>4.0-beta2</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -765,13 +765,14 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.0</version>
+ <version>${slf4jVersion}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.0</version>
+ <version>${slf4jVersion}</version>
</dependency>
+
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-taskqueue</artifactId>
@@ -815,7 +816,7 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
- <version>2.0.12</version>
+ <version>2.0.14</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -826,7 +827,7 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-spring-plugin</artifactId>
- <version>2.0.12</version>
+ <version>2.0.14</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -837,7 +838,7 @@
<dependency>
<groupId>com.opensymphony</groupId>
<artifactId>xwork</artifactId>
- <version>2.0.6</version>
+ <version>2.0.7</version>
</dependency>
<!--
Plexus Redback Dependencies
@@ -998,6 +999,11 @@
<version>${spring.version}</version>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-purge</artifactId>
<version>${pom.version}</version>
@@ -1085,10 +1091,11 @@
<properties>
<continuumWebappVersion>${pom.version}</continuumWebappVersion>
<maven.version>2.0.9</maven.version>
- <spring.version>2.5.4</spring.version>
+ <spring.version>2.5.6</spring.version>
<wagon.version>1.0-beta-2</wagon.version>
<maven-scm.version>1.1</maven-scm.version>
- <redback.version>1.2-beta-1</redback.version>
+ <redback.version>1.2-SNAPSHOT</redback.version>
<archiva.version>1.1</archiva.version>
+ <slf4jVersion>1.5.6</slf4jVersion>
</properties>
</project>