modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
| 6 +++---
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerBean.java
| 5 ++---
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentServerPluginContainer.java
| 9 +++------
3 files changed, 8 insertions(+), 12 deletions(-)
New commits:
commit cae22c0c76b5b5124b53f05334c33de21d4bb77f
Author: Jason Dobies <jason.dobies(a)redhat.com>
Date: Mon Nov 30 16:29:51 2009 -0500
Renamed sync to reflect which sync its running.
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
index 1cabd8d..384c948 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
@@ -428,7 +428,7 @@ public class ContentSourceManagerBean implements
ContentSourceManagerLocal {
// Schedule a job for the future
pc.scheduleProviderSyncJob(contentSource);
// Also sync immediately so we have the metadata
- pc.syncNow(contentSource);
+ pc.syncProviderNow(contentSource);
} catch (InitializationException ie) {
log.warn("Failed to start adapter for [" + contentSource +
"]", ie);
@@ -495,7 +495,7 @@ public class ContentSourceManagerBean implements
ContentSourceManagerLocal {
pc.unscheduleSyncJob(contentSource);
pc.getAdapterManager().restartAdapter(contentSource);
pc.scheduleProviderSyncJob(contentSource);
- pc.syncNow(contentSource);
+ pc.syncProviderNow(contentSource);
} catch (Exception e) {
log.warn("Failed to restart adapter for [" + contentSource +
"]", e);
}
@@ -547,7 +547,7 @@ public class ContentSourceManagerBean implements
ContentSourceManagerLocal {
ContentSource contentSource = entityManager.find(ContentSource.class,
contentSourceId);
if (contentSource != null) {
- pc.syncNow(contentSource);
+ pc.syncProviderNow(contentSource);
} else {
log.warn("Asked to synchronize a non-existing content source ["
+ contentSourceId + "]");
}
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerBean.java
index b34c324..ca2f1a7 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerBean.java
@@ -20,7 +20,6 @@ package org.rhq.enterprise.server.content;
import java.util.ArrayList;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -556,7 +555,7 @@ public class RepoManagerBean implements RepoManagerLocal,
RepoManagerRemote {
entityManager.clear();
// ask to synchronize the content source immediately (is this the right thing
to do?)
- pc.syncNow(cs);
+ pc.syncProviderNow(cs);
}
return;
@@ -894,7 +893,7 @@ public class RepoManagerBean implements RepoManagerLocal,
RepoManagerRemote {
Repo found = this.getRepo(subject, repoId);
Set<ContentSyncStatus> stati = new HashSet<ContentSyncStatus>();
List<RepoSyncResults> syncResults = found.getSyncResults();
- // Add the most recent sync results status
+ // Add the most recent sync results status
if (syncResults != null && (!syncResults.isEmpty()) &&
syncResults.get(0) != null) {
stati.add(syncResults.get(0).getStatus());
} else {
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentServerPluginContainer.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentServerPluginContainer.java
index 6204e28..97e270e 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentServerPluginContainer.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentServerPluginContainer.java
@@ -105,7 +105,7 @@ public class ContentServerPluginContainer extends
AbstractTypeServerPluginContai
*
* @throws SchedulerException if failed to schedule the job for immediate execution
*/
- public void syncNow(final ContentSource contentSource) throws SchedulerException {
+ public void syncProviderNow(final ContentSource contentSource) throws
SchedulerException {
// Create our job with a trigger that fires immediately and doesn't repeat.
// Make the name unique - we may already have our cron job schedules.
// What happens if this is triggered when our cron job is triggered? the job will
abort and let the current job finish
@@ -120,11 +120,8 @@ public class ContentServerPluginContainer extends
AbstractTypeServerPluginContai
SchedulerLocal scheduler = LookupUtil.getSchedulerBean();
Date next = scheduler.scheduleJob(job, trigger);
- getLog().info(
- "Scheduled content source sync job [" + job.getName() + ':'
+ job.getGroup() + "] to fire now at [" + next
- + "] for [" + contentSource + "]");
-
- return;
+ getLog().info("Scheduled content source sync job [" + job.getName() +
':' + job.getGroup() +
+ "] to fire now at [" + next + "] for [" + contentSource +
"]");
}
/**
Show replies by date