continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From och...@apache.org
Subject svn commit: r734009 [8/8] - in /continuum/branches/continuum-parallel-builds: ./ continuum-api/src/main/java/org/apache/continuum/buildmanager/ continuum-api/src/main/java/org/apache/continuum/configuration/ continuum-api/src/main/java/org/apache/conti...
Date Tue, 13 Jan 2009 03:00:37 GMT
Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction_de.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction_de.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction_fr.properties
            ('svn:executable' removed)

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction_de.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction_de.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction_fr.properties
            ('svn:executable' removed)

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/WagonProjectNotifierEditAction_de.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/WagonProjectNotifierEditAction_de.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/WagonProjectNotifierEditAction_fr.properties
            ('svn:executable' removed)

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/struts.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/struts.properties?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/struts.properties (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/struts.properties Mon Jan 12 18:58:46 2009
@@ -36,6 +36,6 @@
 #struts.multipart.maxSize = 
 
 # Localization
-struts.custom.i18n.resources=localization,org.codehaus.plexus.redback.struts2.default,org.apache.maven.continuum.redback.custom
+struts.custom.i18n.resources=localization/Continuum,org.codehaus.plexus.redback.struts2.default,org.apache.maven.continuum.redback.custom
 
 struts.freemarker.templatesCache=true

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/struts.xml?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/struts.xml (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/struts.xml Mon Jan 12 18:58:46 2009
@@ -407,6 +407,10 @@
       </result>
     </action>
 
+    <action name="scmResult" class="scmResult">
+      <result name="success">/WEB-INF/jsp/scmResult.jsp</result>
+    </action>
+    
     <!--
     * schedule actions
     -->
@@ -440,6 +444,13 @@
       </result>
     </action>    
 
+    <action name="cancelGroupBuild" class="cancelBuild" method="cancelGroupBuild">
+      <result name="success" type="redirect-action">
+        <param name="actionName">projectGroupSummary</param>
+        <param name="projectGroupId">${projectGroupId}</param>
+      </result>
+    </action>
+
     <!--
     - continuum release
     -->

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/template/default/a-close.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/template/default/a-close.ftl
            ('svn:executable' removed)

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/template/default/a-close.ftl
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/template/default/a.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/template/default/a.ftl
            ('svn:executable' removed)

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/template/default/a.ftl
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/template/default/form-validate.ftl
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/template/default/form-validate.ftl?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/template/default/form-validate.ftl (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/template/default/form-validate.ftl Mon Jan 12 18:58:46 2009
@@ -1,5 +1,5 @@
 <#if parameters.validate?default(false) == true>
-	<script src="${base}/template/validation.js"></script>
+	<script src="${base}/struts/validation.js"></script>
 	<#if parameters.onsubmit?exists>
 		${tag.addParameter('onsubmit', "${parameters.onsubmit}; customOnsubmit(); return validateForm_${parameters.id}();")}
 	<#else>

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/template/default/head.ftl
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/template/default/head.ftl?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/template/default/head.ftl (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/resources/template/default/head.ftl Mon Jan 12 18:58:46 2009
@@ -1,2 +1,34 @@
-<link rel="stylesheet" href="<@s.url value='/webwork/xhtml/styles.css' encode='false' />" type="text/css"/>
-<#include "/${parameters.templateDir}/simple/head.ftl" />
+<#--
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+<script type="text/javascript">
+    // Dojo configuration
+    djConfig = {
+        baseRelativePath: "<@s.url includeParams='none' value='/struts/dojo' includeParams="none" encode='false'/>",
+        isDebug: ${parameters.debug?default(false)},
+        bindEncoding: "${parameters.encoding}",
+        debugAtAllCosts: true // not needed, but allows the Venkman debugger to work with the includes
+    };
+</script>
+<script type="text/javascript"
+        src="<@s.url includeParams='none' value='/struts/dojo/dojo.js' includeParams="none" encode='false'/>"></script>
+<script type="text/javascript"
+        src="<@s.url includeParams='none' value='/struts/dojoRequire.js' includeParams="none" encode='false'/>"></script>
\ No newline at end of file

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml Mon Jan 12 18:58:46 2009
@@ -52,14 +52,6 @@
   <bean id="workingDirectoryService" class="org.apache.maven.continuum.utils.ChrootJailWorkingDirectoryService" autowire="byName"/>
   -->
 
-  <bean id="scmManager"
-    class="org.apache.continuum.scm.manager.ScmManager">
-    <property name="scmLogger" ref="scmLogger" />
-    <property name="scmProviders">
-      <bean class="org.apache.continuum.scm.manager.spring.ScmProviderFactoryBean"/>
-    </property>
-  </bean>
-  
   <bean id="mailSession" class="org.springframework.jndi.JndiObjectFactoryBean">
     <property name="jndiName" value="java:comp/env/mail/Session">
     </property>

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml
            ('svn:executable' removed)

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp Mon Jan 12 18:58:46 2009
@@ -43,26 +43,26 @@
                         </c:if>
                         <table>
                           <tbody>
-                            <s:textfield label="%{getText('add.m2.project.m2PomUrl.label')}" name="m2PomUrl">
-                                <s:param name="desc">
-                                <table cellspacing="0" cellpadding="0">
-                                  <tbody>
-                                    <tr>
-                                      <td><s:text name="add.m2.project.m2PomUrl.username.label"/>: </td>
-                                      <td><input type="text" name="scmUsername" size="20" id="addMavenTwoProject_scmUsername"/><td>
-                                    </tr>  
-                                    <tr>
-                                      <td><s:text name="add.m2.project.m2PomUrl.password.label"/>: </td>
-                                      <td><input type="password" name="scmPassword" size="20" id="addMavenTwoProject_scmPassword"/><td>
-                                    </tr>  
-                                  </tbody>
-                                    <tr>
-                                      <td></td>
-                                      <td><s:checkbox label="%{getText('projectEdit.project.scmUseCache.label')}" name="scmUseCache"/><td>
-                                    </tr>
-                                </table>  
-                                  <p><s:text name="add.m2.project.m2PomUrl.message"/></p>
-                                </s:param>
+                            <s:textfield label="%{getText('add.m2.project.m2PomUrl.label')}" required="true" name="m2PomUrl">
+	                            <s:param name="desc">
+		                            <table cellspacing="0" cellpadding="0">
+		                              <tbody>
+		                                <tr>
+		                                  <td><s:text name="add.m2.project.m2PomUrl.username.label"/>: </td>
+		                                  <td><input type="text" name="scmUsername" size="20" id="addMavenTwoProject_scmUsername"/></td>
+		                                </tr>  
+		                                <tr>
+		                                  <td><s:text name="add.m2.project.m2PomUrl.password.label"/>: </td>
+		                                  <td><input type="password" name="scmPassword" size="20" id="addMavenTwoProject_scmPassword"/></td>
+		                                </tr>  
+		                              </tbody>
+		                                <tr>
+		                                  <td></td>
+		                                  <td><s:checkbox label="%{getText('projectEdit.project.scmUseCache.label')}" name="scmUseCache"/></td>
+		                                </tr>
+		                            </table>  
+	                            <p><s:text name="add.m2.project.m2PomUrl.message"/></p>
+	                            </s:param>
                             </s:textfield>
                             <s:label>
                               <s:param name="after"><strong><s:text name="or"/></strong></s:param>

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp Mon Jan 12 18:58:46 2009
@@ -21,66 +21,67 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <html>
+<s:i18n name="localization.Continuum">
 <head>
-  <title>Configure Appearance</title>
+  <title><s:text name="appearance.page.title"/></title>
   <s:head/>
 </head>
 
 <body>
-<h1>Appearance</h1>
+<h1><s:text name="appearance.section.title"/></h1>
 
 <div style="float: right">
-  <a href="<s:url action='editAppearance' />">Edit</a>
+  <a href="<s:url action='editAppearance' />"><s:text name="edit"/></a>
 </div>
-<h2>Company Details</h2>
+<h2><s:text name="appearance.companyDetails"/></h2>
 
 <p>
-  The logo in the top right of the screen is controlled by your selected 'company POM'.
+  <s:text name="appearance.description"/>
 </p>
 
 <s:set name="companyPom" value="companyPom"/>
 
 <c:if test="${empty (companyPom.groupId) || empty (companyPom.artifactId)}">
   <p>
-    You have not yet specified a company POM. <a href="<s:url action='editAppearance' />">Select a Company POM</a>
+    <s:text name="appearance.noCompanyPom"/> <a href="<s:url action='editAppearance' />"><s:text name="appearance.selectCompanyPom"/></a>
   </p>
 </c:if>
 
 <c:if test="${!empty (companyPom.groupId) && !empty (companyPom.artifactId)}">
   <p>
-    Your selected company POM is below. If you would like to change the organization name, url or logo, you can
-    <a href="<s:url action='editCompanyPom'/>">edit the POM</a>.
+    <s:text name="appearance.detailsIntroduction"/> <s:text name="appearance.maybeChange"/>
+    <a href="<s:url action='editCompanyPom'/>"><s:text name="appearance.editThePomLink"/></a>.
   </p>
 
   <s:set name="companyModel" value="companyModel"/>
   <table>
-    <s:label name="companyPom.groupId" label="Group ID"/>
-    <s:label name="companyPom.artifactId" label="Artifact ID"/>
+    <s:label name="companyPom.groupId" label="%{getText('appearance.companyPom.groupId')}"/>
+    <s:label name="companyPom.artifactId" label="%{getText('appearance.companyPom.artifactId')}"/>
     <c:if test="${companyModel != null}">
-      <s:label name="companyModel.version" label="Version"/>
+      <s:label name="companyModel.version" label="%{getText('appearance.companyPom.version')}"/>
     </c:if>
   </table>
 
   <div style="float: right">
-    <a href="<s:url action='editCompanyPom' />">Edit Company POM</a>
+    <a href="<s:url action='editCompanyPom' />"><s:text name="appearance.editCompanyPom"/></a>
   </div>
-  <h3>POM Information</h3>
+  <h3><s:text name="appearance.companyPom.section.title"/></h3>
 
   <c:choose>
     <c:when test="${companyModel != null}">
       <table>
         <tr>
-          <th>Name</th>
+          <th><s:text name="appearance.companyPom.organizationName.label"/></th>
           <td>${companyModel.organization.name}</td>
         </tr>
         <tr>
-          <th>URL</th>
+          <th><s:text name="appearance.companyPom.organizationUrl.label"/></th>
           <td><a href="${companyModel.organization.url}" target="_blank">
             <code>${companyModel.organization.url}</code>
           </a></td>
         </tr>
         <tr>
-          <th>Logo URL</th>
+          <th><s:text name="appearance.companyPom.organizationLogoUrl.label"/></th>
           <td>
             <code>${companyModel.properties['organization.logo']}</code>
           </td>
@@ -88,18 +89,18 @@
       </table>
     </c:when>
     <c:otherwise>
-      Company POM '${companyPom.groupId}:${companyPom.artifactId}' doesn't exist.
-      <a href="<s:url action='editCompanyPom' />">Create company POM</a>
+      <s:text name="appearance.companyPomDoesNotExist"><s:param>${companyPom.groupId}:${companyPom.artifactId}</s:param></s:text>
+      <a href="<s:url action='editCompanyPom' />"><s:text name="appearance.createCompanyPom"/></a>
     </c:otherwise>
   </c:choose>
 </c:if>
 <s:form action="saveFooter!saveFooter.action" method="get" namespace="/admin">
   <div id="axial" class="h3">
-    <h3>footer content</h3>
+    <h3><s:text name="appearance.footerContent"/></h3>
     <div class="axial">
       <table>
         <tbody>  
-          <s:textarea cols="120" rows="3" label="HTML Content" name="footer" />
+          <s:textarea cols="120" rows="3" label="%{getText('appearance.htmlContent.label')}" name="footer" />
         </tbody>
       </table>
       <div class="functnbar3">
@@ -109,5 +110,5 @@
   </div>
 </s:form>
 </body>
-
+</s:i18n>
 </html>

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
            ('svn:executable' removed)

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
            ('svn:executable' removed)

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp Mon Jan 12 18:58:46 2009
@@ -36,11 +36,13 @@
 
     <s:form action="configuration!save" method="post">
 
-    <c:if test="${!empty actionErrors}">
-      <div class="errormessage">
-        <p><s:actionerror/></p>
-      </div>
-    </c:if>
+      <c:if test="${!empty actionErrors}">
+        <div class="errormessage">
+          <s:iterator value="actionErrors">
+            <p><s:property/></p>
+          </s:iterator>
+        </div>
+      </c:if>
 
       <div class="axial">
 

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp
            ('svn:executable' removed)

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp Mon Jan 12 18:58:46 2009
@@ -19,27 +19,27 @@
 
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
+<s:i18n name="localization.Continuum">
 <head>
-  <title>Configure Appearance</title>
+  <title><s:text name="appearance.page.title"/></title>
   <s:head/>
 </head>
 
 <body>
-  <h1>Appearance</h1>
+  <h1><s:text name="appearance.section.title"/></h1>
 
-  <h2>Company Details</h2>
+  <h2><s:text name="appearance.companyDetails"/></h2>
 
   <p>
-    Enter the details of the company super POM below. If it exists, the organization name, URL and logo will be read
-    from it.
+    <s:text name="appearance.enterCompanyPom"/>
   </p>
 
   <s:actionmessage/>
   <s:form method="post" action="saveAppearance" namespace="/admin" validate="true" theme="xhtml">
-    <s:textfield name="companyPom.groupId" label="Group ID"/>
-    <s:textfield name="companyPom.artifactId" label="Artifact ID"/>
-    <s:submit value="Save"/>
+    <s:textfield name="companyPom.groupId" label="%{getText('appearance.companyPom.groupId')}"/>
+    <s:textfield name="companyPom.artifactId" label="%{getText('appearance.companyPom.artifactId')}"/>
+    <s:submit value="%{getText('save')}"/>
   </s:form>
 </body>
-
-</html>
\ No newline at end of file
+</s:i18n>
+</html>

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp Mon Jan 12 18:58:46 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-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp
            ('svn:executable' removed)

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp Mon Jan 12 18:58:46 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-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp
            ('svn:executable' removed)

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp Mon Jan 12 18:58:46 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-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp Mon Jan 12 18:58:46 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-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp Mon Jan 12 18:58:46 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="&nbsp;" 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-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp Mon Jan 12 18:58:46 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-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp Mon Jan 12 18:58:46 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="&nbsp;" width="1%">
           <a href="editInstallation!edit.action?installation.installationId=<c:out value="${installation.installationId}"/>">

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp Mon Jan 12 18:58:46 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-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp Mon Jan 12 18:58:46 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="&nbsp;" width="1%">
           <a href="editBuildEnv!edit.action?profile.id=<c:out value="${pageScope.profile.id}"/>">

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp Mon Jan 12 18:58:46 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-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp Mon Jan 12 18:58:46 2009
@@ -30,13 +30,13 @@
         <h3><s:text name="buildDefinition.section.title"/></h3>
 
         <div class="axial">
-          <s:form action="saveBuildDefinition" method="get" validate="true">
+          <s:form action="saveBuildDefinition" method="get">
             <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)">

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp Mon Jan 12 18:58:46 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-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp Mon Jan 12 18:58:46 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-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildResultsRemoval.jsp
            ('svn:executable' removed)

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmDeleteProjects.jsp
            ('svn:executable' removed)

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp Mon Jan 12 18:58:46 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-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp Mon Jan 12 18:58:46 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>

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/authorizationError.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/authorizationError.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp Mon Jan 12 18:58:46 2009
@@ -185,7 +185,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-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp Mon Jan 12 18:58:46 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-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp Mon Jan 12 18:58:46 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-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp Mon Jan 12 18:58:46 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-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp Mon Jan 12 18:58:46 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-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp Mon Jan 12 18:58:46 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-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp Mon Jan 12 18:58:46 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-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp Mon Jan 12 18:58:46 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>
@@ -175,6 +175,14 @@
                 </form>
               </redback:ifAuthorized>
             </td>
+            <td>
+              <redback:ifAuthorized permission="continuum-build-project-in-group" resource="${projectGroup.name}">
+                <form action="cancelGroupBuild.action" method="post">
+                  <input type="hidden" name="projectGroupId" value="<s:property value="projectGroupId"/>"/>
+                  <input type="submit" name="cancel" value="<s:text name="projectGroup.cancelGroupBuild"/>"/>
+                </form>
+              </redback:ifAuthorized>
+            </td>
           </tr>
         </table>
       </div>

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInProgress.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInitialized.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp Mon Jan 12 18:58:46 2009
@@ -41,6 +41,7 @@
             <s:textfield label="%{getText('releasePrepare.prepareGoals.label')}" name="prepareGoals" required="true"/>
             <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"/>
           </table>
         </div>
 

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseProject.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp (original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp Mon Jan 12 18:58:46 2009
@@ -21,34 +21,25 @@
 <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')}">
-                <ww:param name="after" value="projectGroupName"/>
-            </c1:data>
-            <c1:data label="%{getText('scmResult.scmRootAddress')}">
-                <ww:param name="after" value="projectScmRoot.scmRootAddress"/>
-            </c1:data>
-            <c1:data label="%{getText('scmResult.state')}">
-                <ww:param name="after" value="state"/>
-            </c1:data>
+            <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"/>
           </table>
         </div>
         
-        <h4><ww:text name="scmResult.scmError"/></h4>
+        <h4><s:text name="scmResult.scmError"/></h4>
         <div style="width:100%; height:500px; overflow:auto; border-style: solid; border-width: 1px">
-          <pre><ww:property value="projectScmRoot.error"/></pre>
+          <pre><s:property value="projectScmRoot.error"/></pre>
         </div>
       </div>
     </body>

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-webapp/src/test/resources/log4j.xml
            ('svn:executable' removed)

Modified: continuum/branches/continuum-parallel-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-parallel-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java Mon Jan 12 18:58:46 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-parallel-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-parallel-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java Mon Jan 12 18:58:46 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-parallel-builds/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/pom.xml?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/pom.xml (original)
+++ continuum/branches/continuum-parallel-builds/pom.xml Mon Jan 12 18:58:46 2009
@@ -706,7 +706,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>
@@ -737,13 +737,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>
@@ -787,7 +788,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>
@@ -798,7 +799,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>
@@ -809,7 +810,7 @@
       <dependency>
         <groupId>com.opensymphony</groupId>
         <artifactId>xwork</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
       </dependency>
       <!--
         Plexus Redback Dependencies
@@ -970,6 +971,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>
@@ -1057,10 +1063,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>



Mime
View raw message