etc/samples/perspectives/sample-perspective/app/src/main/webapp/createContentProviderJBossASPatch.xhtml
| 6 -
etc/samples/perspectives/sample-perspective/app/src/main/webapp/createContentProviderRHN.xhtml
| 6 -
modules/core/domain/src/main/java/org/rhq/core/domain/common/Tag.java
| 4 -
modules/core/domain/src/main/java/org/rhq/core/domain/content/Repo.java
| 4 -
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentProviderDetailsUIBean.java
| 8 +-
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentSourceCandidateReposUIBean.java
| 4 -
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentSourceReposUIBean.java
| 4 -
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentSourceSyncResultsUIBean.java
| 4 -
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateContentSourceUIBean.java
| 6 -
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ListContentSourcesUIBean.java
| 8 +-
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ListReposUIBean.java
| 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoAssociationsUIBean.java
| 6 -
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoContentSourcesUIBean.java
| 4 -
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoDisassociationsUIBean.java
| 6 -
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoImportUIBean.java
| 2
modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties
| 10 +-
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/content-navigation.xml
| 2
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-view-map.xhtml
| 2
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider.xhtml
| 14 +--
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider-edit-map.xhtml
| 2
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/importRepos.xhtml
| 4 -
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listContentProviders.xhtml
| 4 -
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listRepos.xhtml
| 2
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml
| 2
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoAssociations.xhtml
| 8 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
| 4 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerLocal.java
| 4 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerBean.java
| 10 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerLocal.java
| 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/AdvisorySource.java
| 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentProvider.java
| 13 +--
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManager.java
| 13 +--
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderPackageDetailsKey.java
| 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentServerPluginContainer.java
| 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/DistributionSource.java
| 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/PackageSource.java
| 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/RepoSource.java
| 6 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/sync/RepoSourceSynchronizer.java
| 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/ContentProviderSyncJob.java
| 2
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java
| 2
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncRepoTest.java
| 2
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentProvider.java
| 6 -
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java
| 4 -
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateConfigurationSubsystemTest.java
| 12 +--
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java
| 39 ++++++----
modules/enterprise/server/plugins/disk/src/main/resources/META-INF/rhq-serverplugin.xml
| 10 +-
modules/enterprise/server/plugins/jboss-software/src/main/resources/META-INF/rhq-serverplugin.xml
| 16 ++--
modules/enterprise/server/plugins/perspectives/core/perspective/src/main/resources/META-INF/rhq-serverplugin.xml
| 6 -
modules/enterprise/server/plugins/rhnhosted/src/main/resources/META-INF/rhq-serverplugin.xml
| 4 -
modules/enterprise/server/plugins/url/src/main/resources/META-INF/rhq-serverplugin.xml
| 14 +--
modules/enterprise/server/plugins/yum/src/main/resources/META-INF/rhq-serverplugin.xml
| 6 -
modules/enterprise/server/xml-schemas/src/main/resources/rhq-serverplugin-content.xsd
| 4 -
modules/enterprise/server/xml-schemas/src/main/resources/rhq-serverplugin-perspective.xsd
| 10 +-
53 files changed, 165 insertions(+), 160 deletions(-)
New commits:
commit caa884d9c4587940c41ef0f826aedc3901664f57
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Wed Mar 31 10:40:55 2010 -0400
rename "content provider" -> "content source"
diff --git
a/etc/samples/perspectives/sample-perspective/app/src/main/webapp/createContentProviderJBossASPatch.xhtml
b/etc/samples/perspectives/sample-perspective/app/src/main/webapp/createContentProviderJBossASPatch.xhtml
index dcaa8d0..a96a267 100644
---
a/etc/samples/perspectives/sample-perspective/app/src/main/webapp/createContentProviderJBossASPatch.xhtml
+++
b/etc/samples/perspectives/sample-perspective/app/src/main/webapp/createContentProviderJBossASPatch.xhtml
@@ -17,7 +17,7 @@
<head>
<title>
- Create JBoss AS Patch Content Provider
+ Create JBoss AS Patch Content Source
</title>
</head>
@@ -33,9 +33,9 @@
<p>You should have arrived at this page by choosing to create a
new<br/>
<br/>
- <b>JBoss AS Patch Provider Type</b>.<br/>
+ <b>JBoss AS Patch Content Source Type</b>.<br/>
<br/>
- This page would typically start a workflow to create said
provider...<br/>
+ This page would typically start a workflow to create said source...<br/>
<br/>
It was invoked via a Perspective Page Extension defined in the Sample
Perspective via:
<pre>
diff --git
a/etc/samples/perspectives/sample-perspective/app/src/main/webapp/createContentProviderRHN.xhtml
b/etc/samples/perspectives/sample-perspective/app/src/main/webapp/createContentProviderRHN.xhtml
index c9f66d2..bf79392 100644
---
a/etc/samples/perspectives/sample-perspective/app/src/main/webapp/createContentProviderRHN.xhtml
+++
b/etc/samples/perspectives/sample-perspective/app/src/main/webapp/createContentProviderRHN.xhtml
@@ -17,7 +17,7 @@
<head>
<title>
- Create JBoss AS Patch Content Provider
+ Create JBoss AS Patch Content Source
</title>
</head>
@@ -33,9 +33,9 @@
<p>You should have arrived at this page by choosing to create a
new<br/>
<br/>
- <b>RHN Provider Type</b>.<br/>
+ <b>RHN Content Source Type</b>.<br/>
<br/>
- This page would typically start a workflow to create said
provider...<br/>
+ This page would typically start a workflow to create said content
source...<br/>
<br/>
It was invoked via a Perspective Page Extension defined in the Sample
Perspective via:
<pre>
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/common/Tag.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/common/Tag.java
index 65fc3bb..1cb51e0 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/common/Tag.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/common/Tag.java
@@ -34,10 +34,10 @@ import javax.persistence.Table;
/**
* A generic tag that can be associated with domain objects such as
- * Repository, Content Provider, Resource, Package etc.
+ * Repository, Content Source, Resource, Package etc.
+ *
* @author Sayli Karmarkar
*/
-
@Entity
@SequenceGenerator(name = "SEQ", sequenceName = "RHQ_TAG_ID_SEQ")
@Table(name = "RHQ_TAG")
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/Repo.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/content/Repo.java
index 93aef39..d4a2ea5 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/Repo.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/Repo.java
@@ -256,8 +256,8 @@ public class Repo implements Serializable, Taggable {
}
/**
- * Indicates if the repo is a "real" repo in RHQ or is just a candidate for
import, such as those introduced by
- * a content provider.
+ * Indicates if the repo is an imported (i.e. subscribable) repo in RHQ or is just a
candidate for import, such as
+ * those introduced by a content source.
*/
public boolean isCandidate() {
return candidate;
diff --git
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentProviderDetailsUIBean.java
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentProviderDetailsUIBean.java
index 4b89f50..918c23a 100644
---
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentProviderDetailsUIBean.java
+++
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentProviderDetailsUIBean.java
@@ -50,10 +50,10 @@ public class ContentProviderDetailsUIBean {
try {
manager.updateContentSource(subject, contentSource, true);
- FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "The content
provider ["
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "The content
source ["
+ contentSource.getName() + "] has been updated.");
} catch (Exception e) {
- FacesContextUtility.addMessage(FacesMessage.SEVERITY_WARN, "Failed to
update content provider ["
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_WARN, "Failed to
update content source ["
+ contentSource.getName() + "]", e);
}
@@ -82,7 +82,7 @@ public class ContentProviderDetailsUIBean {
}
public String sync() {
- // Test the content provider connection before proceeding.
+ // Test the content source connection before proceeding.
ContentSourceManagerLocal contentSourceManager =
LookupUtil.getContentSourceManager();
try {
contentSourceManager.testContentSourceConnection(this.contentSource.getId());
@@ -97,7 +97,7 @@ public class ContentProviderDetailsUIBean {
Subject subject = EnterpriseFacesContextUtility.getSubject();
try {
contentSourceManager.synchronizeAndLoadContentSource(subject,
this.contentSource.getId());
- FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO,
"Synchronizing content provider ["
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO,
"Synchronizing content source ["
+ this.contentSource.getName() + "] now.");
} catch (Exception e) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_WARN,
diff --git
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentSourceCandidateReposUIBean.java
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentSourceCandidateReposUIBean.java
index cf94b98..c796600 100644
---
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentSourceCandidateReposUIBean.java
+++
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentSourceCandidateReposUIBean.java
@@ -61,10 +61,10 @@ public class ContentSourceCandidateReposUIBean extends
PagedDataTableUIBean {
repoManager.importCandidateRepo(subject, ids);
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Imported
" + repoIds.length
- + " repositories from content provider.");
+ + " repositories from content source.");
} catch (Exception e) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR,
- "Failed to import one or more repositories from content
provider.", e);
+ "Failed to import one or more repositories from content
source.", e);
}
}
diff --git
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentSourceReposUIBean.java
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentSourceReposUIBean.java
index bfe2483..6e623d3 100644
---
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentSourceReposUIBean.java
+++
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentSourceReposUIBean.java
@@ -55,10 +55,10 @@ public class ContentSourceReposUIBean extends PagedDataTableUIBean {
}
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO,
"Disassociated [" + repoIds.length
- + "] repositories from content provider");
+ + "] repositories from content source");
} catch (Exception e) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR,
- "Failed to disassociate one or more repositories from content
provider", e);
+ "Failed to disassociate one or more repositories from content
source", e);
}
}
diff --git
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentSourceSyncResultsUIBean.java
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentSourceSyncResultsUIBean.java
index eddd8cc..92a6ff3 100644
---
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentSourceSyncResultsUIBean.java
+++
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentSourceSyncResultsUIBean.java
@@ -50,10 +50,10 @@ public class ContentSourceSyncResultsUIBean extends
PagedDataTableUIBean {
contentSourceManager.deleteContentSourceSyncResults(subject, ids);
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Deleted
[" + ids.length
- + "] content provider sync results.");
+ + "] content source sync results.");
} catch (Exception e) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR,
- "Failed to delete content provider sync results.", e);
+ "Failed to delete content source sync results.", e);
}
}
diff --git
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateContentSourceUIBean.java
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateContentSourceUIBean.java
index 67a61c0..4180b13 100644
---
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateContentSourceUIBean.java
+++
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateContentSourceUIBean.java
@@ -98,11 +98,11 @@ public class CreateContentSourceUIBean extends PagedDataTableUIBean {
}
public String getNullConfigurationDefinitionMessage() {
- return "The selected content provider type does not require a
configuration.";
+ return "The selected content source type does not require a
configuration.";
}
public String getNullConfigurationMessage() {
- return "Content provider has an empty configuration."; // is this ever
really used?
+ return "Content source has an empty configuration."; // is this ever
really used?
}
public String save() {
@@ -152,7 +152,7 @@ public class CreateContentSourceUIBean extends PagedDataTableUIBean {
}
}
- // reset the content provider's sync schedule and other settings to the
new type's defaults
+ // reset the content source's sync schedule and other settings to the
new type's defaults
newContentSource.setSyncSchedule(cst.getDefaultSyncSchedule());
newContentSource.setLazyLoad(cst.isDefaultLazyLoad());
newContentSource.setDownloadMode(cst.getDefaultDownloadMode());
diff --git
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ListContentSourcesUIBean.java
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ListContentSourcesUIBean.java
index bd9f392..cc6c6b7 100644
---
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ListContentSourcesUIBean.java
+++
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ListContentSourcesUIBean.java
@@ -57,9 +57,9 @@ public class ListContentSourcesUIBean extends PagedDataTableUIBean {
}
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Deleted
[" + ids.length
- + "] content providers.");
+ + "] content sources.");
} catch (Exception e) {
- FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed
to delete content providers.", e);
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed
to delete content sources.", e);
}
}
@@ -78,10 +78,10 @@ public class ListContentSourcesUIBean extends PagedDataTableUIBean {
}
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO,
"Synchronizing [" + ids.length
- + "] content providers.");
+ + "] content sources.");
} catch (Exception e) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR,
- "Failed to synchronized content providers.", e);
+ "Failed to synchronized content sources.", e);
}
}
diff --git
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ListReposUIBean.java
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ListReposUIBean.java
index 4c923ec..fc0988e 100644
---
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ListReposUIBean.java
+++
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ListReposUIBean.java
@@ -72,7 +72,7 @@ public class ListReposUIBean extends PagedDataTableUIBean {
}
if (syncCount > 0) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO,
"Synchronizing [" + syncCount
- + "] content providers.");
+ + "] content sources.");
} else {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO,
"Selected Repositories have no content to sync.");
diff --git
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoAssociationsUIBean.java
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoAssociationsUIBean.java
index b562471..d659c56 100644
---
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoAssociationsUIBean.java
+++
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoAssociationsUIBean.java
@@ -37,7 +37,7 @@ import org.rhq.enterprise.server.content.RepoManagerLocal;
import org.rhq.enterprise.server.util.LookupUtil;
/**
- * This is the list of content providers that are currently associated with a repo.
+ * This is the list of content sources that are currently associated with a repo.
*/
public class RepoAssociationsUIBean extends PagedDataTableUIBean {
public static final String MANAGED_BEAN_NAME = "RepoAssociationsUIBean";
@@ -77,10 +77,10 @@ public class RepoAssociationsUIBean extends PagedDataTableUIBean {
manager.removeContentSourcesFromRepo(subject, repoId, contentSourceIds);
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO,
"Disassociated [" + contentSourceIds.length
- + "] content providers from repo");
+ + "] content sources from repo");
} catch (Exception e) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR,
- "Failed to disassociate one or more content providers from
repo", e);
+ "Failed to disassociate one or more content sources from
repo", e);
}
}
diff --git
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoContentSourcesUIBean.java
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoContentSourcesUIBean.java
index b2821b2..2f3b989 100644
---
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoContentSourcesUIBean.java
+++
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoContentSourcesUIBean.java
@@ -55,10 +55,10 @@ public class RepoContentSourcesUIBean extends PagedDataTableUIBean {
manager.removeContentSourcesFromRepo(subject, repoId, contentSourceIds);
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO,
"Disassociated [" + contentSourceIds.length
- + "] content providers from repo");
+ + "] content sources from repo");
} catch (Exception e) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR,
- "Failed to disassociate one or more content providers from
repo", e);
+ "Failed to disassociate one or more content sources from
repo", e);
}
}
diff --git
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoDisassociationsUIBean.java
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoDisassociationsUIBean.java
index 4461ace..517da56 100644
---
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoDisassociationsUIBean.java
+++
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoDisassociationsUIBean.java
@@ -35,7 +35,7 @@ import org.rhq.enterprise.server.content.RepoManagerLocal;
import org.rhq.enterprise.server.util.LookupUtil;
/**
- * This is the list of content providers that are currently disassociated from a repo.
+ * This is the list of content sources that are currently disassociated from a repo.
*/
public class RepoDisassociationsUIBean extends PagedDataTableUIBean {
public static final String MANAGED_BEAN_NAME =
"RepoDisassociationsUIBean";
@@ -55,10 +55,10 @@ public class RepoDisassociationsUIBean extends PagedDataTableUIBean {
manager.addContentSourcesToRepo(subject, repoId, contentSourceIds);
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO,
"Associated [" + contentSourceIds.length
- + "] content providers with repo");
+ + "] content sources with repo");
} catch (Exception e) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR,
- "Failed to associate one or more content providers with
repo", e);
+ "Failed to associate one or more content sources with
repo", e);
}
}
diff --git
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoImportUIBean.java
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoImportUIBean.java
index 99661b1..cb0a1ad 100644
---
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoImportUIBean.java
+++
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoImportUIBean.java
@@ -93,7 +93,7 @@ public class RepoImportUIBean extends PagedDataTableUIBean {
}
/**
- * Creates the list of content providers to be displayed in
+ * Creates the list of content sources to be displayed in
* the radio buttons.
* @return An array of options.
*/
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties
b/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties
index b9c5b7b..911bb06 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties
+++
b/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties
@@ -524,8 +524,8 @@ admin.resource.templates.PageTitle=${product.shortName} Monitoring
Defaults Conf
# ADMIN.HOME
admin.home.AuthAuthZTab=Authentication/Authorization
admin.home.CompanyWideSettingsTab=${product.shortName} Server Settings
-admin.home.Content=Content Providers and Repositories
-admin.home.Content.ListContentSources=Manage Content Providers
+admin.home.Content=Content Sources and Repositories
+admin.home.Content.ListContentSources=Manage Content Sources
admin.home.Content.ListRepos=Manage Repositories
admin.home.Ha=High Availability
admin.home.Ha.ListServers=Manage ${product.shortName} Servers
@@ -2961,11 +2961,11 @@ largeenv.breadcrumb=Large Environment Preparation
# RESOURCE INVENTORY TAB
resource.inventory.view.deleteResourceConfirm = Deleting this resource will delete the
actual resource being managed on the agent machine. Are you sure you want to proceed?
-# Content Provider
-contentprovider.list.breadcrumb=Content Providers
+# Content Sources
+contentprovider.list.breadcrumb=Content Sources
contentprovider.new.breadcrumb=New
-# Repo
+# Content Repos
repo.list.breadcrumb=Repositories
repo.new.breadcrumb=New
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/content-navigation.xml
b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/content-navigation.xml
index 2c0f473..587af44 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/content-navigation.xml
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/content-navigation.xml
@@ -295,7 +295,7 @@
</navigation-rule>
- <!-- Content Provider List -->
+ <!-- Content Source List -->
<navigation-rule>
<from-view-id>/rhq/content/listContentProviders.xhtml</from-view-id>
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-view-map.xhtml
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-view-map.xhtml
index 42b8a63..9052ebd 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-view-map.xhtml
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-view-map.xhtml
@@ -17,7 +17,7 @@ THIS TEXT WILL BE REMOVED.
THIS TEXT WILL BE REMOVED AS WELL.
- <ui:param name="pageTitle" value="Create Content Provider - Add Map
To List '#{param.listName}'"/>
+ <ui:param name="pageTitle" value="Create Content Source - Add Map To
List '#{param.listName}'"/>
<ui:define name="breadcrumbs">
<h:outputLink value="listContentProviders.xhtml">
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider.xhtml
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider.xhtml
index ea760cd..3220bc6 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider.xhtml
@@ -18,7 +18,7 @@
<ui:param name="id" value="#{param.id}" />
<ui:param name="mode" value="#{param.mode}" />
- <ui:param name="pageTitle" value="Content Provider
'#{ContentProviderDetailsUIBean.contentSource.name}'"/>
+ <ui:param name="pageTitle" value="Content Source
'#{ContentProviderDetailsUIBean.contentSource.name}'"/>
<ui:param name="item"
value="#{ContentProviderDetailsUIBean.contentSource}" />
<ui:define name="breadcrumbs">
@@ -41,7 +41,7 @@
<input type="hidden" name="mode"
value="#{param.mode}"/>
<!-- TODO: Only update if a sync is in progress. -->
- <a4j:poll id="poller" interval="7000"
enabled="true" reRender="poller,bodyPanel"/>
+ <a4j:poll id="poller" interval="7000"
enabled="true"
reRender="poller,contentSourceSyncResultsListForm"/>
</h:form>
</a4j:region>
@@ -55,8 +55,6 @@
layout="table"
style="width: 100%"/>
- <h:panelGroup id="bodyPanel" layout="block">
-
<h:form id="contentProviderDetailsForm">
<input type="hidden" name="id"
value="${param.id}"/>
<input type="hidden" name="mode"
value="${param.mode}"/>
@@ -159,7 +157,7 @@
<onc:config
configurationDefinition="#{ContentProviderDetailsUIBean.contentSourceTypeConfigurationDefinition}"
configuration="#{ContentProviderDetailsUIBean.contentSource.configuration}"
readOnly="#{mode ne 'edit'}"
- nullConfigurationDefinitionMessage="This content provider
type does not require a configuration."
+ nullConfigurationDefinitionMessage="This content source
type does not require a configuration."
nullConfigurationMessage="Configuration is empty."
nullConfigurationStyle="InfoBlock"/>
</rich:panel>
@@ -311,7 +309,7 @@
</h:form>
- <!-- REPO IMPORT RESULTS LIST -->
+ <!-- SYNCHRONIZATION RESULTS HISTORY -->
<h:form id="contentSourceSyncResultsListForm">
<input type="hidden" name="id"
value="${param.id}"/>
@@ -319,7 +317,7 @@
<rich:panel>
<f:facet name="header">
- <h:outputText value="Repository Import Results"/>
+ <h:outputText value="Synchronization Results History"/>
</f:facet>
<h:panelGrid columns="1" width="100%">
@@ -515,8 +513,6 @@
</rich:panel>
</h:form>
- </h:panelGroup>
-
</ui:define>
</ui:composition>
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider-edit-map.xhtml
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider-edit-map.xhtml
index cfc62ef..456ac5f 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider-edit-map.xhtml
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider-edit-map.xhtml
@@ -17,7 +17,7 @@ THIS TEXT WILL BE REMOVED.
THIS TEXT WILL BE REMOVED AS WELL.
- <ui:param name="pageTitle" value="Create Content Provider - Edit Map
Entry '#{param.listName}'"/>
+ <ui:param name="pageTitle" value="Create Content Source - Edit Map
Entry '#{param.listName}'"/>
<ui:define name="breadcrumbs">
<h:outputLink value="listProviders.xhtml">
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/importRepos.xhtml
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/importRepos.xhtml
index a4e0e66..ad31783 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/importRepos.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/importRepos.xhtml
@@ -35,10 +35,10 @@
width="100%"/>
<h:form id="importRepoForm">
<input type="hidden" name="id"
value="${param.id}"/>
- <!-- CONTENT PROVIDERS -->
+ <!-- CONTENT SOURCES -->
<rich:panel>
<f:facet name="header">
- <h:outputText value="Content Providers"/>
+ <h:outputText value="Content Sources"/>
</f:facet>
<h:panelGrid columns="1" width="100%">
<h:selectOneRadio
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listContentProviders.xhtml
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listContentProviders.xhtml
index 6d608c6..1b329bd 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listContentProviders.xhtml
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listContentProviders.xhtml
@@ -14,7 +14,7 @@
<ui:composition template="/rhq/layout/main.xhtml">
- <ui:param name="pageTitle" value="Content Providers"/>
+ <ui:param name="pageTitle" value="Content Sources"/>
<ui:define name="breadcrumbs">
<h:outputLink value="listContentProviders.xhtml">
@@ -39,7 +39,7 @@
<rich:panel>
<f:facet name="header">
- <h:outputText value="Content Providers"/>
+ <h:outputText value="Content Sources"/>
</f:facet>
<h:panelGrid columns="1" width="100%">
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listRepos.xhtml
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listRepos.xhtml
index 3561655..5748ae5 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listRepos.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listRepos.xhtml
@@ -165,7 +165,7 @@
</h:form>
<p align="center">
<h:outputLink value="listContentProviders.xhtml">
- <h:outputText value="Go To All Content Providers View" />
+ <h:outputText value="Go to All Content Sources View" />
</h:outputLink>
</p>
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml
index a58e826..24dcc63 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml
@@ -218,7 +218,7 @@
<rich:panel>
<f:facet name="header">
<h:outputText
- value="Content Providers Associated With This Repository" />
+ value="Content Sources Associated with This Repository" />
</f:facet>
<h:panelGrid columns="1" width="100%">
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoAssociations.xhtml
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoAssociations.xhtml
index 39d1cce..0e01ff1 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoAssociations.xhtml
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoAssociations.xhtml
@@ -16,7 +16,7 @@
<ui:composition template="/rhq/layout/main.xhtml">
<ui:param name="id" value="${param.id}" />
- <ui:param name="pageTitle" value="Associate Content Providers to
Repository '#{RepoDetailsUIBean.repo.name}'"/>
+ <ui:param name="pageTitle" value="Associate Content Sources to
Repository '#{RepoDetailsUIBean.repo.name}'"/>
<ui:param name="item" value="#{RepoDetailsUIBean.repo}" />
<ui:define name="breadcrumbs">
@@ -31,7 +31,7 @@
</h:outputLink>
>
<h:outputLink value="repoAssociations.xhtml">
- Associate With Content Providers
+ Associate With Content Sources
<f:param name="id" value="#{item.id}" />
</h:outputLink>
</ui:define>
@@ -55,7 +55,7 @@
<rich:panel>
<f:facet name="header">
- <h:outputText value="Content Providers Associated With This
Repository"/>
+ <h:outputText value="Content Sources Associated With This
Repository"/>
</f:facet>
<h:panelGrid columns="1" width="100%">
@@ -177,7 +177,7 @@
<rich:panel>
<f:facet name="header">
- <h:outputText value="Available Content Providers"/>
+ <h:outputText value="Available Content Sources"/>
</f:facet>
<h:panelGrid columns="1" width="100%">
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 37c72a0..3caab5b 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
@@ -1255,7 +1255,7 @@ public class ContentSourceManagerBean implements
ContentSourceManagerLocal {
for (ContentProviderPackageDetails doomedDetails : report.getDeletedPackages())
{
- // Delete the mapping between package version and content provider
+ // Delete the mapping between package version and content source
ContentProviderPackageDetailsKey doomedDetailsKey =
doomedDetails.getContentProviderPackageDetailsKey();
PackageVersionContentSource doomedPvcs = previous.get(doomedDetailsKey);
doomedPvcs = entityManager.find(PackageVersionContentSource.class,
doomedPvcs
@@ -1272,7 +1272,7 @@ public class ContentSourceManagerBean implements
ContentSourceManagerLocal {
// Delete the package version if it is sufficiently orphaned:
// - No repos
- // - No content providers
+ // - No content sources
// - No installed packages
PackageVersion doomedPv =
doomedPvcs.getPackageVersionContentSourcePK().getPackageVersion();
q =
entityManager.createNamedQuery(PackageVersion.DELETE_SINGLE_IF_NO_CONTENT_SOURCES_OR_REPOS);
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerLocal.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerLocal.java
index a934f95..14d1bf6 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerLocal.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerLocal.java
@@ -384,9 +384,9 @@ public interface ContentSourceManagerLocal {
ContentSourceSyncResults getContentSourceSyncResults(int resultsId);
/**
- * Updates the server with the results of a repo import from a content provider.
+ * Updates the server with the results of a repo import from a content source.
*
- * @param repos list of repo data received from the content provider; should not be
<code>null</code>
+ * @param repos list of repo data received from the content source; should not be
<code>null</code>
*/
void mergeRepoImportResults(List<RepoDetails> repos);
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 0a37901..34b3768 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
@@ -425,8 +425,8 @@ public class RepoManagerBean implements RepoManagerLocal,
RepoManagerRemote {
append(importedRepoGroups).append('\n');
}
- // Hold on to all current candidate repos for the content provider. If any were
not present in this
- // report, remove them from the system (the rationale being, the content provider
no longer knows
+ // Hold on to all current candidate repos for the content source. If any were not
present in this
+ // report, remove them from the system (the rationale being, the content source
no longer knows
// about them and thus they cannot be imported).
RepoCriteria candidateReposCriteria = new RepoCriteria();
candidateReposCriteria.addFilterContentSourceIds(contentSourceId);
@@ -867,7 +867,7 @@ public class RepoManagerBean implements RepoManagerLocal,
RepoManagerRemote {
* Calling this method with a repo that has a parent assumes the parent has already
been created. This call
* assumes the repo group has been created as well.
*
- * @param contentSourceId identifies the content provider that introduced the
candidate into the system
+ * @param contentSourceId identifies the content source that introduced the candidate
into the system
* @param createMe describes the candidate to be created
*
* @param autoImport whether or not to import the repo
@@ -883,7 +883,7 @@ public class RepoManagerBean implements RepoManagerLocal,
RepoManagerRemote {
List<Repo> existingRepos = getRepoByName(name);
if (!existingRepos.isEmpty()) {
- // The repo already exists - make sure it is associated with the specified
content provider.
+ // The repo already exists - make sure it is associated with the specified
content source.
for (Repo existingRepo : existingRepos) {
addContentSourcesToRepo(overlord, existingRepo.getId(), new int[] {
contentSourceId });
}
@@ -904,7 +904,7 @@ public class RepoManagerBean implements RepoManagerLocal,
RepoManagerRemote {
// Add the new candidate to the database
addMe = createRepo(overlord, addMe);
- // Associate the content provider that introduced the candidate with the repo
+ // Associate the content source that introduced the candidate with the repo
addContentSourcesToRepo(overlord, addMe.getId(), new int[] { contentSourceId });
// If the repo indicates it has a parent, create that relationship
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerLocal.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerLocal.java
index 503e514..8635d3a 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerLocal.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerLocal.java
@@ -170,7 +170,7 @@ public interface RepoManagerLocal {
void deleteCandidatesWithOnlyContentSource(Subject subject, int contentSourceId);
/**
- * Handles a repo report from a content provider, adding and removing candidate repos
as necessary into the
+ * Handles a repo report from a content source, adding and removing candidate repos
as necessary into the
* database.
*
* @param subject user triggering the report processing
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/AdvisorySource.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/AdvisorySource.java
index d3b05e3..38124fb 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/AdvisorySource.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/AdvisorySource.java
@@ -26,7 +26,7 @@ package org.rhq.enterprise.server.plugin.pc.content;
import java.util.Collection;
/**
- * Indicates a content provider has the capability to fetch advisory information per repo
into the server.
+ * Indicates a content source has the capability to fetch advisory information per repo
into the server.
* Advisory synchronization will be done through the calls defined in this interface.
*
* @author Pradeep Kilambi
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentProvider.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentProvider.java
index 175d92b..bfd97d0 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentProvider.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentProvider.java
@@ -25,8 +25,8 @@ package org.rhq.enterprise.server.plugin.pc.content;
import org.rhq.core.domain.configuration.Configuration;
/**
- * Interface used by the server to communicate with a content provider. Content providers
implement this interface as
- * well as any other source interfaces to further describe what functionality is provided
by the provider.
+ * Interface used by the server to communicate with a content source. Content sources
implement this interface as
+ * well as any other source interfaces to further describe what functionality is provided
by the content source.
* <p/>
* The class name of this interface's implementation is the class name specified in
the server plugin descriptor.
*
@@ -41,9 +41,9 @@ public interface ContentProvider {
/**
* Initializes the adapter with the configuration values indicating how to connect to
the external source system.
*
- * @param configuration user entered values describing how the content provider
should function.
+ * @param configuration user entered values describing how the content source should
function.
*
- * @throws Exception if the content provider has an issue being configured.
+ * @throws Exception if the content source has an issue being configured.
*/
void initialize(Configuration configuration) throws Exception;
@@ -53,7 +53,7 @@ public interface ContentProvider {
void shutdown();
/**
- * Tests if the content provider can communicate with the external package source.
This will be called after
+ * Tests if the content source can communicate with the external package source. This
will be called after
* {@link #initialize(Configuration)} to ensure the adapter is in a configured state
to run the test.
*
* @throws Exception if the connection cannot be made to the external system.
@@ -68,10 +68,9 @@ public interface ContentProvider {
* Package Metadata
* Package Bits
* Distribution Metadata
- * Distrubtion Bits
+ * Distribution Bits
* Advisory (Errata) Metadata
* Advisory Bits ?
*/
-
SyncProgressWeight getSyncProgressWeight();
}
\ No newline at end of file
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManager.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManager.java
index bba2be0..16e96e3 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManager.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManager.java
@@ -178,7 +178,7 @@ public class ContentProviderManager {
// locking.
synchronized (synchronizeContentSourceLock) {
progress.append(new Date()).append(": ");
- progress.append("Start synchronization of content provider
[").append(contentSource.getName()).append(
+ progress.append("Start synchronization of content source
[").append(contentSource.getName()).append(
"]\n");
progress.append(new Date()).append(": ");
progress.append("Getting currently known list of
packages...\n");
@@ -199,7 +199,7 @@ public class ContentProviderManager {
// Even if it does happen, it may still work, or
// one sync will get an error and rollback its tx and no harm
// will be done.
- log.info("Content provider [" + contentSource.getName()
+ log.info("Content source [" + contentSource.getName()
+ "] is already being synchronized - this sync request will be
ignored.");
return false;
}
@@ -245,7 +245,7 @@ public class ContentProviderManager {
}
/**
- * Asks each content provider associated with the given repo to synchronize
+ * Asks each content source associated with the given repo to synchronize
* the following information for the given repo:
* <ul>
* <li>Package Metadata</li>
@@ -330,8 +330,7 @@ public class ContentProviderManager {
}
tracker = updatePercentComplete(tracker, repoManager);
- // PACKAGEBITS Loop
- // Synchronize every content provider associated with the repo
+ // Sync package bits.
for (ContentSource source : repo.getContentSources()) {
// Don't let the entire sync fail if a single content source
// fails
@@ -469,8 +468,8 @@ public class ContentProviderManager {
throw ie;
}
StringBuilder progress = new StringBuilder();
- log.error("Error while synchronizing repo [" + repo + "] with
content provider [" + source
- + "]. Synchronization for the repo will continue for other
providers.", e);
+ log.error("Error while synchronizing repo [" + repo + "] with
content source [" + source
+ + "]. Synchronization of the repo will continue for any other associated
content sources.", e);
// Try to reload the results in case it was updated by the SLSB before the
exception happened.
RepoSyncResults reloadedResults =
repoManager.getRepoSyncResults(tracker.getRepoSyncResults().getId());
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderPackageDetailsKey.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderPackageDetailsKey.java
index e0802d0..b6b2dac 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderPackageDetailsKey.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderPackageDetailsKey.java
@@ -26,7 +26,7 @@ import org.rhq.core.domain.content.PackageDetailsKey;
import org.rhq.core.domain.resource.ResourceType;
/**
- * The key to a content provider package details that a {@link ContentProvider} will use
when referring to package
+ * The key to a content source package details that a {@link ContentProvider} will use
when referring to package
* versions it finds in the remote repository. It is the same as {@link
PackageDetailsKey} with the addition of a
* resource type natural key (which is name and agent plugin name), since that is needed
to make package types unique
* (along with the package type name itself, which is specified in the {@link
PackageDetailsKey} superclass).
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 f04aa9e..2909025 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
@@ -132,7 +132,7 @@ public class ContentServerPluginContainer extends
AbstractTypeServerPluginContai
Date next = scheduler.scheduleJob(job, trigger);
getLog().info(
- "Scheduled content provider sync job [" + job.getName() +
':' + job.getGroup() + "] to fire now at ["
+ "Scheduled content source sync job [" + job.getName() + ':'
+ job.getGroup() + "] to fire now at ["
+ next + "] for [" + contentSource + "]");
}
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/DistributionSource.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/DistributionSource.java
index e2cbc7c..19f1109 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/DistributionSource.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/DistributionSource.java
@@ -26,7 +26,7 @@ import java.io.InputStream;
import java.util.Collection;
/**
- * Indicates a content provider has the capability to provide distributions into the
server.
+ * Indicates a content source has the capability to provide distributions into the
server.
* Distribution synchronization will be done through the calls defined in this
interface.
*
* @author Pradeep Kilambi
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/PackageSource.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/PackageSource.java
index 33c66aa..a31885e 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/PackageSource.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/PackageSource.java
@@ -26,7 +26,7 @@ import java.io.InputStream;
import java.util.Collection;
/**
- * Indicates a content provider has the capability to provide packages into the server.
Package synchronization will
+ * Indicates a content source has the capability to provide packages into the server.
Package synchronization will
* be done through the calls defined in this interface. This interface should use the
configuration settings
* passed into the plugin through {@link
ContentProvider#initialize(org.rhq.core.domain.configuration.Configuration)}
*
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/RepoSource.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/RepoSource.java
index 281d59f..ce4b26b 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/RepoSource.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/RepoSource.java
@@ -23,7 +23,7 @@
package org.rhq.enterprise.server.plugin.pc.content;
/**
- * Indicates a content provider has the capability to provide repos into the server. Repo
synchronization will be
+ * Indicates a content source has the capability to provide repos into the server. Repo
synchronization will be
* done through calls defined in this interface. This interface should use the
configuration settings
* passed into the plugin through {@link
ContentProvider#initialize(org.rhq.core.domain.configuration.Configuration)}
*
@@ -32,8 +32,8 @@ package org.rhq.enterprise.server.plugin.pc.content;
public interface RepoSource {
/**
- * Requests the content provider return a list of all repos it wants to ensure exist
in the server. This call
- * should return the current state of the repos as known to the content provider, not
a diff of what has
+ * Requests the content source return a list of all repos it wants to ensure exist in
the server. This call
+ * should return the current state of the repos as known to the content source, not a
diff of what has
* changed from the previous call to it. The server will resolve the differences.
*
* @return contains a list of all groups and repos to be imported into the system
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/sync/RepoSourceSynchronizer.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/sync/RepoSourceSynchronizer.java
index f0adc8f..bb365b2 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/sync/RepoSourceSynchronizer.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/sync/RepoSourceSynchronizer.java
@@ -68,7 +68,7 @@ public class RepoSourceSynchronizer {
}
progress.append(new Date()).append(": ");
- progress.append("Asking content provider for new repositories to
import...\n");
+ progress.append("Asking content source for new repositories to
import...\n");
RepoSource repoSource = (RepoSource) provider;
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/ContentProviderSyncJob.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/ContentProviderSyncJob.java
index 4d948dd..574dea2 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/ContentProviderSyncJob.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/ContentProviderSyncJob.java
@@ -88,7 +88,7 @@ public class ContentProviderSyncJob implements StatefulJob {
ContentSource contentSource = synchronizeAndLoad(name, typeName);
if (syncImportedRepos) {
- // Synchronize all repos associated with the content provider - these may
be repos we just
+ // Synchronize all repos associated with the content source - these may
be repos we just
// discovered during this sync or ones that were already associated.
syncImportedRepos(contentSource);
}
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java
index ba117a8..d0beddc 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java
@@ -293,7 +293,7 @@ public class ContentProviderManagerSyncContentProviderTest extends
AbstractEJB3T
assert retrievedRepos.size() == 1;
reposToDelete.add(retrievedRepos.get(0).getId());
- // -> Make sure a repo that was previously a candidate of this content
provider but did not
+ // -> Make sure a repo that was previously a candidate of this content
source but did not
// come back in the latest sync is removed
retrievedRepos = repoManager.getRepoByName(PREVIOUS_CANDIDATE_REPO_NAME);
assert retrievedRepos.size() == 0;
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncRepoTest.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncRepoTest.java
index 6afe318..bae2d01 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncRepoTest.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncRepoTest.java
@@ -123,7 +123,7 @@ public class ContentProviderManagerSyncRepoTest extends
AbstractEJB3Test {
// Create the repo to be syncced
Repo repo = new Repo(TestContentProvider.REPO_WITH_PACKAGES);
repo.addContentSource(cs1);
-// repo.addContentSource(cs2); Disabled until we implement a second test content
provider to return new stuff
+// repo.addContentSource(cs2); Disabled until we implement a second test content
source to return new stuff
repoToSync = repoManager.createRepo(overlord, repo);
tx.commit();
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentProvider.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentProvider.java
index fc9fb63..20805e4 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentProvider.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentProvider.java
@@ -40,13 +40,13 @@ public class TestContentProvider implements ContentProvider,
PackageSource, Repo
public static final String EXISTING_CANDIDATE_REPO_NAME =
"testRepoCandidateExisting";
/**
- * This content provider will return packages when asked to synchronize a
+ * This content source will return packages when asked to synchronize a
* repo with this name.
*/
public static final String REPO_WITH_PACKAGES = EXISTING_IMPORTED_REPO_NAME;
/**
- * This content provider will return distributions when asked to synchronize
+ * This content source will return distributions when asked to synchronize
* a repo with this name.
*/
public static final String REPO_WITH_DISTRIBUTIONS = EXISTING_IMPORTED_REPO_NAME;
@@ -164,7 +164,7 @@ public class TestContentProvider implements ContentProvider,
PackageSource, Repo
public void testConnection() throws Exception {
if (failTest) {
- throw new Exception("Mock content provider configured to fail the
connection test");
+ throw new Exception("Mock content source configured to fail the
connection test");
}
System.out.println("Connection tested.");
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java
index 631ca6c..da94c58 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java
@@ -73,11 +73,11 @@ public class TestContentServerPluginService extends
ServerPluginService implemen
* the proper source -> provider mapping.
* <p/>
* If this method is never called, in other words no specific associations are made,
an instance of the default
- * content provider ({@link TestContentProvider}) will be used by the
<code>ContentProviderManager</code>
+ * content source ({@link TestContentProvider}) will be used by the
<code>ContentProviderManager</code>
* regardless of content source requested.
*
* @param source source that will be handed to the ContentProviderManager and used
to retrieve a specific
- * content provider
+ * content source
* @param provider provider to use when the given source is requested for operations
*/
public void associateContentProvider(ContentSource source, ContentProvider provider)
{
diff --git
a/modules/enterprise/server/plugins/disk/src/main/resources/META-INF/rhq-serverplugin.xml
b/modules/enterprise/server/plugins/disk/src/main/resources/META-INF/rhq-serverplugin.xml
index 4ec6f82..13968f8 100644
---
a/modules/enterprise/server/plugins/disk/src/main/resources/META-INF/rhq-serverplugin.xml
+++
b/modules/enterprise/server/plugins/disk/src/main/resources/META-INF/rhq-serverplugin.xml
@@ -8,14 +8,14 @@
xmlns:c="urn:xmlns:rhq-configuration">
<serverplugin:help><![CDATA[
- Provides a content provider that retrieves content from a local file system.
+ Provides a content source that retrieves content from a local file system.
If deployed in an HA environment, this must be on a distributed file system that
all servers can access.
- The content must be of the package type as defined in the content provider
configuration.
+ The content must be of the package type as defined in the content source
configuration.
]]></serverplugin:help>
<contentSourceType name="DiskSource"
- displayName="Local Disk Storage Content Provider"
- description="This content provider retrieves packages from a
local file system. If deployed in an HA environment, this must be on a distributed file
system that all servers can access."
+ displayName="Local Disk Storage Content Source"
+ description="This content source retrieves packages from a
local file system. If deployed in an HA environment, this must be on a distributed file
system that all servers can access."
lazyLoad="true"
downloadMode="never"
apiClass="org.rhq.enterprise.server.plugins.disk.DiskSource">
@@ -24,7 +24,7 @@
<c:group name="General">
<c:simple-property name="rootDirectory"
type="directory" required="true"
- description="The root directory that contains all
content that is to be served by this content provider. In an HA environment, this must be
on a distributed file system that all servers can access."/>
+ description="The root directory that contains all
content that is to be served by this content source. In an HA environment, this must be on
a distributed file system that all servers can access."/>
</c:group>
<c:group name="Package Source">
diff --git
a/modules/enterprise/server/plugins/jboss-software/src/main/resources/META-INF/rhq-serverplugin.xml
b/modules/enterprise/server/plugins/jboss-software/src/main/resources/META-INF/rhq-serverplugin.xml
index 1683c8a..55e2a64 100644
---
a/modules/enterprise/server/plugins/jboss-software/src/main/resources/META-INF/rhq-serverplugin.xml
+++
b/modules/enterprise/server/plugins/jboss-software/src/main/resources/META-INF/rhq-serverplugin.xml
@@ -2,29 +2,29 @@
<content-plugin name="JBossASPatchContentSourcePlugin"
displayName="JBoss CSP Content"
- description="Provides the ability to obtain content from the JBoss
CSP RSS feed"
+ description="Provides the ability to obtain patches from the JBoss
CSP RSS feed"
xmlns="urn:xmlns:rhq-serverplugin.content"
xmlns:serverplugin="urn:xmlns:rhq-serverplugin"
xmlns:c="urn:xmlns:rhq-configuration">
<serverplugin:help><![CDATA[
- Provides a content provider that retrieves content from the JBoss CSP RSS feed.
+ Provides a content source that retrieves content from the JBoss CSP RSS feed.
]]></serverplugin:help>
<contentSourceType name="JBossASPatchSource"
- displayName="JBoss AS Patch Content Provider"
- description="This content provider retrieves packages from the
JBoss CSP RSS feed."
+ displayName="JBoss Patch Content Source"
+ description="This content source retrieves patches from the
JBoss CSP RSS feed."
lazyLoad="true"
apiClass="org.rhq.enterprise.server.plugins.jboss.software.JBossSoftwareContentSourceAdapter">
<configuration>
<c:group name="csp" displayName="CSP Feed Settings">
<c:simple-property name="url" displayName="Feed URL"
type="string" required="true"
- description="Destination URL of the feed."/>
+ description="URL of the RSS feed."/>
<c:simple-property name="username"
displayName="Username" type="string" required="false"
- description="Username used to log into the
feed."/>
+ description="Username used to log into the
CSP."/>
<c:simple-property name="password"
displayName="Password" type="password" required="false"
- description="Password used to log into the
feed."/>
+ description="Password used to log into the
CSP."/>
<c:simple-property name="active" displayName="Active"
type="boolean" required="true" default="true"
description="Indicates if this instance should go out
and check the feed for packages."/>
</c:group>
@@ -36,7 +36,7 @@
<c:simple-property name="proxyUsername" displayName="Proxy
Username" type="string" required="false"
description="Optional. If the proxy requires
authentication, this is the user to log in as."/>
<c:simple-property name="proxyPassword" displayName="Proxy
Password" type="password" required="false"
- description="Optional. If the proxy requires
authentitcation, this is the password for the user."/>
+ description="Optional. If the proxy requires
authentication, this is the password for the user."/>
</c:group>
</configuration>
diff --git
a/modules/enterprise/server/plugins/perspectives/core/perspective/src/main/resources/META-INF/rhq-serverplugin.xml
b/modules/enterprise/server/plugins/perspectives/core/perspective/src/main/resources/META-INF/rhq-serverplugin.xml
index b04c465..93a0665 100644
---
a/modules/enterprise/server/plugins/perspectives/core/perspective/src/main/resources/META-INF/rhq-serverplugin.xml
+++
b/modules/enterprise/server/plugins/perspectives/core/perspective/src/main/resources/META-INF/rhq-serverplugin.xml
@@ -511,8 +511,8 @@
<!-- Core Menu: administration.content -->
<menu-item
- name="administration.content.contentProviders"
- displayName="Content Providers"
+ name="administration.content.contentSources"
+ displayName="Content Sources"
url="/rhq/content/listContentProviders.xhtml">
<position
name="administration.content"
@@ -523,7 +523,7 @@
displayName="Repositories"
url="/rhq/content/listRepos.xhtml">
<position
- name="administration.content.contentProviders"
+ name="administration.content.contentSources"
placement="after" />
</menu-item>
diff --git
a/modules/enterprise/server/plugins/rhnhosted/src/main/resources/META-INF/rhq-serverplugin.xml
b/modules/enterprise/server/plugins/rhnhosted/src/main/resources/META-INF/rhq-serverplugin.xml
index 50c408d..bf87c37 100644
---
a/modules/enterprise/server/plugins/rhnhosted/src/main/resources/META-INF/rhq-serverplugin.xml
+++
b/modules/enterprise/server/plugins/rhnhosted/src/main/resources/META-INF/rhq-serverplugin.xml
@@ -8,11 +8,11 @@
xmlns:c="urn:xmlns:rhq-configuration">
<serverplugin:help><![CDATA[
- Provides a content provider that retrieves content from the Red Hat Network.
+ Provides a content source that retrieves content from the Red Hat Network (RHN).
]]></serverplugin:help>
<contentSourceType name="RHNSource"
- displayName="RHN Hosted Source"
+ displayName="RHN Hosted Content Source"
description="This plugin facilitates communication with Red
Hat Network."
lazyLoad="false"
downloadMode="filesystem"
diff --git
a/modules/enterprise/server/plugins/url/src/main/resources/META-INF/rhq-serverplugin.xml
b/modules/enterprise/server/plugins/url/src/main/resources/META-INF/rhq-serverplugin.xml
index f97dd7b..05aa0ff 100644
---
a/modules/enterprise/server/plugins/url/src/main/resources/META-INF/rhq-serverplugin.xml
+++
b/modules/enterprise/server/plugins/url/src/main/resources/META-INF/rhq-serverplugin.xml
@@ -8,19 +8,19 @@
xmlns:c="urn:xmlns:rhq-configuration">
<serverplugin:help><![CDATA[
- Provides a content provider that retrieves content from a remote repository
identified by a URL.
+ Provides a content source that retrieves content from a remote repository
identified by a URL.
The content must be described by an index file that contains data about all the
content.
]]></serverplugin:help>
<contentSourceType name="UrlSource"
- displayName="Remote URL Content Provider"
- description="This content provider retrieves packages from a
remote system identified by a URL."
+ displayName="Remote URL Content Source"
+ description="This content source retrieves packages from a
remote system identified by a URL."
lazyLoad="true"
downloadMode="database"
apiClass="org.rhq.enterprise.server.plugins.url.UrlProvider">
<configuration>
- <c:simple-property name="rootUrl" type="string"
required="true" description="The URL that contains all content that is to
be served by this content provider."/>
+ <c:simple-property name="rootUrl" type="string"
required="true" description="The URL that contains all content that is to
be served by this content source."/>
<c:simple-property name="indexFile" type="string"
required="true" default="content-index.txt" description="The
index file that defines all the content that can be found on the remote server. If this is
not a full URL, it is assumed to be relative to the root URL."/>
<c:list-property name="packageTypes" required="true"
min="0"
@@ -38,14 +38,14 @@
</contentSourceType>
<contentSourceType name="HttpSource"
- displayName="HTTP Content Provider"
- description="This content provider retrieves packages from a
remote HTTP server, possibly via a proxy."
+ displayName="HTTP Content Source"
+ description="This content source retrieves packages from a
remote HTTP server, possibly via a proxy."
lazyLoad="true"
downloadMode="database"
apiClass="org.rhq.enterprise.server.plugins.url.HttpProvider">
<configuration>
- <c:simple-property name="rootUrl" type="string"
required="true" description="The HTTP URL that contains all content that is
to be served by this content provider."/>
+ <c:simple-property name="rootUrl" type="string"
required="true" description="The HTTP URL that contains all content that is
to be served by this content source."/>
<c:simple-property name="indexFile" type="string"
required="true" default="content-index.txt" description="The
index file that defines all the content that can be found on the remote server. If this is
not a full URL, it is assumed to be relative to the root URL."/>
<c:list-property name="packageTypes" required="true"
min="0"
diff --git
a/modules/enterprise/server/plugins/yum/src/main/resources/META-INF/rhq-serverplugin.xml
b/modules/enterprise/server/plugins/yum/src/main/resources/META-INF/rhq-serverplugin.xml
index 0522a27..b501235 100644
---
a/modules/enterprise/server/plugins/yum/src/main/resources/META-INF/rhq-serverplugin.xml
+++
b/modules/enterprise/server/plugins/yum/src/main/resources/META-INF/rhq-serverplugin.xml
@@ -8,12 +8,12 @@
xmlns:c="urn:xmlns:rhq-configuration">
<serverplugin:help><![CDATA[
- Provides a content provider that retrieves content from a local or remote Yum
repository.
+ Provides a content source that retrieves content from a local or remote Yum
repository.
]]></serverplugin:help>
<contentSourceType name="YumSource"
- displayName="Yum Repository Content Provider"
- description="This content provider retrieves packages from a
local or remote Yum repository."
+ displayName="Yum Repository Content Source"
+ description="This content source retrieves packages from a
local or remote Yum repository."
lazyLoad="true"
downloadMode="filesystem"
apiClass="org.rhq.enterprise.server.plugins.yum.RepoProvider">
diff --git
a/modules/enterprise/server/xml-schemas/src/main/resources/rhq-serverplugin-content.xsd
b/modules/enterprise/server/xml-schemas/src/main/resources/rhq-serverplugin-content.xsd
index 8ab03a5..361b387 100644
---
a/modules/enterprise/server/xml-schemas/src/main/resources/rhq-serverplugin-content.xsd
+++
b/modules/enterprise/server/xml-schemas/src/main/resources/rhq-serverplugin-content.xsd
@@ -15,7 +15,7 @@
<xs:annotation>
<xs:documentation>
- Schema for server-side content provider plugins.
+ Schema for server-side content source plugins.
</xs:documentation>
<xs:appinfo>
<jaxb:schemaBindings>
@@ -27,7 +27,7 @@
<xs:element name="content-plugin"
type="content:ContentPluginDescriptorType"
substitutionGroup="serverplugin:server-plugin">
<xs:annotation>
<xs:documentation>
- A plugin representing a set of defined server content provider
implementations.
+ A plugin representing a set of defined server content source
implementations.
This plugin will allow remote repositories to feed content into
the server's content subsystem.
</xs:documentation>
diff --git
a/modules/enterprise/server/xml-schemas/src/main/resources/rhq-serverplugin-perspective.xsd
b/modules/enterprise/server/xml-schemas/src/main/resources/rhq-serverplugin-perspective.xsd
index f112cf1..56caebe 100644
---
a/modules/enterprise/server/xml-schemas/src/main/resources/rhq-serverplugin-perspective.xsd
+++
b/modules/enterprise/server/xml-schemas/src/main/resources/rhq-serverplugin-perspective.xsd
@@ -719,7 +719,7 @@
<xs:complexType
name="ContentProviderActivatorType">
<xs:annotation>
- <xs:documentation>The specified Content Provider Type must be installed in
order to activate the extension.
+ <xs:documentation>The specified Content Source Type must be installed in
order to activate the extension.
</xs:documentation>
</xs:annotation>
<xs:complexContent>
@@ -730,7 +730,7 @@
type="xs:string"
use="required">
<xs:annotation>
- <xs:documentation>The required Content Provider Type's
internal name.</xs:documentation>
+ <xs:documentation>The required Content Source Type's internal
name.</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:extension>
@@ -755,7 +755,7 @@
type="xs:string"
use="required">
<xs:annotation>
- <xs:documentation>The in-context content provider's type. The
internal name.</xs:documentation>
+ <xs:documentation>The in-context content source's type. The
internal name.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute
@@ -763,7 +763,7 @@
type="xs:string"
use="optional">
<xs:annotation>
- <xs:documentation>The in-context content provider. The
name.</xs:documentation>
+ <xs:documentation>The in-context content source. The
name.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute
@@ -771,7 +771,7 @@
type="xs:string"
use="optional">
<xs:annotation>
- <xs:documentation>The in-context content provider's product.
The name.</xs:documentation>
+ <xs:documentation>The in-context content source's product.
The name.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute
commit 75b4f05140e763e30b45ef4945925ffb8d9ee8a9
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Wed Mar 31 10:40:25 2010 -0400
fix test bug
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateConfigurationSubsystemTest.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateConfigurationSubsystemTest.java
index 0f0cacd..c09c0e7 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateConfigurationSubsystemTest.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateConfigurationSubsystemTest.java
@@ -529,7 +529,8 @@ public class UpdateConfigurationSubsystemTest extends
UpdateSubsytemTestBase {
/*
* Deploy v2 of the plugin
- */{ // extra block for variable scoping purposes
+ */
+ { // extra block for variable scoping purposes
registerPlugin("propertyList-v2.xml");
ResourceType platform = getResourceType("myPlatform6");
ConfigurationDefinition cd =
platform.getResourceConfigurationDefinition();
@@ -607,7 +608,7 @@ public class UpdateConfigurationSubsystemTest extends
UpdateSubsytemTestBase {
assert frc.getMaximum() == 5;
assert frc.getDetails().equals("10.0#5.0");
} else {
- assert true == false : "Unknown constraint type
encoutered";
+ assert true == false : "Unknown constraint type
encountered";
}
}
} else {
@@ -709,7 +710,7 @@ public class UpdateConfigurationSubsystemTest extends
UpdateSubsytemTestBase {
}
if (def.getName().equals("map1")) {
- assert def instanceof PropertyDefinitionSimple : "Map 1
should be a simle-property in v2";
+ assert def instanceof PropertyDefinitionSimple : "Map 1
should be a simple-property in v2";
} else {
assert def instanceof PropertyDefinitionMap : "Not all
properties are maps in v2";
}
@@ -782,7 +783,7 @@ public class UpdateConfigurationSubsystemTest extends
UpdateSubsytemTestBase {
} else if (def.getName().equals("six")) {
assert def instanceof PropertyDefinitionSimple;
} else {
- assert true == false : "Unknwon definition : " +
def.getName() + " in v1";
+ assert true == false : "Unknown definition : " +
def.getName() + " in v1";
}
}
}
@@ -817,7 +818,7 @@ public class UpdateConfigurationSubsystemTest extends
UpdateSubsytemTestBase {
assert def instanceof PropertyDefinitionList : "Expected a
list-property, but it was "
+ def.getClass().getCanonicalName();
} else {
- assert true == false : "Unknwon definition : " +
def.getName() + " in v2";
+ assert true == false : "Unknown definition : " +
def.getName() + " in v2";
}
}
}
@@ -1014,5 +1015,4 @@ public class UpdateConfigurationSubsystemTest extends
UpdateSubsytemTestBase {
getTransactionManager().rollback();
}
}
-
}
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java
index 673dd5f..b211138 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java
@@ -20,14 +20,12 @@ package org.rhq.enterprise.server.resource.metadata.test;
import java.io.FileNotFoundException;
import java.net.URL;
-import java.util.List;
import java.util.Set;
import javax.ejb.EJB;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
import javax.xml.XMLConstants;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
@@ -35,6 +33,10 @@ import javax.xml.bind.util.ValidationEventCollector;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.criteria.ResourceTypeCriteria;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeSuite;
@@ -65,6 +67,8 @@ public class UpdateSubsytemTestBase extends AbstractEJB3Test {
@EJB
protected ResourceManagerLocal resMgr;
+ protected ResourceTypeManagerLocal resourceTypeManager;
+
protected TestServerCommunicationsService agentServiceContainer;
protected int agentId;
@@ -79,6 +83,7 @@ public class UpdateSubsytemTestBase extends AbstractEJB3Test {
protected void init() {
try {
metadataManager = LookupUtil.getResourceMetadataManager();
+ resourceTypeManager = LookupUtil.getResourceTypeManager();
} catch (Throwable t) {
// Catch RuntimeExceptions and Errors and dump their stack trace, because
Surefire will completely swallow them
// and throw a cryptic NPE (see
http://jira.codehaus.org/browse/SUREFIRE-157)!
@@ -93,7 +98,6 @@ public class UpdateSubsytemTestBase extends AbstractEJB3Test {
agentServiceContainer.measurementService = new MockAgentService();
prepareScheduler();
-
}
@AfterClass
@@ -108,17 +112,25 @@ public class UpdateSubsytemTestBase extends AbstractEJB3Test {
}
protected ResourceType getResourceType(String typeName, String pluginName) {
- Query q1 = getEntityManager().createQuery("Select rt from ResourceType
rt");
- List<ResourceType> types = q1.getResultList();
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
- Query q =
getEntityManager().createNamedQuery(ResourceType.QUERY_FIND_BY_NAME_AND_PLUGIN);
- q.setParameter("name", typeName).setParameter("plugin",
pluginName);
- try {
- ResourceType type = (ResourceType) q.getSingleResult();
- return type;
- } catch (NoResultException nre) {
- throw new NoResultException("==== Failed to lookup ResourceType ["
+ typeName + "] from Plugin ["
- + pluginName + "] - found: " + types);
+ ResourceTypeCriteria resourceTypeCriteria = new ResourceTypeCriteria();
+ resourceTypeCriteria.addFilterName(typeName);
+ resourceTypeCriteria.addFilterPluginName(pluginName);
+
+ resourceTypeCriteria.fetchPluginConfigurationDefinition(true);
+ resourceTypeCriteria.fetchResourceConfigurationDefinition(true);
+ // TODO: Fetch everything else.
+
+ PageList<ResourceType> results =
this.resourceTypeManager.findResourceTypesByCriteria(overlord,
+ resourceTypeCriteria);
+ if (results.size() == 0) {
+ return null;
+ } else if (results.size() == 1) {
+ return results.get(0);
+ } else {
+ throw new IllegalStateException("Found more than one resourceType with
name " + typeName + " from plugin "
+ + pluginName + ".");
}
}
@@ -228,5 +240,4 @@ public class UpdateSubsytemTestBase extends AbstractEJB3Test {
}
}
-
}
\ No newline at end of file