Author: marrs
Date: Mon Mar 12 07:20:12 2012
New Revision: 1299570
URL: http://svn.apache.org/viewvc?rev=1299570&view=rev
Log:
ACE-220 applied patch
Modified:
ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/DeploymentCheckTask.java
ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/DeploymentUpdateTask.java
Modified:
ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/DeploymentCheckTask.java
URL:
http://svn.apache.org/viewvc/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/DeploymentCheckTask.java?rev=1299570&r1=1299569&r2=1299570&view=diff
==============================================================================
---
ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/DeploymentCheckTask.java
(original)
+++
ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/DeploymentCheckTask.java
Mon Mar 12 07:20:12 2012
@@ -51,12 +51,14 @@ public class DeploymentCheckTask impleme
Version highestLocalVersion = m_task.getHighestLocalVersion();
Version highestRemoteVersion = m_task.getHighestRemoteVersion();
if (highestRemoteVersion == null) {
- //expected if there's no discovered
- //ps or relay server
- m_log.log(LogService.LOG_INFO, "Highest remote: unknown /
Highest local: " + highestLocalVersion);
+ //expected if there's no discovered ps or relay server
+ // ACE-220: lower log level; not of real interest...
+ m_log.log(LogService.LOG_DEBUG, "Highest remote: unknown /
Highest local: " + highestLocalVersion);
return;
}
- m_log.log(LogService.LOG_INFO, "Highest remote: " +
highestRemoteVersion + " / Highest local: " + highestLocalVersion);
+ // ACE-220: lower log level; not of real interest...
+ m_log.log(LogService.LOG_DEBUG, "Highest remote: " +
highestRemoteVersion + " / Highest local: " + highestLocalVersion);
+
if ((highestRemoteVersion != null) && ((highestLocalVersion ==
null) || (highestRemoteVersion.compareTo(highestLocalVersion) > 0))) {
Properties properties = new Properties();
properties.put("deploymentpackage.localversion",
((highestLocalVersion == null) ? Version.emptyVersion : highestLocalVersion));
Modified:
ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/DeploymentUpdateTask.java
URL:
http://svn.apache.org/viewvc/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/DeploymentUpdateTask.java?rev=1299570&r1=1299569&r2=1299570&view=diff
==============================================================================
---
ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/DeploymentUpdateTask.java
(original)
+++
ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/DeploymentUpdateTask.java
Mon Mar 12 07:20:12 2012
@@ -47,12 +47,14 @@ public class DeploymentUpdateTask implem
Version highestLocalVersion = m_task.getHighestLocalVersion();
Version highestRemoteVersion = m_task.getHighestRemoteVersion();
if (highestRemoteVersion == null) {
- //expected if there's no discovered
- //ps or relay server
- m_log.log(LogService.LOG_INFO, "Highest remote: unknown /
Highest local: " + highestLocalVersion);
+ // expected if there's no discovered ps or relay server
+ // ACE-220: lower log level; not of real interest...
+ m_log.log(LogService.LOG_DEBUG, "Highest remote: unknown /
Highest local: " + highestLocalVersion);
return;
}
- m_log.log(LogService.LOG_INFO, "Highest remote: " +
highestRemoteVersion + " / Highest local: " + highestLocalVersion);
+ // ACE-220: lower log level; not of real interest...
+ m_log.log(LogService.LOG_DEBUG, "Highest remote: " +
highestRemoteVersion + " / Highest local: " + highestLocalVersion);
+
if ((highestRemoteVersion != null) && ((highestLocalVersion ==
null) || (highestRemoteVersion.compareTo(highestLocalVersion) > 0))) {
// no local version or local version lower than remote,
install the update
m_task.installVersion(highestRemoteVersion,
highestLocalVersion);
