rhq-commits March 2010

rhq-commits@lists.fedorahosted.org

13 participants
329 discussions

[rhq] Branch 'alertPlugin' - 3 commits - modules/enterprise
by Heiko W. Rupp 22 Mar '10

22 Mar '10

modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListAlertHistoryUIBean.java | 2 - modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/NotificationTemplatesUIBean.java | 3 ++ modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java | 9 +++--- modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/viewAlert.xhtml | 8 ++++++ modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertHistory.xhtml | 2 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 13 +++++----- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java | 3 -- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java | 3 +- 8 files changed, 27 insertions(+), 16 deletions(-) New commits: commit 4af7705cf5e243aa8294820984df3bd8f8af9652 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Mar 22 15:21:14 2010 +0100 BZ 571885 - If no notification templaes are defined, tell the user so and don't bomb out. diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/viewAlert.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/viewAlert.xhtml index eec04d4..1c42245 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/viewAlert.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/viewAlert.xhtml @@ -225,6 +225,7 @@ <h:form id="newNotificationsFromTemplateForm"> <input type="hidden" name="ad" value="${param.ad}"/> + <rich:panel rendered="#{definitionNotificationsUIBean.notificationTemplates.size > 0}"> <div> <h:selectOneMenu id="templateList" value="#{definitionNotificationsUIBean.selectedTemplate}"> <f:selectItems value="#{definitionNotificationsUIBean.notificationTemplates}"/> @@ -243,11 +244,18 @@ styleClass="buttonmed" style="margin-top: auto;"> </h:commandButton> + </rich:panel> + + <rich:panel rendered="#{definitionNotificationsUIBean.notificationTemplates.size == 0}"> + No Alert Notification Templates have been defined yet.<br/> + Please create some in Administration -> System Configuration -> AlertNotification Templates + </rich:panel> <h:outputLink id="alertTemplateCancelLink" styleClass="buttonmed" value="#" style="float: right; margin: 10px;"> <h:outputText value="Cancel" /> <rich:componentControl for="addAlertFromTemplatePanel" attachTo="alertTemplateCancelLink" operation="hide" event="onclick" /> </h:outputLink> + </h:form> </rich:modalPanel> diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java index 15bf999..c8f66d0 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java @@ -384,7 +384,8 @@ public class AlertNotificationManagerBean implements AlertNotificationManagerLoc try { template = (NotificationTemplate) q.getSingleResult(); } catch (NoResultException nre) { - throw new IllegalArgumentException("There is no template with name '" + templateName +"'"); + LOG.info("There is no alert notification template with name '" + templateName +"'"); + template = new NotificationTemplate("dummy",null); } return template; } commit c3012c76bb86e12f72eba142b29570ceab05b4c1 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Mar 22 14:36:36 2010 +0100 BZ 571911 - Fix acknowledge on the subsystem page. diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListAlertHistoryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListAlertHistoryUIBean.java index 0b6023a..def7220 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListAlertHistoryUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListAlertHistoryUIBean.java @@ -179,7 +179,7 @@ public class ListAlertHistoryUIBean extends PagedDataTableUIBean { Integer[] alertIds = StringUtility.getIntegerArray(selectedAlerts); try { - int num = alertManager.acknowledgeAlerts(subject,resource.getId(),alertIds); + int num = alertManager.acknowledgeAlerts(subject, alertIds); if (num==-1) FacesContextUtility.addMessage(FacesMessage.SEVERITY_WARN,"No Alerts passed to ack"); else diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java index 0ad0c7a..b1db3e8 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java @@ -67,12 +67,12 @@ public class SubsystemAlertHistoryUIBean extends SubsystemView { private SelectItem[] categoryFilterItems; private static final IntExtractor<AlertHistoryComposite> RESOURCE_ID_EXTRACTOR = new IntExtractor<AlertHistoryComposite>() { - + public int extract(AlertHistoryComposite object) { return object.getAlert().getAlertDefinition().getResource().getId(); } }; - + public SubsystemAlertHistoryUIBean() { datePattern = EnterpriseFacesContextUtility.getWebUser().getWebPreferences().getDateTimeDisplayPreferences() .getDateTimeFormatTrigger(); @@ -158,12 +158,11 @@ public class SubsystemAlertHistoryUIBean extends SubsystemView { public String acknowledgeSelectedAlerts() { Subject subject = EnterpriseFacesContextUtility.getSubject(); - Resource resource = EnterpriseFacesContextUtility.getResource(); AlertManagerLocal alertManager = LookupUtil.getAlertManager(); try { Integer[] selectedItems = getSelectedItems(); - int num = alertManager.acknowledgeAlerts(subject,resource.getId(), selectedItems); + int num = alertManager.acknowledgeAlerts(subject, selectedItems); if (num==-1) FacesContextUtility.addMessage(FacesMessage.SEVERITY_WARN,"No Alerts passed to ack"); else @@ -243,7 +242,7 @@ public class SubsystemAlertHistoryUIBean extends SubsystemView { protected IntExtractor<AlertHistoryComposite> getResourceIdExtractor() { return RESOURCE_ID_EXTRACTOR; } - + private void getDataFromRequest() { SubsystemAlertHistoryUIBean outer = SubsystemAlertHistoryUIBean.this; outer.resourceFilter = FacesContextUtility.getOptionalRequestParameter(FORM_PREFIX + "resourceFilter"); diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertHistory.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertHistory.xhtml index bf591c4..1f81df9 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertHistory.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertHistory.xhtml @@ -200,7 +200,7 @@ value="PURGE ALL" styleClass="on-pager-button buttonsmall" rendered="#{GlobalPermissionsUIBean.superuser}" /> <onc:selectCommandButton action="#{SubsystemAlertHistoryUIBean.acknowledgeSelectedAlerts}" - value="ACKNOWLEDGE SELECTED" target="selectedAlerts" styleClass="on-pager-button buttonsmall" + value="ACKNOWLEDGE SELECTED" target="selectedItems" styleClass="on-pager-button buttonsmall" rendered="#{GlobalPermissionsUIBean.superuser}" /> diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java index 0f48f9e..322a93c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java @@ -566,14 +566,12 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { * Acknowledge the alerts (that got fired) so that admins know who is working * on fixing the situation. * @param user calling user - * @param resourceId resource the alerts happened on * @param alertIds PKs of the alerts to ack * @return number of alerts acknowledged */ - public int acknowledgeAlerts(Subject user, int resourceId, Integer[] alertIds) { - if (!authorizationManager.hasResourcePermission(user, Permission.MANAGE_ALERTS, resourceId)) { - throw new PermissionException("User [" + user.getName() + "] does not have permissions to acknowledge alerts " - + "for resourceId=" + resourceId); + public int acknowledgeAlerts(Subject user, Integer[] alertIds) { + if (!authorizationManager.hasGlobalPermission(user, Permission.MANAGE_ALERTS)) { + throw new PermissionException("User [" + user.getName() + "] does not have permissions to acknowledge alerts "); } int i=0; @@ -585,8 +583,11 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { for (int id : alertIds) { acknowledgeAlert(id,user); i++; - if (i %20 == 0) + if (i % 50 == 0) { entityManager.flush(); + entityManager.clear(); + } + } return i; } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java index e482ffa..46e4b8e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java @@ -122,11 +122,10 @@ public interface AlertManagerLocal { * Acknowledge the alerts (that got fired) so that admins know who is working * on fixing the situation. * @param user calling user - * @param resourceId resource the alerts happened on * @param alertIds PKs of the alerts to ack * @return number of alerts acknowledged */ - int acknowledgeAlerts(Subject user, int resourceId, Integer[] alertIds); + int acknowledgeAlerts(Subject user, Integer[] alertIds); /** * Remove the alerts with the specified id's. commit d0ac8f88594f6fab62ac3ade64cd278c07c38c48 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Mar 22 12:13:36 2010 +0100 BZ 571968 - refresh list of templates after delete diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/NotificationTemplatesUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/NotificationTemplatesUIBean.java index 19bc895..f384e3f 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/NotificationTemplatesUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/NotificationTemplatesUIBean.java @@ -148,6 +148,9 @@ public class NotificationTemplatesUIBean implements Serializable { String summary = getDeletionSummary(numDeleted); FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, summary); + // Re-get the list of still existing templates + this.notificationTemplates = alertNotificationManager.listNotificationTemplates(this.subject); + return null; }

1 0

[rhq] Branch 'gwt' - modules/core
by mazz 22 Mar '10

22 Mar '10

modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 871f470b77dd8e4d1148a741e21a17b99734c462 Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Mar 22 10:34:03 2010 -0400 dont use getSimpleName - GWT can't handle it diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java index 6288b5c..c08aa5d 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java @@ -202,7 +202,9 @@ public abstract class Criteria implements Serializable { public String getAlias() { if (this.alias == null) { // Base alias on persistent class's name: org.rhq.core.domain.ResourceType -> "resourcetype" - String classSimpleName = getPersistentClass().getSimpleName(); + // don't use getSimpleName - not available to GWT + String className = getPersistentClass().getName(); + String classSimpleName = className.substring(className.lastIndexOf(".") + 1); this.alias = classSimpleName.toLowerCase(); } return this.alias;

1 0

[rhq] Branch 'gwt' - modules/core
by mazz 22 Mar '10

22 Mar '10

modules/core/domain/src/main/java/org/rhq/core/client/GwtClientUtility.java | 37 ---------- modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java | 3 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PackageVersionCriteria.java | 5 - 3 files changed, 4 insertions(+), 41 deletions(-) New commits: commit 90d18c80edae411413ec7a3fd7c071a4becd0394 Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Mar 22 10:09:52 2010 -0400 fix the package version criteria so it uses the proper alias. diff --git a/modules/core/domain/src/main/java/org/rhq/core/client/GwtClientUtility.java b/modules/core/domain/src/main/java/org/rhq/core/client/GwtClientUtility.java deleted file mode 100644 index 0a227e0..0000000 --- a/modules/core/domain/src/main/java/org/rhq/core/client/GwtClientUtility.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2010 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.rhq.core.client; - -/** - * @author Ian Springer - */ -public class GwtClientUtility { - public static String getSimpleName(Class clazz) { - String className = clazz.getName(); - // TODO: Cache the simple names in a static Map<Class, String>. - return className.substring(className.lastIndexOf(".") + 1); - } - - private GwtClientUtility() { - } -} diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java index 4caf4ab..6288b5c 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java @@ -32,7 +32,6 @@ import java.util.Map; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import org.rhq.core.client.GwtClientUtility; import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.util.PageControl; @@ -203,7 +202,7 @@ public abstract class Criteria implements Serializable { public String getAlias() { if (this.alias == null) { // Base alias on persistent class's name: org.rhq.core.domain.ResourceType -> "resourcetype" - String classSimpleName = GwtClientUtility.getSimpleName(getPersistentClass()); + String classSimpleName = getPersistentClass().getSimpleName(); this.alias = classSimpleName.toLowerCase(); } return this.alias; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PackageVersionCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PackageVersionCriteria.java index 5e0d2f8..3e304b6 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PackageVersionCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PackageVersionCriteria.java @@ -35,9 +35,10 @@ public class PackageVersionCriteria extends Criteria { private PageOrdering sortDisplayName; public PackageVersionCriteria() { + String alias = getAlias(); filterOverrides.put("repoId", "id IN " // + "( SELECT cpv.packageVersion.id" // - + " FROM pv.repoPackageVersions cpv " // + + " FROM " + alias + ".repoPackageVersions cpv " // + " WHERE cpv.repo.id = ? )"); filterOverrides.put("fileSizeMinimum", "fileSize >= ?"); filterOverrides.put("fileSizeMaximum", "fileSize <= ?"); @@ -45,7 +46,7 @@ public class PackageVersionCriteria extends Criteria { filterOverrides.put("packageTypeId", "generalPackage.packageType.id = ? "); filterOverrides.put("resourceId", "id IN " // + "( SELECT ip.packageVersion.id" // - + " FROM pv.installedPackages ip " // + + " FROM " + alias + ".installedPackages ip " // + " WHERE ip.resource.id = ? )"); }

1 0

[rhq] Branch 'alertPlugin' - 18 commits - modules/core modules/enterprise modules/plugins pom.xml
by Heiko W. Rupp 22 Mar '10

22 Mar '10

modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml | 41 modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 516 +--------- modules/core/domain/src/main/java/org/rhq/core/domain/content/Advisory.java | 12 modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryPackage.java | 2 modules/core/native-system/src/main/java/org/rhq/core/system/SystemInfoFactory.java | 23 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java | 25 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java | 9 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/browse/BrowseGroupsUIBean.java | 8 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/FavoritesUIBean.java | 12 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ResourceUIBean.java | 5 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/inventory-beans.xml | 4 modules/enterprise/gui/portal-war/src/main/webapp/js/timeline/ajax/api/scripts/units.js | 128 +- modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/summary.xhtml | 4 modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerBean.java | 44 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManager.java | 6 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/RepoDetails.java | 13 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/RepoGroupDetails.java | 10 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/sync/RepoSourceSynchronizer.java | 2 modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/JBossSoftwareContentSourceAdapter.java | 2 modules/plugins/filetemplate-bundle/src/main/java/org/rhq/plugins/filetemplate/ProcessingRecipeContext.java | 15 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java | 3 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossProductType.java | 13 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/DeploymentUtility.java | 2 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java | 35 modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml | 2 pom.xml | 10 27 files changed, 384 insertions(+), 564 deletions(-) New commits: commit d49f3d1ce688cdfff563a1f78c66b1a516b8ccc3 Author: Ian P. Springer <ips(a)jetengine.(none)> Date: Fri Mar 19 15:10:45 2010 -0400 ... diff --git a/pom.xml b/pom.xml index 1a21ab1..054740c 100644 --- a/pom.xml +++ b/pom.xml @@ -587,7 +587,7 @@ </executions> </plugin> - <plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <executions> @@ -608,7 +608,7 @@ </configuration> </execution> </executions> - </plugin> + </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> commit 8f9b19320ccf5fb32b1c572f4d7d8c7d8a184a65 Author: Ian P. Springer <ips(a)jetengine.(none)> Date: Fri Mar 19 14:37:34 2010 -0400 add id's to executions, so we will be able to override those executions in descendant poms diff --git a/pom.xml b/pom.xml index e2cc42b..1a21ab1 100644 --- a/pom.xml +++ b/pom.xml @@ -531,9 +531,8 @@ </plugins> </pluginManagement> - <plugins> - + <plugins>  +  + <managed-bean> <managed-bean-name>ResourceOverviewUIBean</managed-bean-name> <managed-bean-class>org.rhq.enterprise.gui.inventory.resource.ResourceOverviewUIBean</managed-bean-class> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/summary.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/summary.xhtml index 4a0e1cf..9f132c8 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/summary.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/summary.xhtml @@ -85,9 +85,9 @@ groupId - the group id of the Group being accessed <rich:toolTip for="favoritesStar"> - <h:outputText value="Add resource to favorites list" + <h:outputText value="Add group to favorites list" rendered="#{!ResourceGroupUIBean.favorite}"/> - <h:outputText value="Remove resource from favorites list" + <h:outputText value="Remove group from favorites list" rendered="#{ResourceGroupUIBean.favorite}"/> </rich:toolTip> </a4j:region> commit ad9fe1aba113f55f9493a205c0a2f29d1a26f9e6 Merge: 450dea0... 7721e26... Author: Ian P. Springer <ips(a)jetengine.(none)> Date: Thu Mar 18 10:42:21 2010 -0400 Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq commit 7721e26cda6183de4191d6ca6d70379147dc70ac Merge: db755e1... 7e4c228... Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Mar 18 10:18:44 2010 -0400 Merge branch 'bundle' commit 7e4c2286585b5af7bdb843fb6e4ce1a1e6fe56b0 Merge: b25c245... 96a5298... Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Mar 18 10:13:36 2010 -0400 Merge branch 'bundle-jay' into bundle commit b25c245e3cfb775f38f7102252d5009c270442f6 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Mar 18 10:13:29 2010 -0400 LT diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/js/timeline/ajax/api/scripts/units.js b/modules/enterprise/gui/portal-war/src/main/webapp/js/timeline/ajax/api/scripts/units.js index 54f2a5b..7bdcd0d 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/js/timeline/ajax/api/scripts/units.js +++ b/modules/enterprise/gui/portal-war/src/main/webapp/js/timeline/ajax/api/scripts/units.js @@ -1,64 +1,64 @@ -/*================================================== - * Default Unit - *================================================== - */ - -SimileAjax.NativeDateUnit = new Object(); - -SimileAjax.NativeDateUnit.makeDefaultValue = function() { - return new Date(); -}; - -SimileAjax.NativeDateUnit.cloneValue = function(v) { - return new Date(v.getTime()); -}; - -SimileAjax.NativeDateUnit.getParser = function(format) { - if (typeof format == "string") { - format = format.toLowerCase(); - } - return (format == "iso8601" || format == "iso 8601") ? - SimileAjax.DateTime.parseIso8601DateTime : - SimileAjax.DateTime.parseGregorianDateTime; -}; - -SimileAjax.NativeDateUnit.parseFromObject = function(o) { - return SimileAjax.DateTime.parseGregorianDateTime(o); -}; - -SimileAjax.NativeDateUnit.toNumber = function(v) { - return v.getTime(); -}; - -SimileAjax.NativeDateUnit.fromNumber = function(n) { - return new Date(n); -}; - -SimileAjax.NativeDateUnit.compare = function(v1, v2) { - var n1, n2; - if (typeof v1 == "object") { - n1 = v1.getTime(); - } else { - n1 = Number(v1); - } - if (typeof v2 == "object") { - n2 = v2.getTime(); - } else { - n2 = Number(v2); - } - - return n1 - n2; -}; - -SimileAjax.NativeDateUnit.earlier = function(v1, v2) { - return SimileAjax.NativeDateUnit.compare(v1, v2) < 0 ? v1 : v2; -}; - -SimileAjax.NativeDateUnit.later = function(v1, v2) { - return SimileAjax.NativeDateUnit.compare(v1, v2) > 0 ? v1 : v2; -}; - -SimileAjax.NativeDateUnit.change = function(v, n) { - return new Date(v.getTime() + n); -}; - +/*================================================== + * Default Unit + *================================================== + */ + +SimileAjax.NativeDateUnit = new Object(); + +SimileAjax.NativeDateUnit.makeDefaultValue = function() { + return new Date(); +}; + +SimileAjax.NativeDateUnit.cloneValue = function(v) { + return new Date(v.getTime()); +}; + +SimileAjax.NativeDateUnit.getParser = function(format) { + if (typeof format == "string") { + format = format.toLowerCase(); + } + return (format == "iso8601" || format == "iso 8601") ? + SimileAjax.DateTime.parseIso8601DateTime : + SimileAjax.DateTime.parseGregorianDateTime; +}; + +SimileAjax.NativeDateUnit.parseFromObject = function(o) { + return SimileAjax.DateTime.parseGregorianDateTime(o); +}; + +SimileAjax.NativeDateUnit.toNumber = function(v) { + return v.getTime(); +}; + +SimileAjax.NativeDateUnit.fromNumber = function(n) { + return new Date(n); +}; + +SimileAjax.NativeDateUnit.compare = function(v1, v2) { + var n1, n2; + if (typeof v1 == "object") { + n1 = v1.getTime(); + } else { + n1 = Number(v1); + } + if (typeof v2 == "object") { + n2 = v2.getTime(); + } else { + n2 = Number(v2); + } + + return n1 - n2; +}; + +SimileAjax.NativeDateUnit.earlier = function(v1, v2) { + return SimileAjax.NativeDateUnit.compare(v1, v2) < 0 ? v1 : v2; +}; + +SimileAjax.NativeDateUnit.later = function(v1, v2) { + return SimileAjax.NativeDateUnit.compare(v1, v2) > 0 ? v1 : v2; +}; + +SimileAjax.NativeDateUnit.change = function(v, n) { + return new Date(v.getTime() + n); +}; + commit 96a5298c91a6ced21500f864a96f636973179e4b Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Mar 17 16:37:25 2010 -0400 Just added some debug logging confirming successful command handling. diff --git a/modules/plugins/filetemplate-bundle/src/main/java/org/rhq/plugins/filetemplate/ProcessingRecipeContext.java b/modules/plugins/filetemplate-bundle/src/main/java/org/rhq/plugins/filetemplate/ProcessingRecipeContext.java index f4cb102..090ea3d 100644 --- a/modules/plugins/filetemplate-bundle/src/main/java/org/rhq/plugins/filetemplate/ProcessingRecipeContext.java +++ b/modules/plugins/filetemplate-bundle/src/main/java/org/rhq/plugins/filetemplate/ProcessingRecipeContext.java @@ -29,6 +29,9 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import org.rhq.bundle.filetemplate.recipe.RecipeContext; import org.rhq.bundle.filetemplate.recipe.RecipeParser; import org.rhq.core.domain.content.PackageVersion; @@ -45,6 +48,8 @@ import org.rhq.core.util.file.FileUtil; */ public class ProcessingRecipeContext extends RecipeContext { + private final Log log = LogFactory.getLog(this.getClass()); + private final Map<PackageVersion, File> packageVersionFiles; private final SystemInfo systemInfo; private String baseWorkingDirectory; @@ -73,12 +78,14 @@ public class ProcessingRecipeContext extends RecipeContext { throw new RuntimeException("Failed to unbundle file [" + pe + "]: " + results); } // existingFile.delete(); WOULD WE WANT TO REMOVE THE COMPRESSED FILE? + log.debug("bundle deploy: unzipped " + existingFile + " to " + directory); } else { // not a zipped format - just move the file to the directory as-is File newFile = new File(directory, filename); if (!existingFile.renameTo(newFile)) { throw new RuntimeException("Failed to move [" + existingFile + "] to [" + newFile + "]"); } + log.debug("bundle deploy: renamed " + existingFile + " to " + newFile); } } @@ -92,6 +99,8 @@ public class ProcessingRecipeContext extends RecipeContext { try { destinationFile.getParentFile().mkdirs(); FileUtil.copyFile(sourceFile, destinationFile); + + log.debug("bundle file: copied " + sourceFile + " to " + destinationFile); } catch (Exception e) { throw new RuntimeException("Failed to copy file [" + sourceFile + "] to [" + destinationFile + "]", e); } @@ -132,6 +141,8 @@ public class ProcessingRecipeContext extends RecipeContext { if (!realizedTmpFile.renameTo(trueFile)) { throw new RuntimeException("Failed to rename realized tmp file [" + realizedTmpFile + "]"); } + + log.debug("bundle realize file: renamed realized" + realizedTmpFile + " to " + trueFile); } catch (Exception e) { throw new RuntimeException("Cannot realize file [" + file + "]", e); } finally { @@ -175,6 +186,8 @@ public class ProcessingRecipeContext extends RecipeContext { if (results.getError() != null) { throw new RuntimeException("Could not execute script [" + pe + "]: " + results, results.getError()); } + + log.debug("bundle script: executed script [" + pe + "]"); } @Override @@ -191,6 +204,8 @@ public class ProcessingRecipeContext extends RecipeContext { if (results.getError() != null) { throw new RuntimeException("Could not execute command [" + pe + "]: " + results, results.getError()); } + + log.debug("bundle command: executed command [" + pe + "]"); } private void ensureExecutable(File scriptFile) { commit 99a7975b4cb031510616a62060c4d2699ca33b6f Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Mar 17 14:47:43 2010 -0400 Add unique indexes to various bundle tables to avoid logical duplicates. Also, fixed up a lot of advisory-related db-upgrade stuff left over from the former core team. The db-upgrade, at least for this stuff, now matches the schema definitions. Also, got the db-upgrade to run through from a 2.3.1 db on postgres. Also tweaked a couple of entity classes to match the schema. diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml b/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml index b2663d4..683c991 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml @@ -410,8 +410,8 @@ <column name="SEVERITY" size="64" type="VARCHAR2" required="false"/> <column name="ISSUE_DATE" type="LONG" required="false"/> <column name="UPDATE_DATE" type="LONG" required="false"/> - <column name="CTIME" type="LONG" required="false"/> - <column name="LAST_MODIFIED" type="LONG" required="false"/> + <column name="CTIME" type="LONG" required="true"/> + <column name="LAST_MODIFIED" type="LONG" required="true"/> <index name="RHQ_ADVISORY_NAME_UQ" unique="true"> <field ref="ADVISORY_NAME"/> @@ -423,23 +423,18 @@ <index name="RHQ_ADVISORY_UDATE_IDX" unique="false"> <field ref="UPDATE_DATE"/> - </index> - - <index name="RHQ_ADVISORY_SYN_IDX" unique="false"> - <field ref="SYNOPSIS"/> - </index> - + </index> </table> <table name="RHQ_ADVISORY_PACKAGE"> - <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/> + <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/> <column name="ADVISORY_ID" type="INTEGER" required="true" references="RHQ_ADVISORY"/> <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/> - <column name="LAST_MODIFIED" type="LONG" required="false"/> + <column name="LAST_MODIFIED" type="LONG" required="true"/> <index name="RHQ_ADVISORY_PKG_IDX" unique="true"> <field ref="ADVISORY_ID"/> - <field ref="PACKAGE_VERSIOn_ID"/> + <field ref="PACKAGE_VERSION_ID"/> </index> </table> @@ -492,6 +487,11 @@ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/> <column name="NAME" size="200" type="VARCHAR2" required="true"/> <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/> + +  + <index name="RHQ_BUNDLE_TYPE_UNIQUE" unique="true"> + <field ref="NAME"/> + </index> </table>  @@ -501,6 +501,12 @@ <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/> <column name="BUNDLE_TYPE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_TYPE"/> <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/> + +  + <index name="RHQ_BUNDLE_UNIQUE" unique="true"> + <field ref="BUNDLE_TYPE_ID"/> + <field ref="NAME"/> + </index> </table>  @@ -513,6 +519,13 @@ <column name="CONFIG_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_DEF" /> <column name="BUNDLE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE"/> <column name="DISTRIBUTION_ID" type="INTEGER" required="false" references="RHQ_DISTRIBUTION"/> + +  + <index name="RHQ_BUNDLE_VERSION_UNIQUE" unique="true"> + <field ref="BUNDLE_ID"/> + <field ref="NAME"/> + <field ref="VERSION"/> + </index> </table>  @@ -548,6 +561,12 @@ <column name="ENFORCEMENT_INTERVAL" type="INTEGER" required="false"/> <column name="BUNDLE_VERSION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_VERSION"/> <column name="BUNDLE_ID" type="INTEGER" required="false" references="RHQ_BUNDLE"/> + +  + <index name="RHQ_BUNDLE_DEPLOY_DEF_UNIQUE" unique="true"> + <field ref="BUNDLE_VERSION_ID"/> + <field ref="NAME"/> + </index> </table>  diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index 85fe084..23f1fbd 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -2219,337 +2219,80 @@  <schemaSpec version="2.71"> - <schema-directSQL> - <statement> - CREATE TABLE RHQ_ADVISORY_TYPE ( ID INTEGER PRIMARY KEY ) - </statement> - </schema-directSQL> - <schema-alterColumn table="RHQ_ADVISORY_TYPE" column="ID" nullable="false" /> - <schema-addColumn table="RHQ_ADVISORY_TYPE" column="NAME" precision="200" columnType="VARCHAR2" /> - <schema-alterColumn table="RHQ_ADVISORY_TYPE" column="NAME" nullable="false" /> - <schema-addColumn table="RHQ_ADVISORY_TYPE" column="DESCRIPTION" precision="500" columnType="VARCHAR2" /> - <schema-directSQL> - <statement> - INSERT INTO - RHQ_ADVISORY_TYPE ( ID, NAME, DESCRIPTION ) - VALUES ( 101, 'Bug Fix Advisory', 'Bug fix(RHBA) Advisory' ) - </statement> - <statement> - INSERT INTO - RHQ_ADVISORY_TYPE ( ID, NAME, DESCRIPTION ) - VALUES ( 102, 'Product Enhancement Advisory', 'Product Enhancement(RHEA) Advisory' ) - </statement> - <statement> - INSERT INTO - RHQ_ADVISORY_TYPE ( ID, NAME, DESCRIPTION ) - VALUES ( 103, 'Security Advisory', 'Security Advisory(RHSA) Advisory' ) - </statement> - </schema-directSQL> - <schema-directSQL> - <statement> - CREATE TABLE RHQ_ADVISORY_SEVERITY ( ID INTEGER PRIMARY KEY ) - </statement> - </schema-directSQL> - <schema-alterColumn table="RHQ_ADVISORY_SEVERITY" column="ID" nullable="false" /> - <schema-addColumn table="RHQ_ADVISORY_SEVERITY" column="RANK" columnType="INTEGER" /> - <schema-alterColumn table="RHQ_ADVISORY_SEVERITY" column="RANK" nullable="false" /> - <schema-addColumn table="RHQ_ADVISORY_SEVERITY" column="LABEL" precision="40" columnType="VARCHAR2" /> - <schema-alterColumn table="RHQ_ADVISORY_SEVERITY" column="LABEL" nullable="false" /> - <schema-directSQL> - <statement> - INSERT INTO - RHQ_ADVISORY_TYPE ( ID, RANK, LABEL) - VALUES ( 101, 0, 'errata.sev.label.critical' ) - </statement> - <statement> - INSERT INTO - RHQ_ADVISORY_TYPE ( ID, RANK, LABEL) - VALUES ( 102, 1, 'errata.sev.label.important' ) - </statement> - <statement> - INSERT INTO - RHQ_ADVISORY_TYPE ( ID, RANK, LABEL) - VALUES ( 103, 2, 'errata.sev.label.moderate' ) - </statement> - <statement> - INSERT INTO - RHQ_ADVISORY_TYPE ( ID, RANK, LABEL) - VALUES ( 104, 3, 'errata.sev.label.low' ) - </statement> - </schema-directSQL> - <schema-directSQL> - <statement> - CREATE TABLE RHQ_ADVISORY_FILE_TYPE ( ID INTEGER PRIMARY KEY ) - </statement> - </schema-directSQL> - <schema-alterColumn table="RHQ_ADVISORY_FILE_TYPE" column="ID" nullable="false" /> - <schema-addColumn table="RHQ_ADVISORY_FILE_TYPE" column="LABEL" precision="40" columnType="VARCHAR2" /> - <schema-alterColumn table="RHQ_ADVISORY_FILE_TYPE" column="LABEL" nullable="false" /> - <schema-directSQL> - <statement> - INSERT INTO - RHQ_ADVISORY_FILE_TYPE ( ID, LABEL) - VALUES ( 101, 'RPM' ) - </statement> - <statement> - INSERT INTO - RHQ_ADVISORY_FILE_TYPE ( ID, LABEL) - VALUES ( 102, 'SRPM' ) - </statement> - <statement> - INSERT INTO - RHQ_ADVISORY_FILE_TYPE ( ID, LABEL) - VALUES ( 103, 'IMG') - </statement> - <statement> - INSERT INTO - RHQ_ADVISORY_FILE_TYPE ( ID, LABEL) - VALUES ( 104, 'OVAL') - </statement> - </schema-directSQL> <schema-createSequence name="RHQ_ADVISORY_SEQ" initial="10001" /> <schema-directSQL> - <statement desc="Creating table RHQ_ADVISORY"> CREATE TABLE RHQ_ADVISORY ( ID INTEGER PRIMARY KEY ) </statement> </schema-directSQL> + <schema-alterColumn table="RHQ_ADVISORY" column="ID" nullable="false" columnType="INTEGER" /> <schema-addColumn table="RHQ_ADVISORY" column="ADVISORY" precision="64" columnType="VARCHAR2" /> <schema-alterColumn table="RHQ_ADVISORY" column="ADVISORY" nullable="false" /> - <schema-addColumn table="RHQ_ADVISORY" column="ADVISORY_TYPE_ID" columnType="INTEGER" /> - <schema-alterColumn table="RHQ_ADVISORY" column="ADVISORY_TYPE_ID" nullable="false" /> - <schema-addColumn table="RHQ_ADVISORY" column="ADVISORY_NAME" precision="64" columnType="VARCHAR2" /> - <schema-alterColumn table="RHQ_ADVISORY" column="ADVISORY_NAME" nullable="false" /> + <schema-addColumn table="RHQ_ADVISORY" column="ADVISORY_TYPE" precision="64" columnType="VARCHAR2" /> + <schema-alterColumn table="RHQ_ADVISORY" column="ADVISORY_TYPE" nullable="false" /> <schema-addColumn table="RHQ_ADVISORY" column="ADVISORY_REL" precision="64" columnType="VARCHAR2" /> - <schema-alterColumn table="RHQ_ADVISORY" column="ADVISORY_REL" nullable="false" /> - <schema-addColumn table="RHQ_ADVISORY" column="DESCRIPTION" precision="4000" columnType="VARCHAR2" /> - <schema-alterColumn table="RHQ_ADVISORY" column="DESCRIPTION" nullable="false" /> + <schema-addColumn table="RHQ_ADVISORY" column="ADVISORY_NAME" precision="64" columnType="VARCHAR2" /> + <schema-addColumn table="RHQ_ADVISORY" column="DESCRIPTION" precision="4000" columnType="VARCHAR2" /> <schema-addColumn table="RHQ_ADVISORY" column="SYNOPSIS" precision="4000" columnType="VARCHAR2" /> - <schema-alterColumn table="RHQ_ADVISORY" column="SYNOPSIS" nullable="false" /> + <schema-alterColumn table="RHQ_ADVISORY" column="SYNOPSIS" nullable="false" /> <schema-addColumn table="RHQ_ADVISORY" column="TOPIC" precision="4000" columnType="VARCHAR2" /> - <schema-alterColumn table="RHQ_ADVISORY" column="TOPIC" nullable="false" /> <schema-addColumn table="RHQ_ADVISORY" column="SOLUTION" precision="4000" columnType="VARCHAR2" /> - <schema-alterColumn table="RHQ_ADVISORY" column="SOLUTION" nullable="false" /> - <schema-addColumn table="RHQ_ADVISORY" column="SEVERITY_ID" columnType="INTEGER" /> - <schema-alterColumn table="RHQ_ADVISORY" column="SEVERITY_ID" nullable="false" /> + <schema-addColumn table="RHQ_ADVISORY" column="SEVERITY" precision="64" columnType="VARCHAR2" /> <schema-addColumn table="RHQ_ADVISORY" column="ISSUE_DATE" columnType="LONG" /> - <schema-alterColumn table="RHQ_ADVISORY" column="ISSUE_DATE" nullable="false" /> <schema-addColumn table="RHQ_ADVISORY" column="UPDATE_DATE" columnType="LONG" /> - <schema-alterColumn table="RHQ_ADVISORY" column="UPDATE_DATE" nullable="false" /> <schema-addColumn table="RHQ_ADVISORY" column="CTIME" columnType="LONG" /> <schema-alterColumn table="RHQ_ADVISORY" column="CTIME" nullable="false" /> <schema-addColumn table="RHQ_ADVISORY" column="LAST_MODIFIED" columnType="LONG" /> <schema-alterColumn table="RHQ_ADVISORY" column="LAST_MODIFIED" nullable="false" /> - <schema-directSQL> - <statement targetDBVendor="postgresql"> - CREATE UNIQUE INDEX RHQ_ADVISORY_NAME_UQ - ON RHQ_ADVISORY ( ADVISORY_NAME ) - </statement> - <statement targetDBVendor="oracle"> - CREATE UNIQUE INDEX RHQ_ADVISORY_NAME_UQ - ON RHQ_ADVISORY ( ADVISORY_NAME ) - </statement> - </schema-directSQL> - <schema-directSQL> - <statement targetDBVendor="postgresql"> - CREATE UNIQUE INDEX RHQ_ADVISORY_UQ - ON RHQ_ADVISORY ( ADVISORY ) - </statement> - <statement targetDBVendor="oracle"> - CREATE UNIQUE INDEX RHQ_ADVISORY_UQ - ON RHQ_ADVISORY ( ADVISORY ) - </statement> - </schema-directSQL> - - <schema-directSQL> - <statement targetDBVendor="postgresql"> - CREATE INDEX RHQ_ADVISORY_UDATE_IDX - ON RHQ_ADVISORY (UPDATE_DATE ) - </statement> - <statement targetDBVendor="oracle"> - CREATE INDEX RHQ_ADVISORY_UDATE_IDX - ON RHQ_ADVISORY (UPDATE_DATE ) - </statement> - </schema-directSQL> - <schema-directSQL> - <statement targetDBVendor="postgresql"> - CREATE INDEX RHQ_ADVISORY_SYN_IDX - ON RHQ_ADVISORY ( SYNOPSIS ) - </statement> - <statement targetDBVendor="oracle"> - CREATE INDEX RHQ_ADVISORY_SYN_IDX - ON RHQ_ADVISORY ( SYNOPSIS ) - </statement> - </schema-directSQL> - <schema-directSQL> - <statement targetDBVendor="oracle"> - ALTER TABLE RHQ_ADVISORY - ADD CONSTRAINT RHQ_ADV_TYPE_FKEY - FOREIGN KEY ( ADVISORY_TYPE_ID ) - REFERENCES RHQ_ADVISORY_TYPE ( ID ) - </statement> - <statement targetDBVendor="postgresql"> - ALTER TABLE RHQ_ADVISORY - ADD CONSTRAINT RHQ_ADV_TYPE_FKEY - FOREIGN KEY ( ADVISORY_TYPE_ID ) - REFERENCES RHQ_ADVISORY_TYPE ( ID ) - </statement> - </schema-directSQL> - <schema-directSQL> - <statement targetDBVendor="oracle"> - ALTER TABLE RHQ_ADVISORY - ADD CONSTRAINT RHQ_ADV_SEV_FKEY - FOREIGN KEY ( SEVERITY_ID ) - REFERENCES RHQ_ADVISORY_SEVERITY ( ID ) - </statement> - <statement targetDBVendor="postgresql"> - ALTER TABLE RHQ_ADVISORY - ADD CONSTRAINT RHQ_ADV_SEV_FKEY - FOREIGN KEY ( SEVERITY_ID ) - REFERENCES RHQ_ADVISORY_SEVERITY ( ID ) - </statement> - </schema-directSQL> - <schema-createSequence name="RHQ_ADVISORY_FILE_SEQ" initial="10001" /> + <schema-directSQL> <statement> - CREATE TABLE RHQ_ADVISORY_FILE ( ID INTEGER ) - </statement> - </schema-directSQL> - <schema-alterColumn table="RHQ_ADVISORY_FILE" column="ID" nullable="false" /> - <schema-addColumn table="RHQ_ADVISORY_FILE" column="ADVISORY_ID" columnType="INTEGER" /> - <schema-alterColumn table="RHQ_ADVISORY_FILE" column="ADVISORY_ID" nullable="false" /> - <schema-addColumn table="RHQ_ADVISORY_FILE" column="FILE_TYPE_ID" columnType="INTEGER" /> - <schema-alterColumn table="RHQ_ADVISORY_FILE" column="FILE_TYPE_ID" nullable="false" /> - <schema-addColumn table="RHQ_ADVISORY_FILE" column="RELATIVE_FILENAME" precision="256" columnType="VARCHAR2" /> - <schema-alterColumn table="RHQ_ADVISORY_FILE" column="RELATIVE_FILENAME" nullable="false" /> - <schema-addColumn table="RHQ_ADVISORY_FILE" column="MD5SUM" precision="64" columnType="VARCHAR2" /> - <schema-alterColumn table="RHQ_ADVISORY_FILE" column="MD5SUM" nullable="false" /> - <schema-addColumn table="RHQ_ADVISORY_FILE" column="LAST_MODIFIED" columnType="LONG" /> - <schema-alterColumn table="RHQ_ADVISORY_FILE" column="LAST_MODIFIED" nullable="false" /> - <schema-directSQL> - <statement targetDBVendor="postgresql"> - CREATE UNIQUE INDEX RHQ_ADVISORY_ID_FILE_UQ - ON RHQ_ADVISORY_FILE ( ADVISORY_ID, RELATIVE_FILENAME ) - </statement> - <statement targetDBVendor="oracle"> - CREATE UNIQUE INDEX RHQ_ADVISORY_ID_FILE_UQ - ON RHQ_ADVISORY_FILE ( ADVISORY_ID, RELATIVE_FILENAME ) - </statement> - </schema-directSQL> - <schema-directSQL> - <statement targetDBVendor="oracle"> - ALTER TABLE RHQ_ADVISORY_FILE - ADD CONSTRAINT RHQ_ADV_FILE_FKEY - FOREIGN KEY ( ADVISORY_ID) - REFERENCES RHQ_ADVISORY ( ID ) - </statement> - <statement targetDBVendor="postgresql"> - ALTER TABLE RHQ_ADVISORY_FILE - ADD CONSTRAINT RHQ_ADV_FILE_FKEY - FOREIGN KEY ( ADVISORY_ID) - REFERENCES RHQ_ADVISORY ( ID ) - </statement> - </schema-directSQL> - <schema-directSQL> - <statement targetDBVendor="oracle"> - ALTER TABLE RHQ_ADVISORY_FILE - ADD CONSTRAINT RHQ_ADV_FILE_TYPE_FKEY - FOREIGN KEY ( FILE_TYPE_ID ) - REFERENCES RHQ_ADVISORY_FILE_TYPE ( ID ) + CREATE UNIQUE INDEX RHQ_ADVISORY_NAME_UQ ON RHQ_ADVISORY ( ADVISORY_NAME ) </statement> - <statement targetDBVendor="postgresql"> - ALTER TABLE RHQ_ADVISORY_FILE - ADD CONSTRAINT RHQ_ADV_FILE_TYPE_FKEY - FOREIGN KEY ( FILE_TYPE_TYPE ) - REFERENCES RHQ_ADVISORY_FILE_TYPE ( ID ) - </statement> - </schema-directSQL> - <schema-directSQL> <statement> - CREATE TABLE RHQ_ADVISORY_PACKAGE_MAP ( ADVISORY_ID INTEGER ) - </statement> - </schema-directSQL> - <schema-alterColumn table="RHQ_ADVISORY_PACKAGE_MAP" column="ADVISORY_ID" nullable="false" /> - <schema-addColumn table="RHQ_ADVISORY_PACKAGE_MAP" column="PACKAGE_ID" columnType="INTEGER" /> - <schema-alterColumn table="RHQ_ADVISORY_PACKAGE_MAP" column="PACKAGE_ID" nullable="false" /> - <schema-directSQL> - <statement targetDBVendor="oracle"> - ALTER TABLE RHQ_ADVISORY_PACKAGE_MAP - ADD CONSTRAINT RHQ_ADV_PKG_MAP_KEY - PRIMARY KEY ( ADVISORY_ID, PACKAGE_ID ) + CREATE UNIQUE INDEX RHQ_ADVISORY_UQ ON RHQ_ADVISORY ( ADVISORY ) </statement> - <statement targetDBVendor="postgresql"> - ALTER TABLE RHQ_ADVISORY_PACKAGE_MAP - ADD CONSTRAINT RHQ_ADV_PKG_MAP_KEY - PRIMARY KEY ( ADVISORY_ID, PACKAGE_ID ) - </statement> - <statement targetDBVendor="oracle"> - ALTER TABLE RHQ_ADVISORY_PACKAGE_MAP - ADD FOREIGN KEY ( ADVISORY_ID ) - REFERENCES RHQ_ADVISORY ( ID ) - </statement> - <statement targetDBVendor="postgresql"> - ALTER TABLE RHQ_ADVISORY_PACKAGE_MAP - ADD FOREIGN KEY ( ADVISORY_ID ) - REFERENCES RHQ_ADVISORY ( ID ) - </statement> - <statement targetDBVendor="oracle"> - ALTER TABLE RHQ_ADVISORY_PACKAGE_MAP - ADD FOREIGN KEY ( PACKAGE_ID ) - REFERENCES RHQ_PACKAGE ( ID ) - </statement> - <statement targetDBVendor="postgresql"> - ALTER TABLE RHQ_ADVISORY_PACKAGE_MAP - ADD FOREIGN KEY ( PACKAGE_ID ) - REFERENCES RHQ_PACKAGE ( ID ) + <statement> + CREATE INDEX RHQ_ADVISORY_UDATE_IDX ON RHQ_ADVISORY (UPDATE_DATE ) </statement> </schema-directSQL> + <schema-createSequence name="RHQ_ADVISORY_PACKAGE_SEQ" initial="10001" /> <schema-directSQL> <statement> - CREATE TABLE RHQ_ADVISORY_FILE_PKG_MAP ( ADVISORY_ID INTEGER ) + CREATE TABLE RHQ_ADVISORY_PACKAGE ( ID INTEGER PRIMARY KEY ) </statement> </schema-directSQL> - <schema-alterColumn table="RHQ_ADVISORY_FILE_PKG_MAP" column="ADVISORY_FILE_ID" nullable="false" /> - <schema-addColumn table="RHQ_ADVISORY_FILE_PKG_MAP" column="PACKAGE_ID" columnType="INTEGER" /> - <schema-alterColumn table="RHQ_ADVISORY_FILE_PKG_MAP" column="PACKAGE_ID" nullable="false" /> + <schema-alterColumn table="RHQ_ADVISORY_PACKAGE" column="ID" nullable="false" /> + <schema-addColumn table="RHQ_ADVISORY_PACKAGE" column="ADVISORY_ID" columnType="INTEGER" /> + <schema-alterColumn table="RHQ_ADVISORY_PACKAGE" column="ADVISORY_ID" nullable="false" /> + <schema-addColumn table="RHQ_ADVISORY_PACKAGE" column="PACKAGE_VERSION_ID" columnType="INTEGER" /> + <schema-alterColumn table="RHQ_ADVISORY_PACKAGE" column="PACKAGE_VERSION_ID" nullable="false" /> + <schema-addColumn table="RHQ_ADVISORY_PACKAGE" column="LAST_MODIFIED" columnType="LONG" /> + <schema-alterColumn table="RHQ_ADVISORY_PACKAGE" column="LAST_MODIFIED" nullable="false" /> <schema-directSQL> - <statement targetDBVendor="oracle"> - ALTER TABLE RHQ_ADVISORY_FILE_PKG_MAP - ADD CONSTRAINT RHQ_ADV_FILE_PKG_MAP_KEY - PRIMARY KEY ( ADVISORY_FILE_ID, PACKAGE_ID ) - </statement> - <statement targetDBVendor="postgresql"> - ALTER TABLE RHQ_ADVISORY_FILE_PKG_MAP - ADD CONSTRAINT RHQ_ADV_FILE_PKG_MAP_KEY - PRIMARY KEY ( ADVISORY_FILE_ID, PACKAGE_ID ) - </statement> - <statement targetDBVendor="oracle"> - ALTER TABLE RHQ_ADVISORY_FILE_PKG_MAP - ADD FOREIGN KEY ( ADVISORY_FILE_ID ) - REFERENCES RHQ_ADVISORY_FILE ( ID ) - </statement> - <statement targetDBVendor="postgresql"> - ALTER TABLE RHQ_ADVISORY_FILE_PKG_MAP - ADD FOREIGN KEY ( ADVISORY_FILE_ID ) - REFERENCES RHQ_ADVISORY_FILE ( ID ) - </statement> - <statement targetDBVendor="oracle"> - ALTER TABLE RHQ_ADVISORY_FILE_PKG_MAP - ADD FOREIGN KEY ( PACKAGE_ID ) - REFERENCES RHQ_PACKAGE ( ID ) + <statement> + CREATE UNIQUE INDEX RHQ_ADVISORY_PACKAGE_UQ ON RHQ_ADVISORY_PACKAGE ( ADVISORY_ID, PACKAGE_VERSION_ID ) </statement> - <statement targetDBVendor="postgresql"> - ALTER TABLE RHQ_ADVISORY_FILE_PKG_MAP - ADD FOREIGN KEY ( PACKAGE_ID ) - REFERENCES RHQ_PACKAGE ( ID ) + <statement> + ALTER TABLE RHQ_ADVISORY_PACKAGE + ADD CONSTRAINT RHQ_ADVISORY_FKEY + FOREIGN KEY ( ADVISORY_ID ) + REFERENCES RHQ_ADVISORY ( ID ) + </statement> + <statement> + ALTER TABLE RHQ_ADVISORY_PACKAGE + ADD CONSTRAINT RHQ_PACKAGE_VERSION_FKEY + FOREIGN KEY ( PACKAGE_VERSION_ID ) + REFERENCES RHQ_PACKAGE_VERSION ( ID ) </statement> </schema-directSQL> + <schema-createSequence name="RHQ_CVE_SEQ" initial="101" /> <schema-directSQL> <statement> - CREATE TABLE RHQ_CVE ( ID INTEGER ) + CREATE TABLE RHQ_CVE ( ID INTEGER PRIMARY KEY ) </statement> </schema-directSQL> <schema-alterColumn table="RHQ_CVE" column="ID" nullable="false" /> @@ -2558,84 +2301,60 @@ <schema-directSQL> <statement> - CREATE TABLE RHQ_ADVISORY_CVE ( ADVISORY_ID INTEGER ) + CREATE TABLE RHQ_ADVISORY_CVE ( ID INTEGER PRIMARY KEY ) </statement> </schema-directSQL> + <schema-alterColumn table="RHQ_ADVISORY_CVE" column="ID" nullable="false" /> + <schema-addColumn table="RHQ_ADVISORY_CVE" column="ADVISORY_ID" columnType="INTEGER" /> <schema-alterColumn table="RHQ_ADVISORY_CVE" column="ADVISORY_ID" nullable="false" /> <schema-addColumn table="RHQ_ADVISORY_CVE" column="CVE_ID" columnType="INTEGER" /> <schema-alterColumn table="RHQ_ADVISORY_CVE" column="CVE_ID" nullable="false" /> - <schema-addColumn table="RHQ_ADVISORY_CVE" column="CTIME" columnType="LONG" /> - <schema-alterColumn table="RHQ_ADVISORY_CVE" column="CTIME" nullable="false" /> <schema-addColumn table="RHQ_ADVISORY_CVE" column="LAST_MODIFIED" columnType="LONG" /> <schema-alterColumn table="RHQ_ADVISORY_CVE" column="LAST_MODIFIED" nullable="false" /> <schema-directSQL> - <statement targetDBVendor="oracle"> - ALTER TABLE RHQ_ADVISORY_CVE - ADD CONSTRAINT RHQ_ADV_CVE_MAP_KEY - PRIMARY KEY ( ADVISORY_ID, CVE_ID ) - </statement> - <statement targetDBVendor="postgresql"> - ALTER TABLE RHQ_ADVISORY_CVE - ADD CONSTRAINT RHQ_ADV_CVE_MAP_KEY - PRIMARY KEY ( ADVISORY_ID, CVE_ID ) - </statement> - <statement targetDBVendor="oracle"> - ALTER TABLE RHQ_ADVISORY_CVE - ADD FOREIGN KEY ( ADVISORY_ID ) - REFERENCES RHQ_ADVISORY ( ID ) + <statement> + CREATE UNIQUE INDEX RHQ_ADVISORY_CVE_UQ ON RHQ_ADVISORY_CVE ( ADVISORY_ID, CVE_ID ) </statement> - <statement targetDBVendor="postgresql"> + <statement> ALTER TABLE RHQ_ADVISORY_CVE - ADD FOREIGN KEY ( ADVISORY_ID ) + ADD CONSTRAINT RHQ_ADVISORY_FKEY + FOREIGN KEY ( ADVISORY_ID ) REFERENCES RHQ_ADVISORY ( ID ) </statement> - <statement targetDBVendor="oracle"> - ALTER TABLE RHQ_ADVISORY_CVE - ADD FOREIGN KEY ( CVE_ID ) - REFERENCES RHQ_CVE ( ID ) - </statement> - <statement targetDBVendor="postgresql"> - ALTER TABLE RHQ_ADVISORY_CVE - ADD FOREIGN KEY ( CVE_ID ) - REFERENCES RHQ_CVE ( ID ) - </statement> + <statement> + ALTER TABLE RHQ_ADVISORY_CVE + ADD CONSTRAINT RHQ_CVE_FKEY + FOREIGN KEY ( CVE_ID ) + REFERENCES RHQ_CVE ( ID ) + </statement> </schema-directSQL> + <schema-createSequence name="RHQ_ADVISORY_BUGLIST_SEQ" initial="10001" /> <schema-directSQL> <statement> - CREATE TABLE RHQ_ADVISORY_BUGLIST ( ADVISORY_ID INTEGER ) + CREATE TABLE RHQ_ADVISORY_BUGLIST ( ID INTEGER PRIMARY KEY) </statement> </schema-directSQL> + <schema-alterColumn table="RHQ_ADVISORY_BUGLIST" column="ID" nullable="false" /> + <schema-addColumn table="RHQ_ADVISORY_BUGLIST" column="ADVISORY_ID" columnType="INTEGER" /> <schema-alterColumn table="RHQ_ADVISORY_BUGLIST" column="ADVISORY_ID" nullable="false" /> - <schema-addColumn table="RHQ_ADVISORY_BUGLIST" column="BUG_ID" columnType="INTEGER" /> + <schema-addColumn table="RHQ_ADVISORY_BUGLIST" column="BUG_ID" PRECISION="256" columnType="VARCHAR2" /> <schema-alterColumn table="RHQ_ADVISORY_BUGLIST" column="BUG_ID" nullable="false" /> - <schema-addColumn table="RHQ_ADVISORY_BUGLIST" column="CTIME" columnType="LONG" /> - <schema-alterColumn table="RHQ_ADVISORY_BUGLIST" column="CTIME" nullable="false" /> <schema-addColumn table="RHQ_ADVISORY_BUGLIST" column="LAST_MODIFIED" columnType="LONG" /> <schema-alterColumn table="RHQ_ADVISORY_BUGLIST" column="LAST_MODIFIED" nullable="false" /> <schema-directSQL> - <statement targetDBVendor="oracle"> - ALTER TABLE RHQ_ADVISORY_BUGLIST - ADD CONSTRAINT RHQ_ADV_BUG_LIST_KEY - PRIMARY KEY ( ADVISORY_ID, BUG_ID ) - </statement> - <statement targetDBVendor="postgresql"> - ALTER TABLE RHQ_ADVISORY_BUGLIST - ADD CONSTRAINT RHQ_ADV_BUG_LIST_KEY - PRIMARY KEY ( ADVISORY_ID, BUG_ID ) - </statement> - <statement targetDBVendor="oracle"> - ALTER TABLE RHQ_ADVISORY_BUGLIST - ADD FOREIGN KEY ( ADVISORY_ID ) - REFERENCES RHQ_ADVISORY ( ID ) - </statement> - <statement targetDBVendor="postgresql"> - ALTER TABLE RHQ_ADVISORY_BUGLIST - ADD FOREIGN KEY ( ADVISORY_ID ) - REFERENCES RHQ_ADVISORY ( ID ) - </statement> + <statement> + CREATE UNIQUE INDEX RHQ_ADVISORY_BUGLIST_UQ ON RHQ_ADVISORY_BUGLIST ( ADVISORY_ID, BUG_ID ) + </statement> + <statement> + ALTER TABLE RHQ_ADVISORY_BUGLIST + ADD CONSTRAINT RHQ_ADVISORY_FKEY + FOREIGN KEY ( ADVISORY_ID ) + REFERENCES RHQ_ADVISORY ( ID ) + </statement> </schema-directSQL> + <schema-directSQL> <statement> CREATE TABLE RHQ_REPO_ADVISORY ( REPO_ID INTEGER ) @@ -2644,40 +2363,25 @@ <schema-alterColumn table="RHQ_REPO_ADVISORY" column="REPO_ID" nullable="false" /> <schema-addColumn table="RHQ_REPO_ADVISORY" column="ADVISORY_ID" columnType="INTEGER" /> <schema-alterColumn table="RHQ_REPO_ADVISORY" column="ADVISORY_ID" nullable="false" /> - <schema-addColumn table="RHQ_REPO_ADVISORY" column="CTIME" columnType="LONG" /> - <schema-alterColumn table="RHQ_REPO_ADVISORY" column="CTIME" nullable="false" /> <schema-addColumn table="RHQ_REPO_ADVISORY" column="LAST_MODIFIED" columnType="LONG" /> <schema-alterColumn table="RHQ_REPO_ADVISORY" column="LAST_MODIFIED" nullable="false" /> <schema-directSQL> - <statement targetDBVendor="oracle"> - ALTER TABLE RHQ_REPO_ADVISORY - ADD CONSTRAINT RHQ_REPO_ADV_MAP_KEY - PRIMARY KEY ( REPO_ID, ADVISORY_ID ) - </statement> - <statement targetDBVendor="postgresql"> + <statement> ALTER TABLE RHQ_REPO_ADVISORY ADD CONSTRAINT RHQ_REPO_ADV_MAP_KEY PRIMARY KEY ( REPO_ID, ADVISORY_ID ) </statement> - <statement targetDBVendor="oracle"> - ALTER TABLE RHQ_REPO_ADVISORY - ADD FOREIGN KEY ( ADVISORY_ID ) - REFERENCES RHQ_ADVISORY ( ID ) - </statement> - <statement targetDBVendor="postgresql"> - ALTER TABLE RHQ_REPO_ADVISORY - ADD FOREIGN KEY ( ADVISORY_ID ) - REFERENCES RHQ_ADVISORY ( ID ) - </statement> - <statement targetDBVendor="oracle"> + <statement> ALTER TABLE RHQ_REPO_ADVISORY - ADD FOREIGN KEY ( REPO_ID ) + ADD CONSTRAINT RHQ_REPO_FKEY + FOREIGN KEY ( REPO_ID ) REFERENCES RHQ_REPO ( ID ) </statement> - <statement targetDBVendor="postgresql"> + <statement> ALTER TABLE RHQ_REPO_ADVISORY - ADD FOREIGN KEY ( REPO_ID ) - REFERENCES RHQ_REPO ( ID ) + ADD CONSTRAINT RHQ_ADVISORY_FKEY + FOREIGN KEY ( ADVISORY_ID ) + REFERENCES RHQ_ADVISORY ( ID ) </statement> </schema-directSQL> </schemaSpec> @@ -2710,54 +2414,6 @@ </schema-directSQL> </schemaSpec> - <schemaSpec version="2.74"> - <schema-createSequence name="RHQ_ADVISORY_ID_SEQ" initial="10001" /> - <schema-createSequence name="RHQ_ADVISORY_CVE_ID_SEQ" initial="10001" /> - <schema-directSQL> - <statement> - ALTER TABLE RHQ_ADVISORY_CVE DROP CONSTRAINT RHQ_ADV_CVE_MAP_KEY - </statement> - </schema-directSQL> - <schema-addColumn table="RHQ_ADVISORY_CVE" column="ID" columnType="INTEGER" /> - <schema-alterColumn table="RHQ_ADVISORY_CVE" column="ID" nullable="false" /> - <schema-directSQL> - <statement> - ALTER TABLE RHQ_ADVISORY_CVE ALTER COLUMN ID SET DEFAULT NEXTVAL('RHQ_ADVISORY_CVE_SEQ') - </statement> - </schema-directSQL> - <schema-createSequence name="RHQ_ADVISORY_BUGLIST_ID_SEQ" initial="10001" /> - <schema-directSQL> - <statement> - ALTER TABLE RHQ_ADVISORY_BUGLIST DROP CONSTRAINT RHQ_ADV_BUG_LIST_KEY - </statement> - </schema-directSQL> - <schema-addColumn table="RHQ_ADVISORY_BUGLIST" column="ID" columnType="INTEGER" /> - <schema-alterColumn table="RHQ_ADVISORY_BUGLIST" column="ID" nullable="false" /> - <schema-directSQL> - <statement> - ALTER TABLE RHQ_ADVISORY_BUGLIST ALTER COLUMN ID SET DEFAULT NEXTVAL('RHQ_ADVISORY_BUG_SEQ') - </statement> - </schema-directSQL> - <schema-directSQL> - <statement> - ALTER TABLE RHQ_ADVISORY_PACKAGE_MAP RENAME TO RHQ_ADVISORY_PACKAGE - </statement> - </schema-directSQL> - <schema-createSequence name="RHQ_ADVISORY_PACKAGE_ID_SEQ" initial="10001" /> - <schema-directSQL> - <statement> - ALTER TABLE RHQ_ADVISORY_PACKAGE DROP CONSTRAINT RHQ_ADV_PKG_MAP_KEY - </statement> - </schema-directSQL> - <schema-addColumn table="RHQ_ADVISORY_PACKAGE" column="ID" columnType="INTEGER" /> - <schema-alterColumn table="RHQ_ADVISORY_PACKAGE" column="ID" nullable="false" /> - <schema-directSQL> - <statement> - ALTER TABLE RHQ_ADVISORY_PACKAGE ALTER COLUMN ID SET DEFAULT NEXTVAL('RHQ_ADVISORY_PKG_SEQ') - </statement> - </schema-directSQL> - </schemaSpec> - <schemaSpec version="2.75"> <schema-addColumn table="RHQ_REPO" column="SYNC_SCHEDULE" columnType="VARCHAR2" precision="64" /> </schemaSpec> @@ -3211,6 +2867,32 @@ <schema-addColumn table="RHQ_BUNDLE_VERSION" column="DESCRIPTION" columnType="VARCHAR2" precision="500" /> </schemaSpec> + <schemaSpec version="2.78.3"> + <schema-directSQL> + <statement desc="Creating RHQ_BUNDLE_TYPE unique constraint"> + CREATE UNIQUE INDEX RHQ_BUNDLE_TYPE_UNIQUE ON RHQ_BUNDLE_TYPE (name) + </statement> + </schema-directSQL> + + <schema-directSQL> + <statement desc="Creating RHQ_BUNDLE unique constraint"> + CREATE UNIQUE INDEX RHQ_BUNDLE_UNIQUE ON RHQ_BUNDLE (bundle_type_id, name) + </statement> + </schema-directSQL> + + <schema-directSQL> + <statement desc="Creating RHQ_BUNDLE_VERSION unique constraint"> + CREATE UNIQUE INDEX RHQ_BUNDLE_VERSION_UNIQUE ON RHQ_BUNDLE_VERSION (bundle_id, name, version) + </statement> + </schema-directSQL> + + <schema-directSQL> + <statement desc="Creating RHQ_BUNDLE_DEPLOY_DEF unique constraint"> + CREATE UNIQUE INDEX RHQ_BUNDLE_DEPLOY_DEF_UNIQUE ON RHQ_BUNDLE_DEPLOY_DEF (bundle_version_id, name) + </statement> + </schema-directSQL> + </schemaSpec> + <schemaSpec version="2.79"> <schema-directSQL> <statement desc="Normalizing resource group descriptions"> diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/Advisory.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/Advisory.java index 32d2518..205d1cc 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/Advisory.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/Advisory.java @@ -89,10 +89,10 @@ public class Advisory implements Serializable { @Column(name = "UPDATE_DATE", nullable = true) private long update_date; - @Column(name = "CTIME", nullable = true) + @Column(name = "CTIME", nullable = false) private long ctime; - @Column(name = "LAST_MODIFIED", nullable = true) + @Column(name = "LAST_MODIFIED", nullable = false) private long lastModifiedDate; @OneToMany(mappedBy = "advisory", fetch = FetchType.EAGER, cascade = CascadeType.ALL) @@ -264,9 +264,15 @@ public class Advisory implements Serializable { return true; } + public long getCtime() { + return ctime; + } + @PrePersist void onPersist() { - this.setLastModifiedDate(System.currentTimeMillis()); + long now = System.currentTimeMillis(); + this.ctime = now; + this.setLastModifiedDate(now); } @PreUpdate diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryPackage.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryPackage.java index 17bd2d8..2185c65 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryPackage.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryPackage.java @@ -79,7 +79,7 @@ public class AdvisoryPackage implements Serializable { @JoinColumn(name = "PACKAGE_VERSION_ID", referencedColumnName = "ID", nullable = false) private PackageVersion pkg; - @Column(name = "LAST_MODIFIED", nullable = true) + @Column(name = "LAST_MODIFIED", nullable = false) private long lastModifiedDate; protected AdvisoryPackage() { commit b2cc4bca855a6a34e22f4b64ceea0f61638a4608 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Mar 17 14:53:04 2010 -0400 LT diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/js/timeline/ajax/api/scripts/units.js b/modules/enterprise/gui/portal-war/src/main/webapp/js/timeline/ajax/api/scripts/units.js index 54f2a5b..7bdcd0d 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/js/timeline/ajax/api/scripts/units.js +++ b/modules/enterprise/gui/portal-war/src/main/webapp/js/timeline/ajax/api/scripts/units.js @@ -1,64 +1,64 @@ -/*================================================== - * Default Unit - *================================================== - */ - -SimileAjax.NativeDateUnit = new Object(); - -SimileAjax.NativeDateUnit.makeDefaultValue = function() { - return new Date(); -}; - -SimileAjax.NativeDateUnit.cloneValue = function(v) { - return new Date(v.getTime()); -}; - -SimileAjax.NativeDateUnit.getParser = function(format) { - if (typeof format == "string") { - format = format.toLowerCase(); - } - return (format == "iso8601" || format == "iso 8601") ? - SimileAjax.DateTime.parseIso8601DateTime : - SimileAjax.DateTime.parseGregorianDateTime; -}; - -SimileAjax.NativeDateUnit.parseFromObject = function(o) { - return SimileAjax.DateTime.parseGregorianDateTime(o); -}; - -SimileAjax.NativeDateUnit.toNumber = function(v) { - return v.getTime(); -}; - -SimileAjax.NativeDateUnit.fromNumber = function(n) { - return new Date(n); -}; - -SimileAjax.NativeDateUnit.compare = function(v1, v2) { - var n1, n2; - if (typeof v1 == "object") { - n1 = v1.getTime(); - } else { - n1 = Number(v1); - } - if (typeof v2 == "object") { - n2 = v2.getTime(); - } else { - n2 = Number(v2); - } - - return n1 - n2; -}; - -SimileAjax.NativeDateUnit.earlier = function(v1, v2) { - return SimileAjax.NativeDateUnit.compare(v1, v2) < 0 ? v1 : v2; -}; - -SimileAjax.NativeDateUnit.later = function(v1, v2) { - return SimileAjax.NativeDateUnit.compare(v1, v2) > 0 ? v1 : v2; -}; - -SimileAjax.NativeDateUnit.change = function(v, n) { - return new Date(v.getTime() + n); -}; - +/*================================================== + * Default Unit + *================================================== + */ + +SimileAjax.NativeDateUnit = new Object(); + +SimileAjax.NativeDateUnit.makeDefaultValue = function() { + return new Date(); +}; + +SimileAjax.NativeDateUnit.cloneValue = function(v) { + return new Date(v.getTime()); +}; + +SimileAjax.NativeDateUnit.getParser = function(format) { + if (typeof format == "string") { + format = format.toLowerCase(); + } + return (format == "iso8601" || format == "iso 8601") ? + SimileAjax.DateTime.parseIso8601DateTime : + SimileAjax.DateTime.parseGregorianDateTime; +}; + +SimileAjax.NativeDateUnit.parseFromObject = function(o) { + return SimileAjax.DateTime.parseGregorianDateTime(o); +}; + +SimileAjax.NativeDateUnit.toNumber = function(v) { + return v.getTime(); +}; + +SimileAjax.NativeDateUnit.fromNumber = function(n) { + return new Date(n); +}; + +SimileAjax.NativeDateUnit.compare = function(v1, v2) { + var n1, n2; + if (typeof v1 == "object") { + n1 = v1.getTime(); + } else { + n1 = Number(v1); + } + if (typeof v2 == "object") { + n2 = v2.getTime(); + } else { + n2 = Number(v2); + } + + return n1 - n2; +}; + +SimileAjax.NativeDateUnit.earlier = function(v1, v2) { + return SimileAjax.NativeDateUnit.compare(v1, v2) < 0 ? v1 : v2; +}; + +SimileAjax.NativeDateUnit.later = function(v1, v2) { + return SimileAjax.NativeDateUnit.compare(v1, v2) > 0 ? v1 : v2; +}; + +SimileAjax.NativeDateUnit.change = function(v, n) { + return new Date(v.getTime() + n); +}; + commit db755e175a0b6db356ca2404fce0e5ae40c1dc33 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Mar 16 11:33:40 2010 -0400 LT diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/js/timeline/ajax/api/scripts/units.js b/modules/enterprise/gui/portal-war/src/main/webapp/js/timeline/ajax/api/scripts/units.js index 54f2a5b..7bdcd0d 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/js/timeline/ajax/api/scripts/units.js +++ b/modules/enterprise/gui/portal-war/src/main/webapp/js/timeline/ajax/api/scripts/units.js @@ -1,64 +1,64 @@ -/*================================================== - * Default Unit - *================================================== - */ - -SimileAjax.NativeDateUnit = new Object(); - -SimileAjax.NativeDateUnit.makeDefaultValue = function() { - return new Date(); -}; - -SimileAjax.NativeDateUnit.cloneValue = function(v) { - return new Date(v.getTime()); -}; - -SimileAjax.NativeDateUnit.getParser = function(format) { - if (typeof format == "string") { - format = format.toLowerCase(); - } - return (format == "iso8601" || format == "iso 8601") ? - SimileAjax.DateTime.parseIso8601DateTime : - SimileAjax.DateTime.parseGregorianDateTime; -}; - -SimileAjax.NativeDateUnit.parseFromObject = function(o) { - return SimileAjax.DateTime.parseGregorianDateTime(o); -}; - -SimileAjax.NativeDateUnit.toNumber = function(v) { - return v.getTime(); -}; - -SimileAjax.NativeDateUnit.fromNumber = function(n) { - return new Date(n); -}; - -SimileAjax.NativeDateUnit.compare = function(v1, v2) { - var n1, n2; - if (typeof v1 == "object") { - n1 = v1.getTime(); - } else { - n1 = Number(v1); - } - if (typeof v2 == "object") { - n2 = v2.getTime(); - } else { - n2 = Number(v2); - } - - return n1 - n2; -}; - -SimileAjax.NativeDateUnit.earlier = function(v1, v2) { - return SimileAjax.NativeDateUnit.compare(v1, v2) < 0 ? v1 : v2; -}; - -SimileAjax.NativeDateUnit.later = function(v1, v2) { - return SimileAjax.NativeDateUnit.compare(v1, v2) > 0 ? v1 : v2; -}; - -SimileAjax.NativeDateUnit.change = function(v, n) { - return new Date(v.getTime() + n); -}; - +/*================================================== + * Default Unit + *================================================== + */ + +SimileAjax.NativeDateUnit = new Object(); + +SimileAjax.NativeDateUnit.makeDefaultValue = function() { + return new Date(); +}; + +SimileAjax.NativeDateUnit.cloneValue = function(v) { + return new Date(v.getTime()); +}; + +SimileAjax.NativeDateUnit.getParser = function(format) { + if (typeof format == "string") { + format = format.toLowerCase(); + } + return (format == "iso8601" || format == "iso 8601") ? + SimileAjax.DateTime.parseIso8601DateTime : + SimileAjax.DateTime.parseGregorianDateTime; +}; + +SimileAjax.NativeDateUnit.parseFromObject = function(o) { + return SimileAjax.DateTime.parseGregorianDateTime(o); +}; + +SimileAjax.NativeDateUnit.toNumber = function(v) { + return v.getTime(); +}; + +SimileAjax.NativeDateUnit.fromNumber = function(n) { + return new Date(n); +}; + +SimileAjax.NativeDateUnit.compare = function(v1, v2) { + var n1, n2; + if (typeof v1 == "object") { + n1 = v1.getTime(); + } else { + n1 = Number(v1); + } + if (typeof v2 == "object") { + n2 = v2.getTime(); + } else { + n2 = Number(v2); + } + + return n1 - n2; +}; + +SimileAjax.NativeDateUnit.earlier = function(v1, v2) { + return SimileAjax.NativeDateUnit.compare(v1, v2) < 0 ? v1 : v2; +}; + +SimileAjax.NativeDateUnit.later = function(v1, v2) { + return SimileAjax.NativeDateUnit.compare(v1, v2) > 0 ? v1 : v2; +}; + +SimileAjax.NativeDateUnit.change = function(v, n) { + return new Date(v.getTime() + n); +}; + commit 450dea0ece01d8e2f6c3602a0c7512e695ced5c8 Merge: 44ca5dd... 6278e70... Author: Ian P. Springer <ips(a)jetengine.(none)> Date: Tue Mar 2 08:49:43 2010 -0500 Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq commit 44ca5dd63fabe53654f1db6b17dfbbefdde1a8cb Author: Ian P. Springer <ips(a)jetengine.(none)> Date: Fri Feb 26 12:28:45 2010 -0500 jmx plugin will no longer log warning if SIGAR is not available; Agent, rather than PC, will log this warning once at startup, and only if the user has not explicitly disabled native support (https://bugzilla.redhat.com/show_bug.cgi?id=568760) (cherry picked from commit ab1816d9ecc4cc6e81472538fe30ae767ea0de39) diff --git a/modules/core/native-system/src/main/java/org/rhq/core/system/SystemInfoFactory.java b/modules/core/native-system/src/main/java/org/rhq/core/system/SystemInfoFactory.java index 27a1375..b2bd37f 100644 --- a/modules/core/native-system/src/main/java/org/rhq/core/system/SystemInfoFactory.java +++ b/modules/core/native-system/src/main/java/org/rhq/core/system/SystemInfoFactory.java @@ -29,7 +29,6 @@ import java.lang.reflect.Method; import java.net.URL; import java.util.HashMap; import java.util.Map; -import java.util.TreeMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -50,6 +49,7 @@ public class SystemInfoFactory { private static final String NATIVE_LIBRARY_CLASS_NAME = "org.hyperic.sigar.Sigar"; private static boolean nativeLibraryLoadable; + private static Throwable nativeLibraryLoadThrowable; private static boolean disabled; private static boolean initialized = false; @@ -78,10 +78,11 @@ public class SystemInfoFactory { nativeLibraryLoadable = true; } catch (Throwable t) { - nativeLibraryLoadable = false; // can't load the native libs if we don't even have the JNI classes - LOG - .warn("System info API not accessible on this platform (native shared library not found in java.library.path)."); - LOG.trace("Stack trace...", t); + // We don't have the JNI classes (sigar.jar) and/or the native shared library (e.g. libsigar-amd64-linux.so). + // This might be expected (e.g. the admin console WAR (Embedded Jopr) does not include SIGAR), so don't log + // anything, but store the Throwable, so callers can log the cause when appropriate. + nativeLibraryLoadable = false; + nativeLibraryLoadThrowable = t; } disabled = !nativeLibraryLoadable; // automatically disable native system info iff the native library is not loadable @@ -170,6 +171,17 @@ public class SystemInfoFactory { } /** + * Returns a Throwable describing why the native library failed to initialize, or null if the native library + * initialized successfully + * + * @return a Throwable describing why the native library failed to initialize, or null if the native library + * initialized successfully + */ + public static Throwable getNativeLibraryLoadThrowable() { + return nativeLibraryLoadThrowable; + } + + /** * This returns <code>true</code> iff the native libraries have actually been initialized. This will return <code> * false</code> if this factory has been {@link #disableNativeSystemInfo() disabled} from the start (i.e. prior to * the first call to {@link #createSystemInfo()} or {@link #getNativeSystemInfoVersion()}). It will also return @@ -308,7 +320,7 @@ public class SystemInfoFactory { private static String findNativeLibrariesRootDirectory() throws Exception { String rootDir = null; File jniLocation = null; - URL jarLocation = null; + URL jarLocation; if (isNativeSystemInfoAvailable()) { rootDir = System.getProperty("rhq.native-libraries-root-directory"); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index 94513d0..c7e03a1 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -359,6 +359,11 @@ public class AgentMain { private final AgentRestartCounter m_agentRestartCounter = new AgentRestartCounter(); /** + * The -t command line option was specified. + */ + private boolean m_disableNativeSystem; + + /** * The main method that starts the whole thing. * * @param args @@ -2056,9 +2061,20 @@ public class AgentMain { * disabled no matter what this method decides to do. */ private void prepareNativeSystem() { - if (m_configuration.isNativeSystemDisabled() && !SystemInfoFactory.isNativeSystemInfoDisabled()) { - SystemInfoFactory.disableNativeSystemInfo(); - LOG.info(AgentI18NResourceKeys.NATIVE_SYSTEM_DISABLED); + if (m_disableNativeSystem || m_configuration.isNativeSystemDisabled()) { + if (!SystemInfoFactory.isNativeSystemInfoDisabled()) { + SystemInfoFactory.disableNativeSystemInfo(); + LOG.info(AgentI18NResourceKeys.NATIVE_SYSTEM_DISABLED); + } + } else { + if (!SystemInfoFactory.isNativeSystemInfoAvailable()) { + Throwable t = SystemInfoFactory.getNativeLibraryLoadThrowable(); + if (LOG.isDebugEnabled()) { + LOG.debug(AgentI18NResourceKeys.NATIVE_SYSINFO_UNAVAILABLE_DEBUG, t); + } else { + LOG.warn(AgentI18NResourceKeys.NATIVE_SYSINFO_UNAVAILABLE); + } + } } return; @@ -2814,8 +2830,7 @@ public class AgentMain { } case 't': { - SystemInfoFactory.disableNativeSystemInfo(); - LOG.info(AgentI18NResourceKeys.NATIVE_SYSTEM_DISABLED); + m_disableNativeSystem = true; } } } diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java index e098b2b..08d4311 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java @@ -519,6 +519,15 @@ public interface AgentI18NResourceKeys { @I18NMessage("Neither server auto-detection nor polling is enabled - the client will be allowed to start sending commands immediately, but when the server is offline, be prepared for alot of errors to be logged") String NO_AUTO_DETECT = "AgentMain.no-auto-detect"; + @I18NMessage("Native system info is enabled, but the system info API is not accessible on this platform " + + "(sigar.jar not found in classpath or SIGAR shared library not found in shared library path). " + + "Enable DEBUG logging for more details.") + String NATIVE_SYSINFO_UNAVAILABLE = "AgentMain.native-sysinfo-unavailable"; + + @I18NMessage("Native system info is enabled, but the system info API is not accessible on this platform " + + "(sigar.jar not found in classpath or SIGAR shared library not found in shared library path).") + String NATIVE_SYSINFO_UNAVAILABLE_DEBUG = "AgentMain.native-sysinfo-unavailable-debug"; + @I18NMessage("The agent encountered an error during startup and must abort") String STARTUP_ERROR = "AgentMain.startup-error"; diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java index 84ae286..ce8631a 100644 --- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2010 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -37,6 +37,7 @@ import org.apache.commons.logging.LogFactory; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; +import org.rhq.core.pluginapi.inventory.ProcessScanResult; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.core.pluginapi.inventory.ManualAddFacet; @@ -66,8 +67,8 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual public static final String ADDITIONAL_CLASSPATH_ENTRIES = "additionalClassPathEntries"; - /* Ignore certain processes that are managed by their own plugin. For example The Tomcat plugin will - * handle tomcat processes configured for JMX management. + /* Ignore certain processes that are managed by their own plugin. For example, the Tomcat plugin will + * handle Tomcat processes configured for JMX management. */ private static final String[] PROCESS_FILTERS; @@ -79,7 +80,7 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual processFilters = env.split(","); } } catch (Throwable t) { - log.error("Can't determine process filters, using default. Cause: " + t); + log.error("Can't determine process filters; using default... Cause: " + t); } finally { PROCESS_FILTERS = processFilters; } @@ -135,10 +136,11 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual // } try { - List<ProcessInfo> processes = context.getSystemInformation().getProcesses("process|basename|match=^java.*"); + List<ProcessScanResult> processes = context.getAutoDiscoveredProcesses(); - for (ProcessInfo process : processes) { - DiscoveredResourceDetails details = discoverProcess(context, process); + for (ProcessScanResult process : processes) { + ProcessInfo processInfo = process.getProcessInfo(); + DiscoveredResourceDetails details = discoverProcess(context, processInfo); if (details != null) { boolean isFiltered = false; for (String filter : PROCESS_FILTERS) { @@ -153,10 +155,11 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual } } } catch (Exception e) { - if (log.isDebugEnabled()) - log.debug("Unable to complete base jmx server discovery.", e); - else - log.warn("Unable to complete base jmx server discovery (enable DEBUG for stack): " + e); + if (log.isDebugEnabled()) { + log.debug("Unable to complete base JMX server discovery.", e); + } else { + log.warn("Unable to complete base JMX server discovery (enable DEBUG for stack): " + e); + } } return found; @@ -228,12 +231,16 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual String arg = process.getCommandLine()[i]; if (!arg.startsWith("-")) { - if (arg.length() < 200) { // don't use it if its really long, that's an ugly resource name + if (arg.length() <= 200) { name = arg; - break; + } else { + // Truncate it if it's really long for a more palatable Resource name. + name = arg.substring(arg.length() - 200); } + break; } else if (arg.equals("-cp") || arg.equals("-classpath")) { - i++; // skip the next arg, its the classpath, we don't want that as the name + // Skip the next arg - it's the classpath, and we don't want that as the name. + i++; } } diff --git a/modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml index bcec166..a8131c8 100644 --- a/modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml @@ -69,6 +69,8 @@ </plugin-configuration> + <process-scan name="java" query="process|basename|match=^java.*"/> + <help> <![CDATA[ <p>In order to monitor your Java applications via JMX, you need to expose their MBeans to remote JMX clients.

1 0

[rhq] Branch 'gwt' - modules/core modules/enterprise modules/plugins
by mazz 22 Mar '10

22 Mar '10

modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Property.java | 125 ++++---- modules/core/domain/src/main/java/org/rhq/core/domain/configuration/RawConfiguration.java | 38 -- modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ConfigurationTest.java | 145 ++++------ modules/core/domain/src/test/java/org/rhq/core/domain/configuration/RawConfigurationIntegrationTest.java | 15 - modules/core/domain/src/test/java/org/rhq/core/domain/configuration/RawConfigurationTest.java | 59 ++-- modules/core/domain/src/test/java/org/rhq/core/domain/configuration/test/ConfigurationTest.java | 25 - modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceSyncResultsTest.java | 22 - modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceTest.java | 51 ++- modules/core/domain/src/test/java/org/rhq/core/domain/content/test/PackageVersionContentSourceTest.java | 4 modules/core/domain/src/test/java/org/rhq/core/domain/content/test/RepoGroupTest.java | 53 ++- modules/core/domain/src/test/java/org/rhq/core/domain/measurement/test/CompositeLoadingTest.java | 48 +-- modules/core/domain/src/test/java/org/rhq/core/domain/measurement/test/MeasurementTest.java | 3 modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java | 47 +-- modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ProblemResourceTest.java | 3 modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceErrorTest.java | 46 +-- modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceGroupTest.java | 49 +-- modules/core/domain/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java | 78 ++--- modules/core/plugin-container/src/main/java/org/rhq/core/pc/bundle/BundleManager.java | 6 modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationManager.java | 13 modules/core/plugin-container/src/test/java/org/rhq/core/pc/configuration/ConfigManagementTest.java | 41 +- modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java | 108 +++++-- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ExistingResourceConfigurationUIBean.java | 46 +-- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java | 10 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 3 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerBeanTest.java | 5 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java | 15 - modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanTest.java | 21 - modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentSourceManagerBeanTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanEligiblePackagesTest.java | 3 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/test/DiscoveryBossBeanTest.java | 14 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/event/test/EventManagerTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java | 3 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java | 4 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementViewManagerTest.java | 3 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/RecursiveResourceGroupTest.java | 3 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateEventsSubsystemTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateMeasurementSubsystemTest.java | 3 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java | 3 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java | 4 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/util/ResourceTreeHelper.java | 3 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java | 3 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApachePluginTest.java | 4 modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/helper/AugeasRawConfigHelper.java | 5 modules/plugins/cobbler/src/main/java/org/rhq/plugins/cobbler/CobblerComponent.java | 9 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java | 3 modules/plugins/nss/src/main/java/org/rhq/plugin/nss/NameServiceSwitchComponent.java | 5 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatGroupComponent.java | 16 - modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserComponent.java | 24 + modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java | 3 51 files changed, 678 insertions(+), 526 deletions(-) New commits: commit c98e7cfd64d7a906607b35382167beb387576552 Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Mar 22 01:43:35 2010 -0400 all domain tests now pass and all but 3 server/jar tests pass. mainly fixed the requirement that you now have to explicitly set the uuid before persisting resource entities (tests need to do this now). diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Property.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Property.java index 0cb4a5d..d995571 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Property.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Property.java @@ -22,8 +22,7 @@ */ package org.rhq.core.domain.configuration; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +import java.io.Serializable; import javax.persistence.Column; import javax.persistence.DiscriminatorColumn; @@ -45,7 +44,8 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlTransient; -import java.io.Serializable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The abstract base class for all {@link Configuration} value property types. A property is associated with a specific @@ -247,14 +247,11 @@ public class Property implements Serializable, DeepCopyable<Property> { * @param t throwable whose message and stack trace will make up the error message (may be <code>null</code>) */ public void setErrorMessageFromThrowable(Throwable t) { - /* TODO: GWT if (t != null) { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - t.printStackTrace(new PrintStream(baos)); - setErrorMessage(baos.toString()); + setErrorMessage(t.toString()); // TODO: would like this to be the full stack, but GWT doesn't make it easy so just set this to the throwable msg } else { setErrorMessage(null); - }*/ + } } @Override @@ -284,80 +281,76 @@ public class Property implements Serializable, DeepCopyable<Property> { return null; } - /* // It's not clear to me why this class implements Externalizable. It seems to write out every field - // using standard serialization. Also, it's sub-classes seem to write out every field. To be safe I'm leaving - // it as is and also applying the new strategy logic, in case there are (future) differences between agent and - // remoteAPI serialization. - public void writeExternal(ObjectOutput out) throws IOException { - ExternalizableStrategy.Subsystem strategy = ExternalizableStrategy.getStrategy(); - out.writeChar(strategy.id()); - - if (ExternalizableStrategy.Subsystem.REMOTEAPI == strategy) { - writeExternalRemote(out); - } else if (ExternalizableStrategy.Subsystem.REFLECTIVE_SERIALIZATION == strategy) { - EntitySerializer.writeExternalRemote(this, out); - } else { - writeExternalAgent(out); - } - } - - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - char c = in.readChar(); - if (ExternalizableStrategy.Subsystem.REMOTEAPI.id() == c) { - readExternalRemote(in); - } else if (ExternalizableStrategy.Subsystem.REFLECTIVE_SERIALIZATION.id() == c) { - EntitySerializer.readExternalRemote(this, in); - } else { - readExternalAgent(in); - } - } + /* + // It's not clear to me why this class implements Externalizable. It seems to write out every field + // using standard serialization. Also, it's sub-classes seem to write out every field. To be safe I'm leaving + // it as is and also applying the new strategy logic, in case there are (future) differences between agent and + // remoteAPI serialization. + public void writeExternal(ObjectOutput out) throws IOException { + ExternalizableStrategy.Subsystem strategy = ExternalizableStrategy.getStrategy(); + out.writeChar(strategy.id()); + + if (ExternalizableStrategy.Subsystem.REMOTEAPI == strategy) { + writeExternalRemote(out); + } else if (ExternalizableStrategy.Subsystem.REFLECTIVE_SERIALIZATION == strategy) { + EntitySerializer.writeExternalRemote(this, out); + } else { + writeExternalAgent(out); + } + } + + public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + char c = in.readChar(); + if (ExternalizableStrategy.Subsystem.REMOTEAPI.id() == c) { + readExternalRemote(in); + } else if (ExternalizableStrategy.Subsystem.REFLECTIVE_SERIALIZATION.id() == c) { + EntitySerializer.readExternalRemote(this, in); + } else { + readExternalAgent(in); + } + } - *//** - * @see java.io.Externalizable#writeExternal(java.io.ObjectOutput) - *//* public void writeExternalAgent(ObjectOutput out) throws IOException { - out.writeInt(id); - out.writeObject(configuration); - out.writeUTF(name); - out.writeObject(parentList); - out.writeObject(parentMap); - out.writeObject(errorMessage); + out.writeInt(id); + out.writeObject(configuration); + out.writeUTF(name); + out.writeObject(parentList); + out.writeObject(parentMap); + out.writeObject(errorMessage); } - *//** - * @see java.io.Externalizable#readExternal(java.io.ObjectInput) - *//* public void readExternalAgent(ObjectInput in) throws IOException, ClassNotFoundException { - id = in.readInt(); - configuration = (Configuration) in.readObject(); - name = in.readUTF(); - parentList = (PropertyList) in.readObject(); - parentMap = (PropertyMap) in.readObject(); - errorMessage = (String) in.readObject(); + id = in.readInt(); + configuration = (Configuration) in.readObject(); + name = in.readUTF(); + parentList = (PropertyList) in.readObject(); + parentMap = (PropertyMap) in.readObject(); + errorMessage = (String) in.readObject(); } // It is assumed that the object is clean of Hibernate proxies (i.e. HibernateDetachUtility has been run if necessary) public void writeExternalRemote(ObjectOutput out) throws IOException { - out.writeInt(id); - out.writeObject(configuration); - out.writeUTF(name); - out.writeObject(errorMessage); - out.writeObject(parentList); - out.writeObject(parentMap); + out.writeInt(id); + out.writeObject(configuration); + out.writeUTF(name); + out.writeObject(errorMessage); + out.writeObject(parentList); + out.writeObject(parentMap); } public void readExternalRemote(ObjectInput in) throws IOException, ClassNotFoundException { - id = in.readInt(); - configuration = (Configuration) in.readObject(); - name = in.readUTF(); - errorMessage = (String) in.readObject(); - parentList = (PropertyList) in.readObject(); - parentMap = (PropertyMap) in.readObject(); + id = in.readInt(); + configuration = (Configuration) in.readObject(); + name = in.readUTF(); + errorMessage = (String) in.readObject(); + parentList = (PropertyList) in.readObject(); + parentMap = (PropertyMap) in.readObject(); }*/ @Override public String toString() { - StringBuilder str = new StringBuilder(this.getClass().getName().substring(this.getClass().getName().lastIndexOf(".")+1)); + StringBuilder str = new StringBuilder(this.getClass().getName().substring( + this.getClass().getName().lastIndexOf(".") + 1)); str.append("[id=").append(getId()); str.append(", name=").append(getName()); appendToStringInternals(str); // ask subclasses if they have anything else to add diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/RawConfiguration.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/RawConfiguration.java index 42b2a88..9a16d69 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/RawConfiguration.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/RawConfiguration.java @@ -23,9 +23,8 @@ package org.rhq.core.domain.configuration; -import org.rhq.core.util.MessageDigestGenerator; +import java.io.Serializable; -import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -40,8 +39,6 @@ import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; -import java.io.Serializable; - /** * Resources support structured configuration as well as raw configuration which is represented by this class. A raw * configuration is typically in the form of a file on the file system. This could be httpd.conf in the case of apache. @@ -86,9 +83,8 @@ public class RawConfiguration implements Serializable, DeepCopyable<RawConfigura @JoinColumn(name = "CONFIG_ID", nullable = false) private Configuration configuration; - public RawConfiguration() { - + } /** @@ -98,7 +94,7 @@ public class RawConfiguration implements Serializable, DeepCopyable<RawConfigura */ @Transient public String errorMessage; - + /** @return The database identifier or primary key */ public int getId() { return id; @@ -128,10 +124,12 @@ public class RawConfiguration implements Serializable, DeepCopyable<RawConfigura * updated as well. * * @param contents The new contents + * @param sha256 the digest string representing the sha256 hash of the given contents */ - public void setContents(String contents) { + public void setContents(String contents, String sha256) { this.contents = contents; this.errorMessage = null; + setSha256(sha256); } /** @@ -146,7 +144,6 @@ public class RawConfiguration implements Serializable, DeepCopyable<RawConfigura this.sha256 = digestString; } - /** @return A timestamp of when this object was created */ public long getCtime() { return ctime; @@ -167,7 +164,6 @@ public class RawConfiguration implements Serializable, DeepCopyable<RawConfigura this.configuration = configuration; } - @PrePersist void onPersist() { mtime = System.currentTimeMillis(); @@ -208,7 +204,7 @@ public class RawConfiguration implements Serializable, DeepCopyable<RawConfigura if (this.path == null && that.path == null) { return true; } - if ((this.path !=null && that.path != null) && this.path.equals(that.path)) { + if ((this.path != null && that.path != null) && this.path.equals(that.path)) { return true; } } @@ -241,14 +237,10 @@ public class RawConfiguration implements Serializable, DeepCopyable<RawConfigura */ @Override public String toString() { - return new StringBuilder() - .append(this.getClass().getName().substring(this.getClass().getName().lastIndexOf(".")+1)) - .append("[id=").append(id) - .append(", path=").append(path) - .append(", sha256=").append(sha256) - .append(", configuration=").append(configuration) - .append("]") - .toString(); + return new StringBuilder().append( + this.getClass().getName().substring(this.getClass().getName().lastIndexOf(".") + 1)).append("[id=").append( + id).append(", path=").append(path).append(", sha256=").append(sha256).append(", configuration=").append( + configuration).append("]").toString(); } /** @@ -265,16 +257,14 @@ public class RawConfiguration implements Serializable, DeepCopyable<RawConfigura } copy.path = this.path; - + if (this.contents != null) { - copy.setContents(this.getContents()); + copy.setContents(this.getContents(), this.getSha256()); } copy.errorMessage = this.errorMessage; - + return copy; } - } - diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ConfigurationTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ConfigurationTest.java index 1d47d3b..32d0efb 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ConfigurationTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ConfigurationTest.java @@ -23,14 +23,20 @@ package org.rhq.core.domain.configuration; -import static org.testng.Assert.*; - -import org.testng.annotations.Test; -import org.rhq.core.server.ExternalizableStrategy; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotSame; +import static org.testng.Assert.assertSame; +import static org.testng.Assert.assertTrue; import java.util.Random; import java.util.Set; +import org.testng.annotations.Test; + +import org.rhq.core.server.ExternalizableStrategy; +import org.rhq.core.util.MessageDigestGenerator; + /** * This class has tests for Configuration just like org.rhq.core.domain.configuration.test.ConfigurationTest. These * tests however are just plain, vanilla unit tests whereas the tests in org.rhq.core.domain.configuration.test.ConfigurationTest @@ -43,7 +49,8 @@ public class ConfigurationTest { Configuration original = createConfiguration(); Configuration copy = original.deepCopy(true); - assertNotSame(copy, original, "Expected a reference to a new Configuration object, not the original object being copied"); + assertNotSame(copy, original, + "Expected a reference to a new Configuration object, not the original object being copied"); } @Test @@ -51,7 +58,8 @@ public class ConfigurationTest { Configuration original = createConfiguration(); Configuration copy = original.deepCopy(false); - assertNotSame(copy, original, "Expected a reference to a new Configuration object, not the original object being copied"); + assertNotSame(copy, original, + "Expected a reference to a new Configuration object, not the original object being copied"); } @Test @@ -81,8 +89,10 @@ public class ConfigurationTest { Configuration copy = original.deepCopy(true); - assertNotSame(copy.getProperties(), original.getProperties(), "The properties property should not refer to the properties in the original object"); - assertEquals(copy.getProperties(), original.getProperties(), "Failed to copy the contents of the properties collection"); + assertNotSame(copy.getProperties(), original.getProperties(), + "The properties property should not refer to the properties in the original object"); + assertEquals(copy.getProperties(), original.getProperties(), + "Failed to copy the contents of the properties collection"); } @Test @@ -92,8 +102,10 @@ public class ConfigurationTest { Configuration copy = original.deepCopy(false); - assertNotSame(copy.getProperties(), original.getProperties(), "The properties property should not refer to the properties in the original object"); - assertEquals(copy.getProperties(), original.getProperties(), "Failed to copy the contents of the properties collection"); + assertNotSame(copy.getProperties(), original.getProperties(), + "The properties property should not refer to the properties in the original object"); + assertEquals(copy.getProperties(), original.getProperties(), + "Failed to copy the contents of the properties collection"); } @Test @@ -104,7 +116,8 @@ public class ConfigurationTest { Configuration copy = original.deepCopy(true); - assertNotSame(copy.get(propertyName), original.get(propertyName), "Expected a refernce to a new property, not the original property being copied"); + assertNotSame(copy.get(propertyName), original.get(propertyName), + "Expected a refernce to a new property, not the original property being copied"); } @Test @@ -115,7 +128,8 @@ public class ConfigurationTest { Configuration copy = original.deepCopy(false); - assertNotSame(copy.get(propertyName), original.get(propertyName), "Expected a refernce to a new property, not the original property being copied"); + assertNotSame(copy.get(propertyName), original.get(propertyName), + "Expected a refernce to a new property, not the original property being copied"); } @Test @@ -129,8 +143,7 @@ public class ConfigurationTest { assertSame( copy.get(propertyName).getConfiguration(), copy, - "The reference to the parent configuration should point to the newly copied configuration, not the original configuration" - ); + "The reference to the parent configuration should point to the newly copied configuration, not the original configuration"); } @Test @@ -144,8 +157,7 @@ public class ConfigurationTest { assertSame( copy.get(propertyName).getConfiguration(), copy, - "The reference to the parent configuration should point to the newly copied configuration, not the original configuration" - ); + "The reference to the parent configuration should point to the newly copied configuration, not the original configuration"); } @Test @@ -155,13 +167,11 @@ public class ConfigurationTest { Configuration copy = original.deepCopy(true); - assertNotSame( - copy.getRawConfigurations(), - original.getRawConfigurations(), - "The rawConfigurations property should not refer to the original rawConfigurations of the copied object." - ); + assertNotSame(copy.getRawConfigurations(), original.getRawConfigurations(), + "The rawConfigurations property should not refer to the original rawConfigurations of the copied object."); - assertRawConfigurationsEquals(copy.getRawConfigurations(), original.getRawConfigurations(), "Failed to copy rawConfigurations property."); + assertRawConfigurationsEquals(copy.getRawConfigurations(), original.getRawConfigurations(), + "Failed to copy rawConfigurations property."); } @Test @@ -171,17 +181,16 @@ public class ConfigurationTest { Configuration copy = original.deepCopy(false); - assertNotSame( - copy.getRawConfigurations(), - original.getRawConfigurations(), - "The rawConfigurations property should not refer to the original rawConfigurations of the copied object." - ); + assertNotSame(copy.getRawConfigurations(), original.getRawConfigurations(), + "The rawConfigurations property should not refer to the original rawConfigurations of the copied object."); - assertRawConfigurationsEquals(copy.getRawConfigurations(), original.getRawConfigurations(), "Failed to copy rawConfigurations property."); + assertRawConfigurationsEquals(copy.getRawConfigurations(), original.getRawConfigurations(), + "Failed to copy rawConfigurations property."); } void assertRawConfigurationsEquals(Set<RawConfiguration> actual, Set<RawConfiguration> expected, String msg) { - assertEquals(actual.size(), expected.size(), msg + " -- The rawConfigurations set has the wrong number of elements."); + assertEquals(actual.size(), expected.size(), msg + + " -- The rawConfigurations set has the wrong number of elements."); for (RawConfiguration rawConfig : expected) { assertTrue(actual.contains(rawConfig), msg + " -- Failed to find " + rawConfig); } @@ -198,8 +207,7 @@ public class ConfigurationTest { assertSame( copiedRawConfig.getConfiguration(), copy, - "The reference to the parent configuration should point to the newly copied configuration, not the original configuration." - ); + "The reference to the parent configuration should point to the newly copied configuration, not the original configuration."); } @Test @@ -213,8 +221,7 @@ public class ConfigurationTest { assertSame( copiedRawConfig.getConfiguration(), copy, - "The reference to the parent configuration should point to the newly copied configuration, not the original configuration." - ); + "The reference to the parent configuration should point to the newly copied configuration, not the original configuration."); } private RawConfiguration getCopiedRawConfiguration(Configuration config) { @@ -235,7 +242,8 @@ public class ConfigurationTest { public void equalsShouldBeFalseWhenArgumentIsNotAConfiguration() { Configuration config = new Configuration(); - assertFalse(config.equals(new Object()), "equals should return false when argument is not a " + Configuration.class.getSimpleName()); + assertFalse(config.equals(new Object()), "equals should return false when argument is not a " + + Configuration.class.getSimpleName()); } @Test @@ -262,10 +270,8 @@ public class ConfigurationTest { Configuration c2 = new Configuration(); c2.put(new PropertySimple("foo", "bar")); - assertTrue( - c1.equals(c2) && c2.equals(c1), - "equals() should be true and symmetric when structured configs are equal and there are no raw configs." - ); + assertTrue(c1.equals(c2) && c2.equals(c1), + "equals() should be true and symmetric when structured configs are equal and there are no raw configs."); assertEquals(c1.hashCode(), c2.hashCode()); } @@ -279,10 +285,8 @@ public class ConfigurationTest { Configuration c2 = new Configuration(); c2.addRawConfiguration(createCopyOfRawConfiguration(rawConfig)); - assertTrue( - c1.equals(c2) && c2.equals(c1), - "equals() should be true and symmetric when raw configs are equal and there are no structured configs." - ); + assertTrue(c1.equals(c2) && c2.equals(c1), + "equals() should be true and symmetric when raw configs are equal and there are no structured configs."); assertEquals(c1.hashCode(), c2.hashCode()); } @@ -309,7 +313,8 @@ public class ConfigurationTest { Configuration c3 = new Configuration(); c3.put(new PropertySimple("foo", "bar")); - assertTrue(c1.equals(c2) && c2.equals(c3), "equals() should be true when structured configs are equal and there are no raw configs."); + assertTrue(c1.equals(c2) && c2.equals(c3), + "equals() should be true when structured configs are equal and there are no raw configs."); assertTrue(c1.equals(c3), "equals should be transitive."); assertEquals(c1.hashCode(), c3.hashCode(), "hashCodes should be the same when equals() returns true."); @@ -328,7 +333,8 @@ public class ConfigurationTest { Configuration c3 = new Configuration(); c3.addRawConfiguration(createCopyOfRawConfiguration(rawConfig)); - assertTrue(c1.equals(c2) && c2.equals(c3), "equals() should be true when raw configs are equal and there are no structured configs."); + assertTrue(c1.equals(c2) && c2.equals(c3), + "equals() should be true when raw configs are equal and there are no structured configs."); assertTrue(c1.equals(c3), "equals should be transitive."); assertEquals(c1.hashCode(), c3.hashCode(), "hashCodes should be the same when equals() returns true."); @@ -420,7 +426,9 @@ public class ConfigurationTest { RawConfiguration rawConfig = new RawConfiguration(); rawConfig.setPath(path); - rawConfig.setContents(new String(bytes)); + String contents = new String(bytes); + String sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(contents); + rawConfig.setContents(contents, sha256); return rawConfig; } @@ -428,7 +436,9 @@ public class ConfigurationTest { private RawConfiguration createCopyOfRawConfiguration(RawConfiguration rawConfig) { RawConfiguration copy = new RawConfiguration(); copy.setPath(rawConfig.getPath()); - copy.setContents(rawConfig.getContents()); + String contents = rawConfig.getContents(); + String sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(contents); + copy.setContents(contents, sha256); copy.setConfiguration(rawConfig.getConfiguration()); return copy; @@ -495,11 +505,8 @@ public class ConfigurationTest { assertEquals(serializedConfig.getMap(), config.getMap(), "Failed to property serialize the map property"); for (Property property : serializedConfig.getProperties()) { - assertEquals( - property.getConfiguration(), - serializedConfig, - "Failed to update parent reference of property during serialization" - ); + assertEquals(property.getConfiguration(), serializedConfig, + "Failed to update parent reference of property during serialization"); } } @@ -561,11 +568,8 @@ public class ConfigurationTest { Configuration serializedConfig = TestUtil.serializeAndDeserialize(config); - assertEquals( - serializedConfig.getVersion(), - config.getVersion(), - "Failed to properly serialize the version property" - ); + assertEquals(serializedConfig.getVersion(), config.getVersion(), + "Failed to properly serialize the version property"); } @Test @@ -595,12 +599,8 @@ public class ConfigurationTest { Configuration serializedConfig = TestUtil.serializeAndDeserialize(config); - - assertEquals( - serializedConfig.getModifiedTime(), - config.getModifiedTime(), - "Failed to properly serialize the modifiedTime property" - ); + assertEquals(serializedConfig.getModifiedTime(), config.getModifiedTime(), + "Failed to properly serialize the modifiedTime property"); } @Test @@ -630,11 +630,8 @@ public class ConfigurationTest { Configuration serializedConfig = TestUtil.serializeAndDeserialize(config); - assertEquals( - serializedConfig.getCreatedTime(), - config.getCreatedTime(), - "Failed to properly serialize the createdTime property" - ); + assertEquals(serializedConfig.getCreatedTime(), config.getCreatedTime(), + "Failed to properly serialize the createdTime property"); } @Test @@ -665,17 +662,11 @@ public class ConfigurationTest { Configuration serializedConfig = TestUtil.serializeAndDeserialize(config); - assertRawConfigurationsEquals( - serializedConfig.getRawConfigurations(), - config.getRawConfigurations(), - "Failed to properly serialize rawConfigurations property" - ); + assertRawConfigurationsEquals(serializedConfig.getRawConfigurations(), config.getRawConfigurations(), + "Failed to properly serialize rawConfigurations property"); for (RawConfiguration rawConfig : serializedConfig.getRawConfigurations()) { - assertEquals( - rawConfig.getConfiguration(), - serializedConfig, - "Failed to update parent reference of raw config during serialization" - ); + assertEquals(rawConfig.getConfiguration(), serializedConfig, + "Failed to update parent reference of raw config during serialization"); } } diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/RawConfigurationIntegrationTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/RawConfigurationIntegrationTest.java index 65a0773..763a3cf 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/RawConfigurationIntegrationTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/RawConfigurationIntegrationTest.java @@ -23,10 +23,12 @@ package org.rhq.core.domain.configuration; -import org.rhq.core.domain.test.AbstractEJB3Test; +import javax.persistence.EntityManager; + import org.testng.annotations.Test; -import javax.persistence.EntityManager; +import org.rhq.core.domain.test.AbstractEJB3Test; +import org.rhq.core.util.MessageDigestGenerator; public class RawConfigurationIntegrationTest extends AbstractEJB3Test { @@ -40,7 +42,9 @@ public class RawConfigurationIntegrationTest extends AbstractEJB3Test { RawConfiguration rawConfig = new RawConfiguration(); rawConfig.setConfiguration(config); - rawConfig.setContents("contents"); + String contents = "contents"; + String sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(contents); + rawConfig.setContents(contents, sha256); rawConfig.setPath("/tmp/foo.txt"); entityMgr.persist(rawConfig); @@ -48,9 +52,8 @@ public class RawConfigurationIntegrationTest extends AbstractEJB3Test { RawConfiguration savedRawConfig = entityMgr.find(RawConfiguration.class, rawConfig.getId()); assertNotNull("Failed to find " + RawConfiguration.class.getSimpleName() + " by id.", savedRawConfig); - } - finally { - getTransactionManager().rollback(); + } finally { + getTransactionManager().rollback(); } } diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/RawConfigurationTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/RawConfigurationTest.java index 12e7ed0..7f02390 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/RawConfigurationTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/RawConfigurationTest.java @@ -23,25 +23,22 @@ package org.rhq.core.domain.configuration; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.digest.DigestUtils; import org.testng.annotations.Test; -import org.rhq.core.util.MessageDigestGenerator; -import java.io.ByteArrayOutputStream; -import java.io.ObjectOutputStream; -import java.io.ByteArrayInputStream; -import java.io.ObjectInputStream; -import java.io.IOException; +import org.rhq.core.util.MessageDigestGenerator; public class RawConfigurationTest { @Test public void sha256ShouldChangeWhenContentsChange() throws Exception { RawConfiguration rawConfig = new RawConfiguration(); - rawConfig.setContents("contents"); + setContentsAndSha256(rawConfig, "contents"); String actualSha256 = rawConfig.getSha256(); @@ -50,7 +47,7 @@ public class RawConfigurationTest { assertEquals(actualSha256, expectedSha256, "Failed to calculate the SHA-256 correctly."); String newContents = "new contents"; - rawConfig.setContents(newContents); + setContentsAndSha256(rawConfig, newContents); actualSha256 = rawConfig.getSha256(); @@ -74,8 +71,8 @@ public class RawConfigurationTest { public void verifyEqualsWhenObjectIsNotARawConfiguration() { RawConfiguration rawConfig = new RawConfiguration(); - assertFalse(rawConfig.equals(new Object()), "equals() should return false when incoming object is not a " + - RawConfiguration.class.getSimpleName()); + assertFalse(rawConfig.equals(new Object()), "equals() should return false when incoming object is not a " + + RawConfiguration.class.getSimpleName()); } @Test @@ -89,7 +86,7 @@ public class RawConfigurationTest { @Test public void verifyEqualsWhenRawConfigurationArgHasNullContents() { RawConfiguration r1 = new RawConfiguration(); - r1.setContents("contents"); + setContentsAndSha256(r1, "contents"); RawConfiguration r2 = new RawConfiguration(); @@ -99,13 +96,14 @@ public class RawConfigurationTest { @Test public void verifyEqualsWhenRawConfigurationArgHasNullPath() { RawConfiguration r1 = new RawConfiguration(); - r1.setContents("contents"); + setContentsAndSha256(r1, "contents"); r1.setPath("/tmp/foo"); RawConfiguration r2 = new RawConfiguration(); - r2.setContents("contents"); + setContentsAndSha256(r2, "contents"); - assertFalse(r1.equals(r2), "equals() should return false when one of the raw configs does not have its paths set"); + assertFalse(r1.equals(r2), + "equals() should return false when one of the raw configs does not have its paths set"); } @Test @@ -118,10 +116,10 @@ public class RawConfigurationTest { @Test public void verifyEqualsAndHashCodeAreSymmetricWhenPathIsNull() { RawConfiguration r1 = new RawConfiguration(); - r1.setContents("contents"); + setContentsAndSha256(r1, "contents"); RawConfiguration r2 = new RawConfiguration(); - r2.setContents("contents"); + setContentsAndSha256(r2, "contents"); assertTrue(r1.equals(r2), "equals() should be true when contents are the same and path is null for both."); assertTrue(r2.equals(r1), "equals() should be symmetric."); @@ -132,11 +130,11 @@ public class RawConfigurationTest { @Test public void verifyEqualsAndHashCodeAreSymmetricWhenPathIsNotNull() { RawConfiguration r1 = new RawConfiguration(); - r1.setContents("contents"); + setContentsAndSha256(r1, "contents"); r1.setPath("/tmp/foo"); RawConfiguration r2 = new RawConfiguration(); - r2.setContents("contents"); + setContentsAndSha256(r2, "contents"); r2.setPath("/tmp/foo"); assertTrue(r1.equals(r2), "equals() should be true when contents and paths are the same."); @@ -150,15 +148,16 @@ public class RawConfigurationTest { String contents = "contents"; RawConfiguration r1 = new RawConfiguration(); - r1.setContents(contents); + setContentsAndSha256(r1, contents); RawConfiguration r2 = new RawConfiguration(); - r2.setContents(contents); + setContentsAndSha256(r2, contents); RawConfiguration r3 = new RawConfiguration(); - r3.setContents(contents); + setContentsAndSha256(r3, contents); - assertTrue(r1.equals(r2) && r2.equals(r3), "equals() should be true when contents are the same and paths are null."); + assertTrue(r1.equals(r2) && r2.equals(r3), + "equals() should be true when contents are the same and paths are null."); assertTrue(r1.equals(r3), "equals() should be transitive when contents are the same and paths are null."); assertEquals(r1.hashCode(), r3.hashCode(), "hashCode() should be the same for r1 and r3 via transitivity."); @@ -169,15 +168,15 @@ public class RawConfigurationTest { String contents = "contents"; RawConfiguration r1 = new RawConfiguration(); - r1.setContents(contents); + setContentsAndSha256(r1, contents); r1.setPath("/tmp/foo"); RawConfiguration r2 = new RawConfiguration(); - r2.setContents(contents); + setContentsAndSha256(r2, contents); r2.setPath("/tmp/foo"); RawConfiguration r3 = new RawConfiguration(); - r3.setContents(contents); + setContentsAndSha256(r3, contents); r3.setPath("/tmp/foo"); assertTrue(r1.equals(r2) && r2.equals(r3), "equals() should be true when contents and paths are the same."); @@ -213,7 +212,7 @@ public class RawConfigurationTest { @Test public void deepCopyShouldCopyContentsWhenCopyingId() { RawConfiguration original = new RawConfiguration(); - original.setContents("contents"); + setContentsAndSha256(original, "contents"); RawConfiguration copy = original.deepCopy(true); @@ -224,7 +223,7 @@ public class RawConfigurationTest { @Test public void deepCopyShouldCopyContentsWhenNotCopyingId() { RawConfiguration original = new RawConfiguration(); - original.setContents("contents"); + setContentsAndSha256(original, "contents"); RawConfiguration copy = original.deepCopy(false); @@ -232,4 +231,8 @@ public class RawConfigurationTest { assertEquals(copy.getContents(), original.getContents(), "Failed to copy contents property."); } + private void setContentsAndSha256(RawConfiguration rc, String contents) { + String sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(contents); + rc.setContents(contents, sha256); + } } diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/test/ConfigurationTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/test/ConfigurationTest.java index dda0435..c581ff8 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/test/ConfigurationTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/test/ConfigurationTest.java @@ -40,12 +40,13 @@ import org.rhq.core.domain.configuration.Property; import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.core.domain.configuration.ResourceConfigurationUpdate; import org.rhq.core.domain.configuration.RawConfiguration; +import org.rhq.core.domain.configuration.ResourceConfigurationUpdate; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.test.AbstractEJB3Test; +import org.rhq.core.util.MessageDigestGenerator; import org.rhq.core.util.exception.ThrowableUtil; public class ConfigurationTest extends AbstractEJB3Test { @@ -61,7 +62,8 @@ public class ConfigurationTest extends AbstractEJB3Test { Configuration c = new Configuration(); PropertySimple p1 = new PropertySimple("first", "firstValue"); - p1.setErrorMessageFromThrowable(new Exception("This should be a boolean value - true or false")); + p1.setErrorMessage(ThrowableUtil.getStackAsString(new Exception( + "This should be a boolean value - true or false"))); c.put(p1); em.persist(c); @@ -102,7 +104,8 @@ public class ConfigurationTest extends AbstractEJB3Test { try { Configuration c = new Configuration(); PropertySimple p1 = new PropertySimple("first", "firstValue"); - p1.setErrorMessageFromThrowable(new Exception("This should be a boolean value - true or false")); + p1.setErrorMessage(ThrowableUtil.getStackAsString(new Exception( + "This should be a boolean value - true or false"))); c.put(p1); em.persist(c); Configuration copy = em.find(Configuration.class, c.getId()); @@ -218,8 +221,7 @@ public class ConfigurationTest extends AbstractEJB3Test { entityMgr.persist(config); assertTrue("Failed to cascade save to " + RawConfiguration.class.getSimpleName(), rawConfig.getId() != 0); - } - finally { + } finally { getTransactionManager().rollback(); } } @@ -244,19 +246,18 @@ public class ConfigurationTest extends AbstractEJB3Test { entityMgr.flush(); entityMgr.clear(); - assertNull( - "Failed to remove the orphaned " + RawConfiguration.class.getSimpleName() + " from the persistence context.", - entityMgr.find(RawConfiguration.class, rawConfiguration.getId()) - ); - } - finally { + assertNull("Failed to remove the orphaned " + RawConfiguration.class.getSimpleName() + + " from the persistence context.", entityMgr.find(RawConfiguration.class, rawConfiguration.getId())); + } finally { getTransactionManager().rollback(); } } RawConfiguration createRawConfiguration() { RawConfiguration rawConfig = new RawConfiguration(); - rawConfig.setContents("contents"); + String contents = "contents"; + String sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(contents); + rawConfig.setContents(contents, sha256); rawConfig.setPath("/tmp/foo"); return rawConfig; diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceSyncResultsTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceSyncResultsTest.java index eed6b3f..deb5fc3 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceSyncResultsTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceSyncResultsTest.java @@ -31,8 +31,8 @@ import org.testng.annotations.Test; import org.rhq.core.domain.content.Architecture; import org.rhq.core.domain.content.ContentSource; import org.rhq.core.domain.content.ContentSourceSyncResults; -import org.rhq.core.domain.content.ContentSyncStatus; import org.rhq.core.domain.content.ContentSourceType; +import org.rhq.core.domain.content.ContentSyncStatus; import org.rhq.core.domain.content.Package; import org.rhq.core.domain.content.PackageType; import org.rhq.core.domain.content.PackageVersion; @@ -49,16 +49,17 @@ public class ContentSourceSyncResultsTest extends AbstractEJB3Test { try { EntityManager em = getEntityManager(); - ResourceType rt = new ResourceType("testPVCSResourceType", "testPlugin", ResourceCategory.PLATFORM, null); - Resource resource = new Resource("testPVCSResource", "testPVCSResource", rt); - Architecture arch = new Architecture("testPVCSInsertArch"); - PackageType pt = new PackageType("testPVCSInsertPT", resource.getResourceType()); - Package pkg = new Package("testPVCSInsertPackage", pt); + ResourceType rt = new ResourceType("testCSSRResourceType", "testPlugin", ResourceCategory.PLATFORM, null); + Resource resource = new Resource("testCSSRResource", "testCSSRResource", rt); + resource.setUuid("uuid"); + Architecture arch = new Architecture("testCSSRInsertArch"); + PackageType pt = new PackageType("testCSSRInsertPT", resource.getResourceType()); + Package pkg = new Package("testCSSRInsertPackage", pt); PackageVersion pv = new PackageVersion(pkg, "version", arch); - ContentSourceType cst = new ContentSourceType("testPVCSContentSourceType"); - ContentSource cs = new ContentSource("testPVCSContentSource", cst); + ContentSourceType cst = new ContentSourceType("testCSSRContentSourceType"); + ContentSource cs = new ContentSource("testCSSRContentSource", cst); ContentSourceSyncResults results = new ContentSourceSyncResults(cs); - Repo repo = new Repo("testPVCSRepo"); + Repo repo = new Repo("testCSSRRepo"); repo.addContentSource(cs); em.persist(rt); @@ -107,6 +108,9 @@ public class ContentSourceSyncResultsTest extends AbstractEJB3Test { syncResults = cs.getSyncResults(); assert syncResults != null; assert syncResults.size() == 2; + } catch (Exception e) { + e.printStackTrace(); + throw e; } finally { getTransactionManager().rollback(); } diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceTest.java index f9a1475..3f89351 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceTest.java @@ -1,29 +1,33 @@ - /* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ package org.rhq.core.domain.content.test; +import java.util.Random; + import javax.persistence.EntityManager; + import org.testng.annotations.Test; + import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.content.Architecture; @@ -46,6 +50,7 @@ public class ContentSourceTest extends AbstractEJB3Test { ResourceType rt = new ResourceType("testCSResourceType", "testPlugin", ResourceCategory.PLATFORM, null); Resource resource = new Resource("testCSResource", "testCSResource", rt); + resource.setUuid("" + new Random().nextInt()); Architecture arch = new Architecture("testCSInsertArch"); PackageType pt = new PackageType("testCSInsertPT", resource.getResourceType()); Package pkg = new Package("testCSInsertPackage", pt); @@ -92,6 +97,7 @@ public class ContentSourceTest extends AbstractEJB3Test { ResourceType rt = new ResourceType("testCSResourceType", "testPlugin", ResourceCategory.PLATFORM, null); Resource resource = new Resource("testCSResource", "testCSResource", rt); + resource.setUuid("" + new Random().nextInt()); Architecture arch = new Architecture("testCSInsertArch"); PackageType pt = new PackageType("testCSInsertPT", resource.getResourceType()); Package pkg = new Package("testCSInsertPackage", pt); @@ -141,6 +147,7 @@ public class ContentSourceTest extends AbstractEJB3Test { ResourceType rt = new ResourceType("testCSResourceType", "testPlugin", ResourceCategory.PLATFORM, null); Resource resource = new Resource("testCSResource", "testCSResource", rt); + resource.setUuid("" + new Random().nextInt()); Architecture arch = new Architecture("testCSInsertArch"); PackageType pt = new PackageType("testCSInsertPT", resource.getResourceType()); Package pkg = new Package("testCSInsertPackage", pt); diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/PackageVersionContentSourceTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/PackageVersionContentSourceTest.java index b921cce..59cc693 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/PackageVersionContentSourceTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/PackageVersionContentSourceTest.java @@ -23,6 +23,7 @@ package org.rhq.core.domain.content.test; import java.util.List; +import java.util.Random; import javax.persistence.EntityManager; import javax.persistence.Query; @@ -64,6 +65,7 @@ public class PackageVersionContentSourceTest extends AbstractEJB3Test { ResourceType rt = new ResourceType("testPVCSResourceType", "testPlugin", ResourceCategory.PLATFORM, null); Resource resource = new Resource("testPVCSResource", "testPVCSResource", rt); + resource.setUuid("" + new Random().nextInt()); Architecture arch = new Architecture("testPVCSInsertArch"); PackageType pt = new PackageType("testPVCSInsertPT", resource.getResourceType()); Package pkg = new Package("testPVCSInsertPackage", pt); @@ -178,6 +180,7 @@ public class PackageVersionContentSourceTest extends AbstractEJB3Test { ResourceType rt = new ResourceType("testPVCSResourceType", "testPlugin", ResourceCategory.PLATFORM, null); Resource resource = new Resource("testPVCSResource", "testPVCSResource", rt); + resource.setUuid("" + new Random().nextInt()); Architecture arch = new Architecture("testPVCSInsertArch"); PackageType pt = new PackageType("testPVCSInsertPT", resource.getResourceType()); Package pkg = new Package("testPVCSInsertPackage", pt); @@ -233,6 +236,7 @@ public class PackageVersionContentSourceTest extends AbstractEJB3Test { ResourceType rt = new ResourceType("testPVCSResourceType", "testPlugin", ResourceCategory.PLATFORM, null); Resource resource = new Resource("testPVCSResource", "testPVCSResource", rt); + resource.setUuid("" + new Random().nextInt()); Architecture arch = new Architecture("testPVCSInsertArch"); PackageType pt = new PackageType("testPVCSInsertPT", resource.getResourceType()); Package pkg = new Package("testPVCSInsertPackage", pt); diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/RepoGroupTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/RepoGroupTest.java index 073395d..58ad823 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/RepoGroupTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/RepoGroupTest.java @@ -1,29 +1,33 @@ - /* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ package org.rhq.core.domain.content.test; +import java.util.Random; + import javax.persistence.EntityManager; + import org.testng.annotations.Test; + import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.content.Architecture; @@ -35,8 +39,6 @@ import org.rhq.core.domain.content.PackageVersion; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.domain.content.RepoGroup; - import org.rhq.core.domain.test.AbstractEJB3Test; @Test @@ -48,6 +50,7 @@ public class RepoGroupTest extends AbstractEJB3Test { ResourceType rt = new ResourceType("testCSResourceType", "testPlugin", ResourceCategory.PLATFORM, null); Resource resource = new Resource("testCSResource", "testCSResource", rt); + resource.setUuid("" + new Random().nextInt()); Architecture arch = new Architecture("testCSInsertArch"); PackageType pt = new PackageType("testCSInsertPT", resource.getResourceType()); Package pkg = new Package("testCSInsertPackage", pt); @@ -94,6 +97,7 @@ public class RepoGroupTest extends AbstractEJB3Test { ResourceType rt = new ResourceType("testCSResourceType", "testPlugin", ResourceCategory.PLATFORM, null); Resource resource = new Resource("testCSResource", "testCSResource", rt); + resource.setUuid("" + new Random().nextInt()); Architecture arch = new Architecture("testCSInsertArch"); PackageType pt = new PackageType("testCSInsertPT", resource.getResourceType()); Package pkg = new Package("testCSInsertPackage", pt); @@ -143,6 +147,7 @@ public class RepoGroupTest extends AbstractEJB3Test { ResourceType rt = new ResourceType("testCSResourceType", "testPlugin", ResourceCategory.PLATFORM, null); Resource resource = new Resource("testCSResource", "testCSResource", rt); + resource.setUuid("" + new Random().nextInt()); Architecture arch = new Architecture("testCSInsertArch"); PackageType pt = new PackageType("testCSInsertPT", resource.getResourceType()); Package pkg = new Package("testCSInsertPackage", pt); diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/measurement/test/CompositeLoadingTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/measurement/test/CompositeLoadingTest.java index 1bf29f8..c5adab3 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/measurement/test/CompositeLoadingTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/measurement/test/CompositeLoadingTest.java @@ -1,31 +1,32 @@ - /* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ package org.rhq.core.domain.measurement.test; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Random; import javax.persistence.EntityManager; import javax.persistence.Query; @@ -99,14 +100,17 @@ public class CompositeLoadingTest extends AbstractEJB3Test { ResourceType resourceType = new ResourceType("fake platform", "fake plugin", ResourceCategory.PLATFORM, null); em.persist(resourceType); Resource platform = new Resource("org.jboss.on.TestPlatfor", "Fake Platform", resourceType); + platform.setUuid("" + new Random().nextInt()); em.persist(platform); Availability a = new Availability(platform, date, AvailabilityType.UP); ids.add(platform.getId()); Resource platform2 = new Resource("org.jboss.on.TestPlatform2", "Fake Platform2", resourceType); + platform2.setUuid("" + new Random().nextInt()); em.persist(platform2); Availability a2 = new Availability(platform2, date, AvailabilityType.UP); ids.add(platform2.getId()); Resource platform3 = new Resource("org.jboss.on.TestPlatform3", "Fake Platform3", resourceType); + platform3.setUuid("" + new Random().nextInt()); em.persist(platform3); Availability a3 = new Availability(platform3, date, AvailabilityType.UP); ids.add(platform3.getId()); diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/measurement/test/MeasurementTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/measurement/test/MeasurementTest.java index be727a1..67e886a 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/measurement/test/MeasurementTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/measurement/test/MeasurementTest.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.Random; import javax.persistence.EntityManager; import javax.persistence.Query; @@ -347,8 +348,10 @@ public class MeasurementTest extends AbstractEJB3Test { ResourceType resourceType = new ResourceType("fake platform", "fake plugin", ResourceCategory.PLATFORM, null); em.persist(resourceType); Resource platform = new Resource("org.jboss.on.TestPlatfor", "Fake Platform", resourceType); + platform.setUuid("" + new Random().nextInt()); em.persist(platform); Resource platform2 = new Resource("org.jboss.on.TestPlatform2", "Fake Platform2", resourceType); + platform2.setUuid("" + new Random().nextInt()); em.persist(platform2); MeasurementDefinition md = new MeasurementDefinition(resourceType, "Heiko"); diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java index bd2dff3..df93193 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java @@ -1,27 +1,29 @@ - /* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ package org.rhq.core.domain.operation; +import java.util.Random; + import javax.persistence.EntityManager; import javax.persistence.EntityNotFoundException; import javax.persistence.Query; @@ -316,6 +318,7 @@ public class OperationHistoryTest extends AbstractEJB3Test { em.persist(resourceType); resource = new Resource("key" + System.currentTimeMillis(), "name", resourceType); + resource.setUuid("" + new Random().nextInt()); em.persist(resource); ResourceGroup group = new ResourceGroup("testgroup" + System.currentTimeMillis(), resourceType); diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ProblemResourceTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ProblemResourceTest.java index 8c75b8d..55f8552 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ProblemResourceTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ProblemResourceTest.java @@ -23,6 +23,7 @@ package org.rhq.core.domain.resource.test; import java.util.List; +import java.util.Random; import javax.persistence.EntityManager; import javax.persistence.Query; @@ -210,9 +211,11 @@ public class ProblemResourceTest extends AbstractEJB3Test { platformType = new ResourceType("testplatPR", "p", ResourceCategory.PLATFORM, null); em.persist(platformType); platform = new Resource("platform1", "testProblemResources Platform One", platformType); + platform.setUuid("" + new Random().nextInt()); platform.setInventoryStatus(InventoryStatus.COMMITTED); em.persist(platform); platform2 = new Resource("platform2", "testProblemResources Platform Two", platformType); + platform2.setUuid("" + new Random().nextInt()); platform2.setInventoryStatus(InventoryStatus.COMMITTED); em.persist(platform2); diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceErrorTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceErrorTest.java index 12f6455..8fdc2f7 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceErrorTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceErrorTest.java @@ -1,28 +1,29 @@ - /* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ package org.rhq.core.domain.resource.test; import java.util.List; +import java.util.Random; import javax.persistence.EntityManager; import javax.persistence.Query; @@ -157,6 +158,7 @@ public class ResourceErrorTest extends AbstractEJB3Test { ResourceCategory.PLATFORM, null); em.persist(resourceType); resource = new Resource("key" + System.currentTimeMillis(), "name", resourceType); + resource.setUuid("" + new Random().nextInt()); em.persist(resource); System.out.println("Created resource with id " + resource.getId()); } catch (Exception e) { diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceGroupTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceGroupTest.java index 4ccc21e..4ab3f4a 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceGroupTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceGroupTest.java @@ -1,31 +1,35 @@ - /* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ package org.rhq.core.domain.resource.test; +import java.util.Random; + import javax.persistence.EntityManager; + import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; + import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; @@ -71,6 +75,7 @@ public class ResourceGroupTest extends AbstractEJB3Test { em.persist(resourceType); resource = new Resource("key" + System.currentTimeMillis(), "name", resourceType); + resource.setUuid("" + new Random().nextInt()); em.persist(resource); ResourceGroup group = new ResourceGroup("testgroup" + System.currentTimeMillis(), resourceType); diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java index 4f6a28f..0688c79 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java @@ -1,43 +1,45 @@ - /* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ package org.rhq.core.domain.util.units.test; - import org.rhq.core.domain.measurement.MeasurementConverterClient; - import org.rhq.core.domain.measurement.MeasurementUnits; - import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits; - import org.rhq.core.domain.measurement.util.MeasurementConversionException; - import org.rhq.core.domain.test.AbstractEJB3Test; - import org.rhq.core.server.MeasurementParser; +import java.text.DecimalFormat; +import java.text.NumberFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; - import org.testng.annotations.Test; +import org.testng.annotations.Test; - import java.text.DecimalFormat; - import java.text.NumberFormat; - import java.util.ArrayList; - import java.util.List; - import java.util.Locale; +import org.rhq.core.domain.measurement.MeasurementConverterClient; +import org.rhq.core.domain.measurement.MeasurementUnits; +import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits; +import org.rhq.core.domain.measurement.util.MeasurementConversionException; +import org.rhq.core.domain.test.AbstractEJB3Test; +import org.rhq.core.server.MeasurementParser; - public class MeasurementConverterTest extends AbstractEJB3Test { +// TODO two tests in here need to be re-enables once the GWT client issues are resolved +@Test +public class MeasurementConverterTest extends AbstractEJB3Test { private final double POSITIVE = 300; private final double NEGATIVE = -42; @@ -57,7 +59,8 @@ package org.rhq.core.domain.util.units.test; precisionScalingTestCount.set(precisionScalingTestCount.get() + 1); } - @Test(groups = "integration.ejb3") + @Test(groups = "integration.ejb3", enabled = false) + // TODO fix me public void testPrecisionScaling() throws Exception { // if all values are equal, it will format to the max precision @@ -114,7 +117,8 @@ package org.rhq.core.domain.util.units.test; } } - @Test(groups = "integration.ejb3") + @Test(groups = "integration.ejb3", enabled = false) + // TODO fix me public void testConversionSuccess() throws Exception { // test the straight-forward, non-whitespace cases for (MeasurementUnits units : MeasurementUnits.values()) { diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/bundle/BundleManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/bundle/BundleManager.java index 3bd4c8b..04b29a8 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/bundle/BundleManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/bundle/BundleManager.java @@ -226,7 +226,7 @@ public class BundleManager extends AgentService implements BundleAgentService, B } if (packageVersion.getMD5() != null) { - String realMD5 = MessageDigestGenerator.getDigestString(packageFile); + String realMD5 = new MessageDigestGenerator(MessageDigestGenerator.MD5).calcDigestString(packageFile); if (!packageVersion.getMD5().equals(realMD5)) { throw new Exception("Package version [" + packageVersion + "] failed MD5 check. expected=[" + packageVersion.getMD5() + "], actual=[" + realMD5 + "]"); @@ -234,9 +234,7 @@ public class BundleManager extends AgentService implements BundleAgentService, B } else if (packageVersion.getSHA256() != null) { FileInputStream is = new FileInputStream(packageFile); try { - MessageDigestGenerator gen = new MessageDigestGenerator("SHA256"); - gen.add(is); - String realSHA256 = gen.getDigestString(); + String realSHA256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(is); if (!packageVersion.getSHA256().equals(realSHA256)) { throw new Exception("Package version [" + packageVersion + "] failed SHA256 check. expected=[" + packageVersion.getSHA256() + "], actual=[" + realSHA256 + "]"); diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationManager.java index b73cc65..b237969 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationManager.java @@ -53,9 +53,7 @@ import org.rhq.core.pc.util.FacetLockType; import org.rhq.core.pc.util.LoggingThreadFactory; import org.rhq.core.pluginapi.configuration.ConfigurationFacet; import org.rhq.core.pluginapi.configuration.ResourceConfigurationFacet; -import org.rhq.core.system.SystemInfoFactory; - -import org.rhq.core.util.exception.WrappedRemotingException; +import org.rhq.core.util.MessageDigestGenerator; /** * Manages configuration of all resources across all plugins. @@ -191,7 +189,8 @@ public class ConfigurationManager extends AgentService implements ContainerServi for (RawConfiguration rawConfig : configuration.getRawConfigurations()) { String contents = rawConfig.getContents(); - rawConfig.setContents(contents); + String sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(contents); + rawConfig.setContents(contents, sha256); structuredConfig.addRawConfiguration(rawConfig); facet.mergeStructuredConfiguration(rawConfig, configuration); } @@ -221,7 +220,9 @@ public class ConfigurationManager extends AgentService implements ContainerServi RawConfiguration mergedRaw = facet.mergeRawConfiguration(configuration, originalRaw); if (mergedRaw != null) { //TODO bypass validation of structured config for template values - mergedRaw.setContents(mergedRaw.getContents()); + String contents = mergedRaw.getContents(); + String sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(contents); + mergedRaw.setContents(contents, sha256); updateRawConfig(configuration, originalRaw, mergedRaw); } } @@ -358,6 +359,6 @@ public class ConfigurationManager extends AgentService implements ContainerServi } } } - return success ? null: configuration; + return success ? null : configuration; } } diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/configuration/ConfigManagementTest.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/configuration/ConfigManagementTest.java index f55ca5a..f6bd049 100644 --- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/configuration/ConfigManagementTest.java +++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/configuration/ConfigManagementTest.java @@ -23,6 +23,16 @@ package org.rhq.core.pc.configuration; +import static org.rhq.test.AssertUtils.assertCollectionEqualsNoOrder; +import static org.rhq.test.AssertUtils.assertPropertiesMatch; +import static org.testng.Assert.assertEquals; + +import java.util.HashSet; +import java.util.Random; +import java.util.Set; + +import org.testng.annotations.BeforeMethod; + import org.rhq.core.clientapi.server.configuration.ConfigurationUpdateResponse; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; @@ -31,16 +41,8 @@ import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.pc.util.ComponentService; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; +import org.rhq.core.util.MessageDigestGenerator; import org.rhq.test.JMockTest; -import org.testng.annotations.BeforeMethod; - -import java.util.HashSet; -import java.util.Random; -import java.util.Set; - -import static org.rhq.test.AssertUtils.assertCollectionEqualsNoOrder; -import static org.rhq.test.AssertUtils.assertPropertiesMatch; -import static org.testng.Assert.assertEquals; public class ConfigManagementTest extends JMockTest { @@ -77,7 +79,9 @@ public class ConfigManagementTest extends JMockTest { RawConfiguration createRawConfiguration(String path) { RawConfiguration rawConfig = new RawConfiguration(); - rawConfig.setContents(new String(randomBytes())); + String contents = new String(randomBytes()); + String sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(contents); + rawConfig.setContents(contents, sha256); rawConfig.setPath(path); return rawConfig; @@ -98,25 +102,20 @@ public class ConfigManagementTest extends JMockTest { } void assertRawsLoaded(Set<RawConfiguration> expectedRaws, Configuration actualConfig) { - assertCollectionEqualsNoOrder( - expectedRaws, - actualConfig.getRawConfigurations(), - "The raw configs were not loaded correctly." - ); + assertCollectionEqualsNoOrder(expectedRaws, actualConfig.getRawConfigurations(), + "The raw configs were not loaded correctly."); } void assertStructuredLoaded(Configuration expectedConfig, Configuration actualConfig) { - assertCollectionEqualsNoOrder( - expectedConfig.getProperties(), - actualConfig.getProperties(), - "The structured configuration was not loaded correctly." - ); + assertCollectionEqualsNoOrder(expectedConfig.getProperties(), actualConfig.getProperties(), + "The structured configuration was not loaded correctly."); } void assertNotesSetToDefault(Configuration loadedConfig) { String expectedNotes = "Resource config for " + resourceType.getName() + " Resource w/ id " + resourceId; - assertEquals(loadedConfig.getNotes(), expectedNotes, "The notes property should be set to a default when it is not already initialized."); + assertEquals(loadedConfig.getNotes(), expectedNotes, + "The notes property should be set to a default when it is not already initialized."); } void assertConfigurationUpdateResponseMatches(ConfigurationUpdateResponse expected, diff --git a/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java b/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java index 794878f..a22eed3 100644 --- a/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java +++ b/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java @@ -1,25 +1,25 @@ - /* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ package org.rhq.core.util; import java.io.BufferedInputStream; @@ -35,8 +35,17 @@ import java.security.NoSuchAlgorithmException; * An object that generates a message digest or hash for algorithms such as MD5 or SHA. This class is basically a * wrapper around {@link java.security.MessageDigest} and provides convenience methods making it easier to generate * hashes. + * + * There are static methods in here that use MD5 as the default algorithm. If you want to use another + * algorithm, instantiate an instance of this object and use its instance methods. */ public class MessageDigestGenerator { + /** you can pass this to the constructor to indicate you want to generate MD5 message digests */ + public static final String MD5 = "MD5"; + + /** you can pass this to the constructor to indicate you want to generate SHA 256 message digests */ + public static final String SHA_256 = "SHA-256"; + private final MessageDigest messageDigest; /** @@ -48,7 +57,7 @@ public class MessageDigestGenerator { * @throws IllegalStateException if the MD5 algorithm cannot be computed by the VM */ public MessageDigestGenerator() { - this("MD5"); + this(MD5); } /** @@ -61,8 +70,7 @@ public class MessageDigestGenerator { public MessageDigestGenerator(String algorithm) { try { messageDigest = MessageDigest.getInstance(algorithm); - } - catch (NoSuchAlgorithmException e) { + } catch (NoSuchAlgorithmException e) { throw new IllegalStateException(algorithm + " is not a supported algorithm"); } } @@ -142,9 +150,13 @@ public class MessageDigestGenerator { * @throws IOException if failed to read the stream for some reason */ public static byte[] getDigest(InputStream is) throws IOException { - MessageDigestGenerator md5 = new MessageDigestGenerator(); - md5.add(is); - return md5.getDigest(); + MessageDigestGenerator md5 = new MessageDigestGenerator(MD5); + return md5.calcDigest(is); + } + + public byte[] calcDigest(InputStream is) throws IOException { + add(is); + return getDigest(); } /** @@ -157,9 +169,13 @@ public class MessageDigestGenerator { * @throws IOException if failed to read the stream for some reason */ public static String getDigestString(InputStream is) throws IOException { - MessageDigestGenerator md5 = new MessageDigestGenerator(); - md5.add(is); - return md5.getDigestString(); + MessageDigestGenerator md5 = new MessageDigestGenerator(MD5); + return md5.calcDigestString(is); + } + + public String calcDigestString(InputStream is) throws IOException { + add(is); + return getDigestString(); } /** @@ -172,9 +188,14 @@ public class MessageDigestGenerator { * @throws RuntimeException if a system error occurred - should never really happen */ public static byte[] getDigest(String source_str) { + MessageDigestGenerator md5 = new MessageDigestGenerator(MD5); + return md5.calcDigest(source_str); + } + + public byte[] calcDigest(String source_str) { try { ByteArrayInputStream bs = new ByteArrayInputStream(source_str.getBytes()); - return getDigest(bs); + return calcDigest(bs); } catch (IOException e) { throw new RuntimeException("IOException reading a byte array input stream, this should never happen", e); } @@ -188,7 +209,12 @@ public class MessageDigestGenerator { * @return the string's digest or hash as a String */ public static String getDigestString(String source_str) { - return calculateDigestStringFromBytes(getDigest(source_str)); + MessageDigestGenerator md5 = new MessageDigestGenerator(MD5); + return md5.calcDigestString(source_str); + } + + public String calcDigestString(String source_str) { + return calculateDigestStringFromBytes(calcDigest(source_str)); } /** @@ -201,11 +227,16 @@ public class MessageDigestGenerator { * @throws IOException if the file could not be read or accessed */ public static byte[] getDigest(File file) throws IOException { + MessageDigestGenerator md5 = new MessageDigestGenerator(MD5); + return md5.calcDigest(file); + } + + public byte[] calcDigest(File file) throws IOException { FileInputStream is = null; try { is = new FileInputStream(file); - return getDigest(new BufferedInputStream(is, 1024 * 32)); + return calcDigest(new BufferedInputStream(is, 1024 * 32)); } finally { if (is != null) { is.close(); @@ -223,7 +254,12 @@ public class MessageDigestGenerator { * @throws IOException if the file could not be read or accessed */ public static String getDigestString(File file) throws IOException { - return calculateDigestStringFromBytes(getDigest(file)); + MessageDigestGenerator md5 = new MessageDigestGenerator(MD5); + return md5.calcDigestString(file); + } + + public String calcDigestString(File file) throws IOException { + return calculateDigestStringFromBytes(calcDigest(file)); } /** @@ -257,5 +293,7 @@ public class MessageDigestGenerator { String file = args[0]; String digest = MessageDigestGenerator.getDigestString(new File(file)); System.out.println("MD5=" + digest); + digest = new MessageDigestGenerator(SHA_256).calcDigestString(new File(file)); + System.out.println("SHA-256=" + digest); } } \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ExistingResourceConfigurationUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ExistingResourceConfigurationUIBean.java index b5d9c14..0be2147 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ExistingResourceConfigurationUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ExistingResourceConfigurationUIBean.java @@ -18,14 +18,28 @@ */ package org.rhq.enterprise.gui.configuration.resource; +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.TreeMap; + +import javax.faces.application.FacesMessage; +import javax.faces.event.ValueChangeEvent; +import javax.servlet.http.HttpServletResponse; + import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Out; import org.jetbrains.annotations.Nullable; +import org.richfaces.model.UploadItem; + +import org.jboss.seam.annotations.Create; -import org.rhq.core.clientapi.agent.configuration.ConfigurationValidationException; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.configuration.AbstractResourceConfigurationUpdate; import org.rhq.core.domain.configuration.Configuration; @@ -35,26 +49,12 @@ import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.configuration.definition.ConfigurationFormat; import org.rhq.core.gui.configuration.ConfigurationMaskingUtility; import org.rhq.core.gui.util.FacesContextUtility; +import org.rhq.core.util.MessageDigestGenerator; import org.rhq.enterprise.gui.common.upload.FileUploadUIBean; import org.rhq.enterprise.gui.configuration.AbstractConfigurationUIBean; import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; import org.rhq.enterprise.server.util.LookupUtil; -import org.richfaces.model.UploadItem; - -import javax.ejb.EJBException; -import javax.faces.application.FacesMessage; -import javax.faces.event.ValueChangeEvent; -import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.TreeMap; // This class is temporarily decleared in components.xml since it is declared under two names - ViewUIBean and // UIBean. This class is undergoing some refactoring and part of that will include declaring the @Name and @Scope @@ -73,7 +73,7 @@ public class ExistingResourceConfigurationUIBean extends AbstractConfigurationUI // @Out private Collection<RawConfigDirectory> rawConfigDirectories; -// @Out + // @Out private FileUploadUIBean fileUploader = new FileUploadUIBean(); private String modalEditorContents; @@ -208,7 +208,7 @@ public class ExistingResourceConfigurationUIBean extends AbstractConfigurationUI Configuration mergedConfiguration = null; ConfigurationMaskingUtility.unmaskConfiguration(getConfiguration(), getConfigurationDefinition()); int resourceId = EnterpriseFacesContextUtility.getResource().getId(); - + mergedConfiguration = getMergedConfiguration(); AbstractResourceConfigurationUpdate updateRequest = this.configurationManager .updateStructuredOrRawConfiguration(EnterpriseFacesContextUtility.getSubject(), resourceId, @@ -357,7 +357,8 @@ public class ExistingResourceConfigurationUIBean extends AbstractConfigurationUI } else { current = new RawConfiguration(); current.setPath("/dev/null"); - current.setContents(""); + String sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(""); + current.setContents("", sha256); } } return current; @@ -493,7 +494,8 @@ public class ExistingResourceConfigurationUIBean extends AbstractConfigurationUI String original = new String(getCurrent().getContents()); if (!updated.equals(original)) { current = current.deepCopy(false); - current.setContents(updated); + String sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(updated); + current.setContents(updated, sha256); markCurrentRawConfigUIBeanModified(); getModified().put(current.getPath(), current); diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java index 68a7887..3f1532c 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java @@ -23,12 +23,13 @@ package org.rhq.enterprise.gui.configuration.resource; +import java.io.File; + import org.jboss.seam.core.Events; + import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.RawConfiguration; - -import javax.faces.component.NamingContainer; -import java.io.File; +import org.rhq.core.util.MessageDigestGenerator; public class RawConfigUIBean { @@ -58,7 +59,8 @@ public class RawConfigUIBean { public void setContents(String contents) { Configuration configuration = rawConfiguration.getConfiguration(); configuration.removeRawConfiguration(rawConfiguration); - rawConfiguration.setContents(contents); + String sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(contents); + rawConfiguration.setContents(contents, sha256); configuration.addRawConfiguration(rawConfiguration); fireRawConfigUpdateEvent(); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java index 6f177c7..732f4a3 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java @@ -383,13 +383,12 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf if (liveConfig.getRawConfigurations() != null) { for (RawConfiguration raw : liveConfig.getRawConfigurations()) { - MessageDigestGenerator sha256Generator = new MessageDigestGenerator("SHA-256"); + MessageDigestGenerator sha256Generator = new MessageDigestGenerator(MessageDigestGenerator.SHA_256); sha256Generator.add(raw.getContents().getBytes()); raw.setSha256(sha256Generator.getDigestString()); } } - /* * NOTE: We pass the overlord, since this is a system side-effect. here, the system * and *not* the user, is choosing to persist the most recent configuration because it was different diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerBeanTest.java index 965cbb9..3d6ab03 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerBeanTest.java @@ -18,6 +18,8 @@ */ package org.rhq.enterprise.server.alert.test; +import java.util.Random; + import javax.persistence.EntityManager; import org.testng.annotations.AfterMethod; @@ -90,6 +92,7 @@ public class AlertManagerBeanTest extends AbstractEJB3Test { resource = new Resource("reskey" + now, "resname", resourceType); resource.setAgent(agent); + resource.setUuid("" + new Random().nextInt()); em.persist(resource); AlertDefinition ad = new AlertDefinition(); @@ -112,7 +115,7 @@ public class AlertManagerBeanTest extends AbstractEJB3Test { Alert a = new Alert(ad, now); em.persist(a); - AlertNotificationLog anl = new AlertNotificationLog(a,"dummy"); + AlertNotificationLog anl = new AlertNotificationLog(a, "dummy"); em.persist(anl); } catch (Exception e) { diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java index ed6f88d..84a7bc1 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java @@ -23,7 +23,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Collection; import javax.persistence.EntityManager; @@ -39,6 +38,7 @@ import org.rhq.core.clientapi.agent.configuration.ConfigurationUpdateRequest; import org.rhq.core.clientapi.agent.discovery.DiscoveryAgentService; import org.rhq.core.clientapi.agent.discovery.InvalidPluginConfigurationClientException; import org.rhq.core.clientapi.server.configuration.ConfigurationUpdateResponse; +import org.rhq.core.clientapi.server.discovery.InventoryReport; import org.rhq.core.communications.command.annotation.Asynchronous; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.configuration.Configuration; @@ -46,10 +46,8 @@ import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; import org.rhq.core.domain.configuration.PluginConfigurationUpdate; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.configuration.ResourceConfigurationUpdate; -import org.rhq.core.domain.configuration.RawConfiguration; import org.rhq.core.domain.configuration.group.GroupPluginConfigurationUpdate; import org.rhq.core.domain.discovery.AvailabilityReport; -import org.rhq.core.clientapi.server.discovery.InventoryReport; import org.rhq.core.domain.discovery.MergeResourceResponse; import org.rhq.core.domain.discovery.ResourceSyncInfo; import org.rhq.core.domain.measurement.Availability; @@ -59,6 +57,7 @@ import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageOrdering; +import org.rhq.core.util.exception.ThrowableUtil; import org.rhq.enterprise.server.authz.PermissionException; import org.rhq.enterprise.server.resource.ResourceManagerLocal; import org.rhq.enterprise.server.test.AbstractEJB3Test; @@ -942,7 +941,7 @@ public class ConfigurationManagerBeanTest extends AbstractEJB3Test { void delete(Configuration configuration) { EntityManager entityMgr = getEntityManager(); Configuration managedConfig = entityMgr.find(Configuration.class, configuration.getId()); - entityMgr.remove(managedConfig); + entityMgr.remove(managedConfig); } private class TestServices implements ConfigurationAgentService, DiscoveryAgentService { @@ -989,7 +988,8 @@ public class ConfigurationManagerBeanTest extends AbstractEJB3Test { response = new ConfigurationUpdateResponse(request.getConfigurationUpdateId(), null, ConfigurationUpdateStatus.SUCCESS, null); } else { - mybool.setErrorMessageFromThrowable(new IllegalArgumentException("Not a valid boolean")); + mybool.setErrorMessage(ThrowableUtil.getStackAsString(new IllegalArgumentException( + "Not a valid boolean"))); response = new ConfigurationUpdateResponse(request.getConfigurationUpdateId(), request .getConfiguration(), new NullPointerException("This simulates a failed update")); } @@ -1087,9 +1087,10 @@ public class ConfigurationManagerBeanTest extends AbstractEJB3Test { @Asynchronous(guaranteedDelivery = true) public void synchronizeInventory(ResourceSyncInfo syncInfo) { } - public Configuration validate(Configuration configuration, int resourceId, boolean isStructured) + + public Configuration validate(Configuration configuration, int resourceId, boolean isStructured) throws PluginContainerException { - return null; + return null; } } } diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanTest.java index a8e021c..6f75197 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanTest.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; +import java.util.Random; import java.util.Set; import javax.persistence.EntityManager; @@ -35,10 +36,10 @@ import org.testng.annotations.Test; import org.rhq.core.clientapi.agent.PluginContainerException; import org.rhq.core.clientapi.agent.content.ContentAgentService; -import org.rhq.core.domain.content.transfer.ContentResponseResult; -import org.rhq.core.domain.content.transfer.DeployIndividualPackageResponse; -import org.rhq.core.domain.content.transfer.RemoveIndividualPackageResponse; -import org.rhq.core.domain.content.transfer.RemovePackagesResponse; +import org.rhq.core.clientapi.server.content.ContentDiscoveryReport; +import org.rhq.core.clientapi.server.content.DeletePackagesRequest; +import org.rhq.core.clientapi.server.content.DeployPackagesRequest; +import org.rhq.core.clientapi.server.content.RetrievePackageBitsRequest; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; @@ -55,13 +56,13 @@ import org.rhq.core.domain.content.PackageDetailsKey; import org.rhq.core.domain.content.PackageInstallationStep; import org.rhq.core.domain.content.PackageType; import org.rhq.core.domain.content.PackageVersion; -import org.rhq.core.clientapi.server.content.ContentDiscoveryReport; -import org.rhq.core.clientapi.server.content.DeletePackagesRequest; +import org.rhq.core.domain.content.transfer.ContentResponseResult; +import org.rhq.core.domain.content.transfer.DeployIndividualPackageResponse; import org.rhq.core.domain.content.transfer.DeployPackageStep; -import org.rhq.core.clientapi.server.content.DeployPackagesRequest; import org.rhq.core.domain.content.transfer.DeployPackagesResponse; +import org.rhq.core.domain.content.transfer.RemoveIndividualPackageResponse; +import org.rhq.core.domain.content.transfer.RemovePackagesResponse; import org.rhq.core.domain.content.transfer.ResourcePackageDetails; -import org.rhq.core.clientapi.server.content.RetrievePackageBitsRequest; import org.rhq.core.domain.criteria.PackageVersionCriteria; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceCategory; @@ -638,8 +639,7 @@ public class ContentManagerBeanTest extends AbstractEJB3Test { // Add a few tests for the new Criteria Search feature PackageVersionCriteria criteria = new PackageVersionCriteria(); criteria.addFilterResourceId(resource1.getId()); - PageList<PackageVersion> pageList = contentManager.findPackageVersionsByCriteria(overlord, - criteria); + PageList<PackageVersion> pageList = contentManager.findPackageVersionsByCriteria(overlord, criteria); assertNotNull(pageList); ArrayList<PackageVersion> pvs = pageList.getValues(); assertEquals(2, pvs.size()); @@ -1480,6 +1480,7 @@ public class ContentManagerBeanTest extends AbstractEJB3Test { // Create resource against which we'll merge the discovery report resource1 = new Resource("parent" + System.currentTimeMillis(), "name", resourceType1); + resource1.setUuid("" + new Random().nextInt()); em.persist(resource1); // Install packages on the resource diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentSourceManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentSourceManagerBeanTest.java index ef435fc..626a259 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentSourceManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentSourceManagerBeanTest.java @@ -23,6 +23,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Random; import java.util.Set; import javax.persistence.EntityManager; @@ -1034,6 +1035,7 @@ public class ContentSourceManagerBeanTest extends AbstractEJB3Test { // Create resource against which we'll merge the discovery report resource1 = new Resource("parent" + System.currentTimeMillis(), "name", resourceType1); + resource1.setUuid("" + new Random().nextInt()); em.persist(resource1); // Install packages on the resource diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanEligiblePackagesTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanEligiblePackagesTest.java index 3c205f4..c74ea86 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanEligiblePackagesTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanEligiblePackagesTest.java @@ -18,6 +18,8 @@ */ package org.rhq.enterprise.server.content.test; +import java.util.Random; + import javax.persistence.EntityManager; import javax.persistence.Query; @@ -153,6 +155,7 @@ public class ContentUIManagerBeanEligiblePackagesTest extends AbstractEJB3Test { // Create resource against which we'll be retrieving packages resource = new Resource("parent" + System.currentTimeMillis(), "name", resourceType); + resource.setUuid("" + new Random().nextInt()); resource.setVersion("1.0"); em.persist(resource); diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/test/DiscoveryBossBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/test/DiscoveryBossBeanTest.java index 3c55c36..930ec84 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/test/DiscoveryBossBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/test/DiscoveryBossBeanTest.java @@ -22,12 +22,16 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.util.Random; + import javax.management.MBeanServer; import javax.management.MBeanServerFactory; import javax.persistence.EntityManager; + import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; + import org.jboss.mx.util.MBeanServerLocator; import org.rhq.core.clientapi.server.discovery.InventoryReport; @@ -91,6 +95,11 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test { server.addChildResource(service1); server.addChildResource(service2); + platform.setUuid("" + new Random().nextInt()); + server.setUuid("" + new Random().nextInt()); + service1.setUuid("" + new Random().nextInt()); + service2.setUuid("" + new Random().nextInt()); + inventoryReport.addAddedRoot(platform); ResourceSyncInfo syncInfo = discoveryBoss.mergeInventoryReport(serialize(inventoryReport)); @@ -112,6 +121,7 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test { // First just submit the platform InventoryReport inventoryReport = new InventoryReport(agent); Resource platform = new Resource("alpha", "platform", platformType); + platform.setUuid("" + new Random().nextInt()); inventoryReport.addAddedRoot(platform); ResourceSyncInfo syncInfo = discoveryBoss.mergeInventoryReport(serialize(inventoryReport)); assert syncInfo != null; @@ -127,6 +137,10 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test { server.addChildResource(service1); server.addChildResource(service2); + server.setUuid("" + new Random().nextInt()); + service1.setUuid("" + new Random().nextInt()); + service2.setUuid("" + new Random().nextInt()); + inventoryReport.addAddedRoot(server); syncInfo = discoveryBoss.mergeInventoryReport(serialize(inventoryReport)); diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/event/test/EventManagerTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/event/test/EventManagerTest.java index 7f98751..c96ff3d 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/event/test/EventManagerTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/event/test/EventManagerTest.java @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Random; import java.util.Set; import javax.persistence.EntityManager; @@ -176,6 +177,7 @@ public class EventManagerTest extends AbstractEJB3Test { ResourceType resourceType = new ResourceType("fake platform", "fake plugin", ResourceCategory.PLATFORM, null); em.persist(resourceType); Resource platform = new Resource("org.jboss.on.TestPlatform", "Fake Platform", resourceType); + platform.setUuid("" + new Random().nextInt()); em.persist(platform); em.flush(); diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java index 01a0abb..1628b5f 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.List; +import java.util.Random; import javax.persistence.EntityManager; import javax.persistence.Query; @@ -1058,6 +1059,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { em.persist(theResourceType); theResource = new Resource("test-platform-key", "test-platform-name", theResourceType); + theResource.setUuid("" + new Random().nextInt()); theResource.setAgent(theAgent); em.persist(theResource); @@ -1079,6 +1081,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { newResource = new Resource("test-platform-key-" + uniqueNumber, "test-platform-name-" + uniqueNumber, theResourceType); + newResource.setUuid("" + new Random().nextInt()); newResource.setAgent(theAgent); parentResource.addChildResource(newResource); em.persist(newResource); diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java index c1723cb..3bbb457 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java @@ -21,6 +21,7 @@ package org.rhq.enterprise.server.measurement.test; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Random; import javax.persistence.EntityManager; import javax.persistence.Query; @@ -403,10 +404,12 @@ public class MeasurementBaselineManagerTest extends AbstractEJB3Test { em.persist(platformType); platform = new Resource("platform1", "testAutoBaseline Platform One", platformType); + platform.setUuid("" + new Random().nextInt()); em.persist(platform); platform.setAgent(agent); platform2 = new Resource("platform2", "testAutoBaseline Platform Two", platformType); + platform2.setUuid("" + new Random().nextInt()); // deleteResource removes the agent, so we can't have two direct platforms for it, make one a child of the other platform.addChildResource(platform2); em.persist(platform2); @@ -498,6 +501,7 @@ public class MeasurementBaselineManagerTest extends AbstractEJB3Test { Resource root = null; for (int r = 0; r < resourceCount; r++) { Resource resource = new Resource(String.valueOf(r), "testAutoBaselineResource" + r, platformType); + resource.setUuid("" + new Random().nextInt()); if (root == null) { root = resource; } else { diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementViewManagerTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementViewManagerTest.java index 480b889..bb7b9a2 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementViewManagerTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementViewManagerTest.java @@ -9,6 +9,7 @@ import javax.persistence.Query; import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeSuite; import org.testng.annotations.BeforeTest; +import org.testng.annotations.Test; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.measurement.MeasurementDefinition; @@ -35,6 +36,7 @@ public class MeasurementViewManagerTest extends AbstractEJB3Test { private Subject overlord; + @Test public void testAll() { // TODO: jmarques - write unit tests for MeasurementViewManager } @@ -61,6 +63,7 @@ public class MeasurementViewManagerTest extends AbstractEJB3Test { resources = new ArrayList<Resource>(); for (int i = 0; i < SIZE; i++) { Resource resource = new Resource(prefix + "key " + i, prefix + "key " + i, type); + resource.setUuid(resource.getResourceKey()); resources.add(resource); em.persist(resource); } diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java index 44e4c4f..d7c97ed 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java @@ -20,6 +20,7 @@ package org.rhq.enterprise.server.operation; import java.util.Date; import java.util.List; +import java.util.Random; import javax.ejb.EJBException; import javax.persistence.EntityManager; @@ -1598,6 +1599,7 @@ public class OperationManagerBeanTest extends AbstractEJB3Test { em.flush(); resource = new Resource("reskey" + System.currentTimeMillis(), "resname", resourceType); + resource.setUuid("" + new Random().nextInt()); resource.setAgent(agent); em.persist(resource); diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/RecursiveResourceGroupTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/RecursiveResourceGroupTest.java index d2829cd..e4d60e4 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/RecursiveResourceGroupTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/RecursiveResourceGroupTest.java @@ -21,6 +21,7 @@ package org.rhq.enterprise.server.resource.group.test; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Random; import javax.persistence.EntityManager; @@ -94,6 +95,7 @@ public class RecursiveResourceGroupTest extends AbstractEJB3Test { // test update implicit resources Resource newChildOfNodeA = new Resource("new nodeOne child", "new nodeOne child", nodeA.getResourceType()); + newChildOfNodeA.setUuid("" + new Random().nextInt()); resourceManager.createResource(subject, newChildOfNodeA, nodeA.getId()); // sets up implicit relationships @@ -140,6 +142,7 @@ public class RecursiveResourceGroupTest extends AbstractEJB3Test { // test update implicit resources Resource gen5 = new Resource("g5", "g5", gen4.getResourceType()); + gen5.setUuid("" + new Random().nextInt()); resourceManager.createResource(subject, gen5, gen4.getId()); // sets up implicit relationships // confirm results diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateEventsSubsystemTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateEventsSubsystemTest.java index c53c95f..550fd11 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateEventsSubsystemTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateEventsSubsystemTest.java @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Map; +import java.util.Random; import java.util.Set; import javax.persistence.EntityManager; @@ -152,6 +153,7 @@ public class UpdateEventsSubsystemTest extends UpdateSubsytemTestBase { platform = getResourceType("events"); testResource = new Resource("-test-", "-test resource", platform); + testResource.setUuid("" + new Random().nextInt()); entityManager.persist(testResource); setUpAgent(entityManager, testResource); diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateMeasurementSubsystemTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateMeasurementSubsystemTest.java index 035968c..43d33fe 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateMeasurementSubsystemTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateMeasurementSubsystemTest.java @@ -20,6 +20,7 @@ package org.rhq.enterprise.server.resource.metadata.test; import java.util.Iterator; import java.util.List; +import java.util.Random; import java.util.Set; import javax.persistence.EntityManager; @@ -185,6 +186,7 @@ public class UpdateMeasurementSubsystemTest extends UpdateSubsytemTestBase { * Create a Fake Resource and a MeasurementSchedule */ Resource testResource = new Resource("-test-", "-test resource", server); + testResource.setUuid("" + new Random().nextInt()); entityManager.persist(testResource); MeasurementSchedule sched = new MeasurementSchedule(definitions1.iterator().next(), testResource); @@ -295,6 +297,7 @@ public class UpdateMeasurementSubsystemTest extends UpdateSubsytemTestBase { * Create a Fake Resource and a MeasurementSchedule */ Resource testResource = new Resource("-test-", "-test resource", platform); + testResource.setUuid("" + new Random().nextInt()); entityManager.persist(testResource); setUpAgent(entityManager, testResource); diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java index f2967fc..a93f3ca 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java @@ -21,6 +21,7 @@ package org.rhq.enterprise.server.resource.test; import java.io.InputStream; import java.net.URL; import java.util.List; +import java.util.Random; import java.util.Set; import javax.persistence.EntityManager; @@ -449,6 +450,7 @@ public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test { // Create parent resource off of which to hang created resources parentResource = new Resource("parent" + System.currentTimeMillis(), "name", parentResourceType); + parentResource.setUuid("" + new Random().nextInt()); em.persist(parentResource); } catch (Exception e) { System.out.println(e); @@ -512,6 +514,7 @@ public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test { try { try { resource = new Resource("child" + System.currentTimeMillis(), "name", parentResourceType); + resource.setUuid("" + new Random().nextInt()); resource.setParentResource(parentResource); resource.setInventoryStatus(InventoryStatus.COMMITTED); em.persist(resource); diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java index f4a49d0..7400a9b 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java @@ -19,6 +19,7 @@ package org.rhq.enterprise.server.resource.test; import java.util.List; +import java.util.Random; import javax.persistence.EntityManager; @@ -139,6 +140,7 @@ public class ResourceManagerBeanTest extends UpdateSubsytemTestBase { em.flush(); resource = new Resource("reskey" + System.currentTimeMillis(), "resname", resourceType); + resource.setUuid("" + new Random().nextInt()); resource.setAgent(agent); em.persist(resource); } catch (Exception e) { diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java index 54aed90..3de6865 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java @@ -24,6 +24,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Random; import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -423,7 +424,7 @@ public class DataPurgeJobTest extends AbstractEJB3Test { Alert a = new Alert(ad, timestamp); em.persist(a); - AlertNotificationLog anl = new AlertNotificationLog(a,"dummy"); + AlertNotificationLog anl = new AlertNotificationLog(a, "dummy"); em.persist(anl); AlertCondition ac = ad.getConditions().iterator().next(); @@ -454,6 +455,7 @@ public class DataPurgeJobTest extends AbstractEJB3Test { em.flush(); resource = new Resource("reskey" + now, "resname", resourceType); + resource.setUuid("" + new Random().nextInt()); resource.setAgent(agent); em.persist(resource); diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/util/ResourceTreeHelper.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/util/ResourceTreeHelper.java index 91420e1..49a514b 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/util/ResourceTreeHelper.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/util/ResourceTreeHelper.java @@ -23,6 +23,7 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Random; import javax.persistence.EntityManager; @@ -95,6 +96,7 @@ public class ResourceTreeHelper { parentResource = resources.get(parent); } else { parentResource = new Resource(parent, parent, fakeType); + parentResource.setUuid("" + new Random().nextInt()); resources.put(parent, parentResource); } @@ -107,6 +109,7 @@ public class ResourceTreeHelper { childResource = resources.get(child); } else { childResource = new Resource(child, child, fakeType); + childResource.setUuid("" + new Random().nextInt()); resources.put(child, childResource); } diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java index 61b012f..45412c4 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java @@ -21,6 +21,7 @@ package org.rhq.enterprise.server.util; import java.util.ArrayList; import java.util.Collection; import java.util.EnumSet; +import java.util.Random; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; @@ -173,6 +174,7 @@ public class SessionTestHelper { resourceName = preprocess(resourceName); Resource resource = new Resource(resourceName, resourceName, type); + resource.setUuid("" + new Random().nextInt()); group.addExplicitResource(resource); resource.getExplicitGroups().add(group); @@ -207,6 +209,7 @@ public class SessionTestHelper { resourceName = preprocess(resourceName); ResourceType type = new ResourceType(preprocess("testType"), "testPlugin", ResourceCategory.PLATFORM, null); Resource resource = new Resource(resourceName, resourceName, type); + resource.setUuid("" + new Random().nextInt()); em.persist(type); em.persist(resource); diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApachePluginTest.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApachePluginTest.java index 0d1b7be..a1a42c1 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApachePluginTest.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApachePluginTest.java @@ -24,6 +24,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; + import org.testng.annotations.AfterSuite; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; @@ -114,7 +115,8 @@ public class ApachePluginTest { } } - @Test(dependsOnMethods = "testServiceDiscovery") + @Test(dependsOnMethods = "testServiceDiscovery", enabled = false) + // TODO: this is not a unit test - it requires an apache server to be running with snmp enabled public void testMeasurementComponent() throws Exception { Resource platform = PluginContainer.getInstance().getInventoryManager().getPlatform(); for (Resource server : platform.getChildResources()) { diff --git a/modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/helper/AugeasRawConfigHelper.java b/modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/helper/AugeasRawConfigHelper.java index dd900cf..4d42e0d 100644 --- a/modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/helper/AugeasRawConfigHelper.java +++ b/modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/helper/AugeasRawConfigHelper.java @@ -33,6 +33,7 @@ import org.apache.commons.io.FileUtils; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.Property; import org.rhq.core.domain.configuration.RawConfiguration; +import org.rhq.core.util.MessageDigestGenerator; /** * @author paji @@ -82,7 +83,9 @@ public class AugeasRawConfigHelper { aug.save(); toUpdate.setPath(existingConfig.getPath()); - toUpdate.setContents(FileUtils.readFileToString(new File(file))); + String contents = FileUtils.readFileToString(new File(file)); + String sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(contents); + toUpdate.setContents(contents, sha256); } finally { if (aug != null) { aug.close(); diff --git a/modules/plugins/cobbler/src/main/java/org/rhq/plugins/cobbler/CobblerComponent.java b/modules/plugins/cobbler/src/main/java/org/rhq/plugins/cobbler/CobblerComponent.java index 3e80c01..97f52cb 100644 --- a/modules/plugins/cobbler/src/main/java/org/rhq/plugins/cobbler/CobblerComponent.java +++ b/modules/plugins/cobbler/src/main/java/org/rhq/plugins/cobbler/CobblerComponent.java @@ -37,6 +37,7 @@ import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.pluginapi.configuration.ResourceConfigurationFacet; import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; import org.rhq.core.pluginapi.inventory.ResourceContext; +import org.rhq.core.util.MessageDigestGenerator; import org.rhq.plugins.augeas.AugeasConfigurationComponent; import org.rhq.plugins.augeas.helper.AugeasNode; import org.rhq.plugins.augeas.helper.AugeasRawConfigHelper; @@ -123,12 +124,16 @@ public class CobblerComponent extends AugeasConfigurationComponent implements Au Set<RawConfiguration> configs = new HashSet<RawConfiguration>(); RawConfiguration modules = new RawConfiguration(); modules.setPath(MODULES_PATH); - modules.setContents(FileUtils.readFileToString(new File(MODULES_PATH))); + String contents = FileUtils.readFileToString(new File(MODULES_PATH)); + String sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(contents); + modules.setContents(contents, sha256); configs.add(modules); RawConfiguration settings = new RawConfiguration(); settings.setPath(SETTINGS_PATH); - settings.setContents(FileUtils.readFileToString(new File(SETTINGS_PATH))); + contents = FileUtils.readFileToString(new File(SETTINGS_PATH)); + sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(contents); + settings.setContents(contents, sha256); configs.add(settings); return configs; } catch (Exception e) { diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java index 0e93097..33a64db 100644 --- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java @@ -65,6 +65,7 @@ import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.measurement.MeasurementFacet; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; +import org.rhq.core.util.exception.ThrowableUtil; /** * A generic JMX MBean resource component that can be used to manage a JMX MBean. The resource's plugin configuration @@ -493,7 +494,7 @@ public class MBeanResourceComponent<T extends JMXComponent> implements Measureme } } } catch (Exception e) { - property.setErrorMessageFromThrowable(e); + property.setErrorMessage(ThrowableUtil.getStackAsString(e)); report .setErrorMessage("Failed setting resource configuration - see property error messages for details"); log.info("Failure setting MBean Resource configuration value", e); diff --git a/modules/plugins/nss/src/main/java/org/rhq/plugin/nss/NameServiceSwitchComponent.java b/modules/plugins/nss/src/main/java/org/rhq/plugin/nss/NameServiceSwitchComponent.java index b1dbcc6..830c648 100644 --- a/modules/plugins/nss/src/main/java/org/rhq/plugin/nss/NameServiceSwitchComponent.java +++ b/modules/plugins/nss/src/main/java/org/rhq/plugin/nss/NameServiceSwitchComponent.java @@ -43,6 +43,7 @@ import org.rhq.core.pluginapi.inventory.ResourceComponent; import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; +import org.rhq.core.util.MessageDigestGenerator; /** * Allows the RHQ server to manage the Name Server Switch Configuration for a Linux Platform @@ -180,7 +181,9 @@ public class NameServiceSwitchComponent implements ResourceComponent<NameService raw.setPath(ETC_NSSWITCH_CONF); - raw.setContents(getContents(new File(raw.getPath()))); + String contents = getContents(new File(raw.getPath())); + String sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(contents); + raw.setContents(contents, sha256); raws.add(raw); return raws; diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatGroupComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatGroupComponent.java index 1d70f43..89b2ce2 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatGroupComponent.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatGroupComponent.java @@ -28,12 +28,14 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.mc4j.ems.connection.bean.attribute.EmsAttribute; + import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; import org.rhq.core.pluginapi.inventory.DeleteResourceFacet; import org.rhq.core.pluginapi.inventory.ResourceContext; +import org.rhq.core.util.exception.ThrowableUtil; import org.rhq.plugins.jmx.MBeanResourceComponent; /** @@ -41,7 +43,8 @@ import org.rhq.plugins.jmx.MBeanResourceComponent; * * @author Jay Shaughnessy */ -public class TomcatGroupComponent extends MBeanResourceComponent<TomcatUserDatabaseComponent> implements DeleteResourceFacet { +public class TomcatGroupComponent extends MBeanResourceComponent<TomcatUserDatabaseComponent> implements + DeleteResourceFacet { public static final String CONFIG_DESCRIPTION = "description"; public static final String CONFIG_GROUP_NAME = "groupname"; @@ -116,7 +119,7 @@ public class TomcatGroupComponent extends MBeanResourceComponent<TomcatUserDatab try { consolidateSettings(newRoles, currentRoles, "addRole", "removeRole", "role"); } catch (Exception e) { - newRoles.setErrorMessageFromThrowable(e); + newRoles.setErrorMessage(ThrowableUtil.getStackAsString(e)); report.setErrorMessage("Failed setting resource configuration - see property error messages for details"); log.info("Failure setting Tomcat User Roles configuration value", e); return; @@ -131,7 +134,8 @@ public class TomcatGroupComponent extends MBeanResourceComponent<TomcatUserDatab } } - private void consolidateSettings(PropertySimple newVals, PropertySimple currentVals, String addOp, String removeOp, String arg) throws Exception { + private void consolidateSettings(PropertySimple newVals, PropertySimple currentVals, String addOp, String removeOp, + String arg) throws Exception { // add new values not in the current settings String currentValsLongString = currentVals.getStringValue(); @@ -149,7 +153,8 @@ public class TomcatGroupComponent extends MBeanResourceComponent<TomcatUserDatab try { invokeOperation(addOp, opConfig); } catch (Exception e) { - throw new IllegalArgumentException("Could not add " + arg + "=" + newVal + ". Please check spelling/existence."); + throw new IllegalArgumentException("Could not add " + arg + "=" + newVal + + ". Please check spelling/existence."); } } } @@ -164,7 +169,8 @@ public class TomcatGroupComponent extends MBeanResourceComponent<TomcatUserDatab try { invokeOperation(removeOp, opConfig); } catch (Exception e) { - throw new IllegalArgumentException("Could not remove " + arg + "=" + currentVal + ". Please check spelling/existence."); + throw new IllegalArgumentException("Could not remove " + arg + "=" + currentVal + + ". Please check spelling/existence."); } } } diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserComponent.java index a57b388..52efaac 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserComponent.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserComponent.java @@ -28,12 +28,14 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.mc4j.ems.connection.bean.attribute.EmsAttribute; + import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; import org.rhq.core.pluginapi.inventory.DeleteResourceFacet; import org.rhq.core.pluginapi.inventory.ResourceContext; +import org.rhq.core.util.exception.ThrowableUtil; import org.rhq.plugins.jmx.MBeanResourceComponent; /** @@ -41,7 +43,8 @@ import org.rhq.plugins.jmx.MBeanResourceComponent; * * @author Jay Shaughnessy */ -public class TomcatUserComponent extends MBeanResourceComponent<TomcatUserDatabaseComponent> implements DeleteResourceFacet { +public class TomcatUserComponent extends MBeanResourceComponent<TomcatUserDatabaseComponent> implements + DeleteResourceFacet { public static final String CONFIG_FULL_NAME = "fullName"; public static final String CONFIG_GROUPS = "groups"; @@ -51,7 +54,8 @@ public class TomcatUserComponent extends MBeanResourceComponent<TomcatUserDataba public static final String PLUGIN_CONFIG_NAME = "name"; public static final String RESOURCE_TYPE_NAME = "Tomcat User"; - private static final Pattern PATTERN_GROUP_NAME = Pattern.compile(TomcatGroupComponent.CONFIG_GROUP_NAME + "=\"(.*)\""); + private static final Pattern PATTERN_GROUP_NAME = Pattern.compile(TomcatGroupComponent.CONFIG_GROUP_NAME + + "=\"(.*)\""); private static final Pattern PATTERN_ROLE_NAME = Pattern.compile(TomcatRoleComponent.CONFIG_ROLE_NAME + "=(.*),"); /** @@ -123,9 +127,10 @@ public class TomcatUserComponent extends MBeanResourceComponent<TomcatUserDataba // try updating the group settings try { - consolidateSettings(newGroups, currentGroups, "addGroup", "removeGroup", TomcatGroupComponent.CONFIG_GROUP_NAME); + consolidateSettings(newGroups, currentGroups, "addGroup", "removeGroup", + TomcatGroupComponent.CONFIG_GROUP_NAME); } catch (Exception e) { - newGroups.setErrorMessageFromThrowable(e); + newGroups.setErrorMessage(ThrowableUtil.getStackAsString(e)); report.setErrorMessage("Failed setting resource configuration - see property error messages for details"); log.info("Failure setting Tomcat User Groups configuration value", e); return; @@ -135,7 +140,7 @@ public class TomcatUserComponent extends MBeanResourceComponent<TomcatUserDataba try { consolidateSettings(newRoles, currentRoles, "addRole", "removeRole", "role"); } catch (Exception e) { - newRoles.setErrorMessageFromThrowable(e); + newRoles.setErrorMessage(ThrowableUtil.getStackAsString(e)); report.setErrorMessage("Failed setting resource configuration - see property error messages for details"); log.info("Failure setting Tomcat User Roles configuration value", e); return; @@ -150,7 +155,8 @@ public class TomcatUserComponent extends MBeanResourceComponent<TomcatUserDataba } } - private void consolidateSettings(PropertySimple newVals, PropertySimple currentVals, String addOp, String removeOp, String arg) throws Exception { + private void consolidateSettings(PropertySimple newVals, PropertySimple currentVals, String addOp, String removeOp, + String arg) throws Exception { // add new values not in the current settings String currentValsLongString = currentVals.getStringValue(); @@ -168,7 +174,8 @@ public class TomcatUserComponent extends MBeanResourceComponent<TomcatUserDataba try { invokeOperation(addOp, opConfig); } catch (Exception e) { - throw new IllegalArgumentException("Could not add " + arg + "=" + newVal + ". Please check spelling/existence."); + throw new IllegalArgumentException("Could not add " + arg + "=" + newVal + + ". Please check spelling/existence."); } } } @@ -183,7 +190,8 @@ public class TomcatUserComponent extends MBeanResourceComponent<TomcatUserDataba try { invokeOperation(removeOp, opConfig); } catch (Exception e) { - throw new IllegalArgumentException("Could not remove " + arg + "=" + currentVal + ". Please check spelling/existence."); + throw new IllegalArgumentException("Could not remove " + arg + "=" + currentVal + + ". Please check spelling/existence."); } } } diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java index 74ccb7d..e8d6e8b 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java @@ -54,6 +54,7 @@ import org.rhq.core.pluginapi.content.ContentServices; import org.rhq.core.pluginapi.inventory.ApplicationServerComponent; import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet; import org.rhq.core.pluginapi.inventory.CreateResourceReport; +import org.rhq.core.util.exception.ThrowableUtil; import org.rhq.plugins.jmx.MBeanResourceComponent; /** @@ -132,7 +133,7 @@ public class TomcatVHostComponent extends MBeanResourceComponent<TomcatServerCom try { consolidateSettings(newAliases, currentAliases, "addAlias", "removeAlias", "alias"); } catch (Exception e) { - newAliases.setErrorMessageFromThrowable(e); + newAliases.setErrorMessage(ThrowableUtil.getStackAsString(e)); report.setErrorMessage("Failed setting resource configuration - see property error messages for details"); log.info("Failure setting Tomcat VHost aliases configuration value", e); }

1 0

[rhq] Branch 'gwt' - modules/core
by mazz 22 Mar '10

22 Mar '10

modules/core/domain/src/main/java/org/rhq/core/domain/cloud/composite/FailoverListComposite.java | 63 ++++------ 1 file changed, 30 insertions(+), 33 deletions(-) New commits: commit 6c4b785259bdd080d9cf46e20cd4bbae3f407b61 Author: John Mazzitelli <mazz(a)redhat.com> Date: Sun Mar 21 21:52:17 2010 -0400 fix this so the test passes again, this was a legit test failure diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/composite/FailoverListComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/composite/FailoverListComposite.java index 46bc7c9..fe4510e 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/composite/FailoverListComposite.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/composite/FailoverListComposite.java @@ -152,10 +152,11 @@ public class FailoverListComposite implements Iterator<FailoverListComposite.Ser } public void remove() { - throw new UnsupportedOperationException(this.getClass().getName().substring(this.getClass().getName().lastIndexOf(".")+1) + " are immutable lists, removal is disallowed"); + throw new UnsupportedOperationException(this.getClass().getName().substring( + this.getClass().getName().lastIndexOf(".") + 1) + + " are immutable lists, removal is disallowed"); } - /** * Used to "serialize" this list in a human-readable form (useful for storing the list * in a text file that humans can read and potentially edit). @@ -182,13 +183,9 @@ public class FailoverListComposite implements Iterator<FailoverListComposite.Ser public static FailoverListComposite readAsText(String text) { List<ServerEntry> servers = new ArrayList<ServerEntry>(); - String[] failoverListArray = text.split("."); - // TODO: GWT (Check to make sure this works) - //StringTokenizer rowTokenizer = new StringTokenizer(text, "\n"); - //while (rowTokenizer.hasMoreTokens()) { + String[] failoverListArray = text.split("\n"); for (String row : failoverListArray) { try { - //String row = rowTokenizer.nextToken(); String[] addressPorts = row.split(":"); String[] ports = addressPorts[1].split("/"); servers.add(new ServerEntry(addressPorts[0], Integer.parseInt(ports[0]), Integer.parseInt(ports[1]))); @@ -199,34 +196,34 @@ public class FailoverListComposite implements Iterator<FailoverListComposite.Ser return new FailoverListComposite(servers); } - /* TODO: GWT - private void writeObject(ObjectOutputStream out) throws IOException { - out.writeInt(size()); - for (ServerEntry entry : servers) { - out.writeUTF(entry.address); - out.writeInt(entry.port); - out.writeInt(entry.securePort); - } - } - - private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { - int size = in.readInt(); - - List<ServerEntry> entries = new ArrayList<ServerEntry>(); - for (int i = 0; i < size; i++) { - String address = in.readUTF(); - int port = in.readInt(); - int securePort = in.readInt(); - entries.add(new ServerEntry(address, port, securePort)); - } + /* TODO: GWT + private void writeObject(ObjectOutputStream out) throws IOException { + out.writeInt(size()); + for (ServerEntry entry : servers) { + out.writeUTF(entry.address); + out.writeInt(entry.port); + out.writeInt(entry.securePort); + } + } + + private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { + int size = in.readInt(); + + List<ServerEntry> entries = new ArrayList<ServerEntry>(); + for (int i = 0; i < size; i++) { + String address = in.readUTF(); + int port = in.readInt(); + int securePort = in.readInt(); + entries.add(new ServerEntry(address, port, securePort)); + } - *//* - * no need to wrap 'entries' in a new list before putting them into the immutable wrapper; - * as long as the 'entries' reference does not escape this method, we can be assured that - * 'servers' is correctly immutable. *//* - servers = Collections.unmodifiableList(entries); - }*/ + * no need to wrap 'entries' in a new list before putting them into the immutable wrapper; + * as long as the 'entries' reference does not escape this method, we can be assured that + * 'servers' is correctly immutable. + *//* + servers = Collections.unmodifiableList(entries); + }*/ @Override public String toString() {

1 0

[rhq] Branch 'gwt' - 5 commits - modules/core modules/enterprise
by mazz 21 Mar '10

21 Mar '10

modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml | 1 modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 5 modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java | 34 ++ modules/core/domain/src/test/java/org/rhq/core/domain/bundle/test/BundleTest.java | 128 +++++++++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleInfoStep.java | 49 +-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUpdateWizard.java | 77 ++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadRecipeStep.java | 48 ++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java | 9 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java | 55 +++- modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java | 72 +++++ 11 files changed, 415 insertions(+), 67 deletions(-) New commits: commit 9ec7d86384c56c7e04a5e2df8834b01fb7c415bb Author: John Mazzitelli <mazz(a)redhat.com> Date: Sun Mar 21 08:48:32 2010 -0400 use the new versionOrder column so we can create bundle versions in the proper ordering. this way we can determine which is the latest version of a bundle diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java index a3b01f4..3c74dfe 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java @@ -53,17 +53,21 @@ import org.rhq.core.domain.content.Distribution; */ @Entity @NamedQueries( { - @NamedQuery(name = BundleVersion.UPDATE_VERSION_ORDER, query = "UPDATE BundleVersion bv SET bv.versionOrder = (bv.versionOrder+1) WHERE bv.name = :name AND bv.versionOrder >= :versionOrder"), // - @NamedQuery(name = BundleVersion.QUERY_FIND_LATEST_BY_NAME, query = "" // + @NamedQuery(name = BundleVersion.UPDATE_VERSION_ORDER_BY_BUNDLE_ID, query = "" // + + "UPDATE BundleVersion bv "// + + " SET bv.versionOrder = (bv.versionOrder+1) " // + + " WHERE bv.bundle.id = :bundleId " // + + " AND bv.versionOrder >= :versionOrder"), // + @NamedQuery(name = BundleVersion.QUERY_FIND_LATEST_BY_BUNDLE_ID, query = "" // + "SELECT bv " // + " FROM BundleVersion bv " // - + " WHERE bv.name = :name " // - + " AND bv.versionOrder = (SELECT MAX(bv2.versionOrder) FROM BundleVersion bv2 WHERE bv2.name = :name) "), // + + " WHERE bv.bundle.id = :bundleId " // + + " AND bv.versionOrder = (SELECT MAX(bv2.versionOrder) FROM BundleVersion bv2 WHERE bv2.bundle.id = :bundleId) "), // // this returns a desc ordered list of a 2-D array - first element in array is the version string, second is its associated version order - @NamedQuery(name = BundleVersion.QUERY_FIND_VERSIONS_BY_NAME, query = "" // + @NamedQuery(name = BundleVersion.QUERY_FIND_VERSION_INFO_BY_BUNDLE_ID, query = "" // + "SELECT bv.version, bv.versionOrder " // + " FROM BundleVersion bv " // - + " WHERE bv.name = :name " // + + " WHERE bv.bundle.id = :bundleId " // + " ORDER BY bv.versionOrder DESC "), // @NamedQuery(name = BundleVersion.QUERY_FIND_ALL, query = "SELECT bv FROM BundleVersion bv "), // @NamedQuery(name = BundleVersion.QUERY_FIND_BY_NAME, query = "SELECT bv FROM BundleVersion bv WHERE bv.name = :name ") // @@ -74,9 +78,9 @@ import org.rhq.core.domain.content.Distribution; public class BundleVersion implements Serializable { private static final long serialVersionUID = 1L; - public static final String UPDATE_VERSION_ORDER = "BundleVersion.updateVersionOrder"; - public static final String QUERY_FIND_LATEST_BY_NAME = "BundleVersion.findLatestByName"; - public static final String QUERY_FIND_VERSIONS_BY_NAME = "BundleVersion.findVersionsByName"; + public static final String UPDATE_VERSION_ORDER_BY_BUNDLE_ID = "BundleVersion.updateVersionOrderByBundleId"; + public static final String QUERY_FIND_LATEST_BY_BUNDLE_ID = "BundleVersion.findLatestByBundleId"; + public static final String QUERY_FIND_VERSION_INFO_BY_BUNDLE_ID = "BundleVersion.findVersionsByBundleId"; public static final String QUERY_FIND_ALL = "BundleVersion.findAll"; public static final String QUERY_FIND_BY_NAME = "BundleVersion.findByName"; diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/bundle/test/BundleTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/bundle/test/BundleTest.java index 42ed4ab..2004766 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/bundle/test/BundleTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/bundle/test/BundleTest.java @@ -243,9 +243,21 @@ public class BundleTest extends AbstractEJB3Test { assert id > 0; assert bundle.getBundleType().getId() != 0 : "bundleType should have been cascade persisted too"; + // make sure these queries can return empty lists + Query q = em.createNamedQuery(BundleVersion.QUERY_FIND_LATEST_BY_BUNDLE_ID); + q.setParameter("bundleId", bundle.getId()); + assert q.getResultList().size() == 0; + q = em.createNamedQuery(BundleVersion.QUERY_FIND_VERSION_INFO_BY_BUNDLE_ID); + q.setParameter("bundleId", bundle.getId()); + assert q.getResultList().size() == 0; + q = em.createNamedQuery(BundleVersion.UPDATE_VERSION_ORDER_BY_BUNDLE_ID); + q.setParameter("bundleId", bundle.getId()); + q.setParameter("versionOrder", 0); + assert q.executeUpdate() == 0 : "should not have updated anything"; + BundleVersion bv = new BundleVersion(name, "1.0", bundle, recipe); bv.setVersionOrder(0); - Query q = em.createNamedQuery(BundleVersion.QUERY_FIND_BY_NAME); + q = em.createNamedQuery(BundleVersion.QUERY_FIND_BY_NAME); q.setParameter("name", name); assert q.getResultList().size() == 0; // not in the db yet em.persist(bv); @@ -261,12 +273,12 @@ public class BundleTest extends AbstractEJB3Test { id = bv2.getId(); assert id > 0; - q = em.createNamedQuery(BundleVersion.QUERY_FIND_LATEST_BY_NAME); - q.setParameter("name", name); + q = em.createNamedQuery(BundleVersion.QUERY_FIND_LATEST_BY_BUNDLE_ID); + q.setParameter("bundleId", bundle.getId()); assert q.getResultList().size() == 1; assert ((BundleVersion) q.getSingleResult()).getVersion().equals(bv2.getVersion()); - q = em.createNamedQuery(BundleVersion.QUERY_FIND_VERSIONS_BY_NAME); - q.setParameter("name", name); + q = em.createNamedQuery(BundleVersion.QUERY_FIND_VERSION_INFO_BY_BUNDLE_ID); + q.setParameter("bundleId", bundle.getId()); List<Object[]> versionsArrays = q.getResultList(); // returns in DESC sort order! assert versionsArrays.size() == 2; assert ((String) versionsArrays.get(0)[0]).equals(bv2.getVersion()); @@ -275,8 +287,8 @@ public class BundleTest extends AbstractEJB3Test { assert ((Number) versionsArrays.get(1)[1]).intValue() == bv.getVersionOrder(); // increment all version orders, starting at order #1 - q = em.createNamedQuery(BundleVersion.UPDATE_VERSION_ORDER); - q.setParameter("name", name); + q = em.createNamedQuery(BundleVersion.UPDATE_VERSION_ORDER_BY_BUNDLE_ID); + q.setParameter("bundleId", bundle.getId()); q.setParameter("versionOrder", 1); assert q.executeUpdate() == 1 : "should have auto-incremented version order in one row"; em.flush(); @@ -295,12 +307,12 @@ public class BundleTest extends AbstractEJB3Test { id = bv3.getId(); assert id > 0; - q = em.createNamedQuery(BundleVersion.QUERY_FIND_LATEST_BY_NAME); - q.setParameter("name", name); + q = em.createNamedQuery(BundleVersion.QUERY_FIND_LATEST_BY_BUNDLE_ID); + q.setParameter("bundleId", bundle.getId()); assert q.getResultList().size() == 1; assert ((BundleVersion) q.getSingleResult()).getVersion().equals(bv2.getVersion()); - q = em.createNamedQuery(BundleVersion.QUERY_FIND_VERSIONS_BY_NAME); - q.setParameter("name", name); + q = em.createNamedQuery(BundleVersion.QUERY_FIND_VERSION_INFO_BY_BUNDLE_ID); + q.setParameter("bundleId", bundle.getId()); versionsArrays = q.getResultList(); // returns in DESC sort order! assert versionsArrays.size() == 3; assert ((String) versionsArrays.get(0)[0]).equals(bv2.getVersion()); // 2.0 @@ -311,8 +323,8 @@ public class BundleTest extends AbstractEJB3Test { assert ((Number) versionsArrays.get(2)[1]).intValue() == bv.getVersionOrder(); // increment all version orders, starting at order #0 - makes sure we can update >1 rows - q = em.createNamedQuery(BundleVersion.UPDATE_VERSION_ORDER); - q.setParameter("name", name); + q = em.createNamedQuery(BundleVersion.UPDATE_VERSION_ORDER_BY_BUNDLE_ID); + q.setParameter("bundleId", bundle.getId()); q.setParameter("versionOrder", 0); assert q.executeUpdate() == 3 : "should have auto-incremented version orders"; em.flush(); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java index abc3637..da167f0 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java @@ -36,6 +36,7 @@ import javax.persistence.Query; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.maven.artifact.versioning.ComparableVersion; import org.rhq.core.clientapi.agent.bundle.BundleAgentService; import org.rhq.core.clientapi.agent.bundle.BundleScheduleRequest; @@ -257,8 +258,42 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot // ensure we have a version version = getVersion(version, bundle); + ComparableVersion comparableVersion = new ComparableVersion(version); + + Query q = entityManager.createNamedQuery(BundleVersion.QUERY_FIND_VERSION_INFO_BY_BUNDLE_ID); + q.setParameter("bundleId", bundle.getId()); + List<Object[]> list = q.getResultList(); + int versionOrder = list.size(); + boolean needToUpdateOrder = false; + // find out where in the order of versions this new version should be placed (e.g. 2.0 is after 1.0). + // the query returns a list of arrays - first element in array is version; second is versionOrder + // the query returns list in desc order - since the normal case is we are creating the latest, highest version, + // starting at the current highest version is the most efficient (we'll break the for loop after 1 iteration). + for (Object[] bv : list) { + ComparableVersion bvv = new ComparableVersion(bv[0].toString()); + int comparision = comparableVersion.compareTo(bvv); + if (comparision == 0) { + throw new RuntimeException("Cannot create bundle with version [" + version + "], it already exists"); + } else if (comparision < 0) { + versionOrder = ((Number) bv[1]).intValue(); + needToUpdateOrder = true; + } else { + break; // comparision > 0, means our new version is higher than what's in the DB, because we DESC ordered, we can stop + } + } + + if (needToUpdateOrder) { + entityManager.flush(); + q = entityManager.createNamedQuery(BundleVersion.UPDATE_VERSION_ORDER_BY_BUNDLE_ID); + q.setParameter("bundleId", bundle.getId()); + q.setParameter("versionOrder", versionOrder); + q.executeUpdate(); + entityManager.flush(); + entityManager.clear(); + } BundleVersion bundleVersion = new BundleVersion(name, version, bundle, recipe); + bundleVersion.setVersionOrder(versionOrder); bundleVersion.setDescription(description); bundleVersion.setConfigurationDefinition(results.getConfigDef()); @@ -267,20 +302,26 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } private String getVersion(String version, Bundle bundle) { - if (!(null == version || "".equals(version.trim()))) { + if (null != version && version.trim().length() > 0) { return version; } - BundleVersion currentBundleVersion = null; - for (BundleVersion bundleVersion : bundle.getBundleVersions()) { - if ((null == currentBundleVersion) || (bundleVersion.getId() > currentBundleVersion.getId())) { - currentBundleVersion = bundleVersion; + BundleVersion latestBundleVersion = null; + Query q = entityManager.createNamedQuery(BundleVersion.QUERY_FIND_LATEST_BY_BUNDLE_ID); + q.setParameter("bundleId", bundle.getId()); + List<BundleVersion> list = q.getResultList(); + if (list.size() > 0) { + if (list.size() == 1) { + latestBundleVersion = list.get(0); + } else { + throw new RuntimeException("Bundle [" + bundle.getName() + "] (id=" + bundle.getId() + + ") has more than 1 'latest' version. This should not happen - aborting"); } } // note - this is the same algo used by ResourceClientProxy in updatebackingContent (for a resource) - String oldVersion = (null == currentBundleVersion) ? null : currentBundleVersion.getVersion(); - String newVersion = NumberUtil.autoIncrementVersion(oldVersion); + String latestVersion = latestBundleVersion != null ? latestBundleVersion.getVersion() : null; + String newVersion = NumberUtil.autoIncrementVersion(latestVersion); return newVersion; } diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java index 6cdabc7..24f4a50 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java @@ -259,9 +259,79 @@ public class BundleManagerBeanTest extends UpdateSubsytemTestBase { BundleVersion bv1 = createBundleVersion(b1.getName() + "-1", null, b1); assertNotNull(bv1); assertEquals("1.0", bv1.getVersion()); + assert 0 == bv1.getVersionOrder(); BundleVersion bv2 = createBundleVersion(b1.getName() + "-2", null, b1); assertNotNull(bv2); assertEquals("1.1", bv2.getVersion()); + assert 1 == bv2.getVersionOrder(); + } + + @Test(enabled = TESTS_ENABLED) + public void testCreateBundleVersionOrdering() throws Exception { + Bundle b1 = createBundle("one"); + assertNotNull(b1); + BundleVersion bv1 = createBundleVersion(b1.getName() + "-1", "1.0", b1); + assertNotNull(bv1); + assertEquals("1.0", bv1.getVersion()); + assert 0 == bv1.getVersionOrder(); + BundleVersion bv2 = createBundleVersion(b1.getName() + "-2", "2.0", b1); + assertNotNull(bv2); + assertEquals("2.0", bv2.getVersion()); + assert 1 == bv2.getVersionOrder(); + BundleVersion bv3 = createBundleVersion(b1.getName() + "-3", "1.5", b1); + assertNotNull(bv3); + assertEquals("1.5", bv3.getVersion()); + assert 1 == bv3.getVersionOrder(); + + BundleVersionCriteria c = new BundleVersionCriteria(); + PageList<BundleVersion> bvs = null; + + c.addFilterId(bv1.getId()); // 1.0 + bvs = bundleManager.findBundleVersionsByCriteria(overlord, c); + assertNotNull(bvs); + assertEquals(1, bvs.size()); + assert bvs.get(0).getVersionOrder() == 0; // 1st is the 1.0 version + + c.addFilterId(bv2.getId()); // 2.0 + bvs = bundleManager.findBundleVersionsByCriteria(overlord, c); + assertNotNull(bvs); + assertEquals(1, bvs.size()); + assert bvs.get(0).getVersionOrder() == 2; // 3rd is the 2.0 version + + c.addFilterId(bv3.getId()); // 1.5 + bvs = bundleManager.findBundleVersionsByCriteria(overlord, c); + assertNotNull(bvs); + assertEquals(1, bvs.size()); + assert bvs.get(0).getVersionOrder() == 1; // 2nd is the 1.5 version + + // see that we can create a really old bundle and versionOrder gets updated properly + BundleVersion bv4 = createBundleVersion(b1.getName() + "-4", "0.5", b1); + assertNotNull(bv4); + assertEquals("0.5", bv4.getVersion()); + + c.addFilterId(bv4.getId()); //0.5 + bvs = bundleManager.findBundleVersionsByCriteria(overlord, c); + assertNotNull(bvs); + assertEquals(1, bvs.size()); + assert bvs.get(0).getVersionOrder() == 0; // 1st is the 0.5 version + + c.addFilterId(bv1.getId()); // 1.0 + bvs = bundleManager.findBundleVersionsByCriteria(overlord, c); + assertNotNull(bvs); + assertEquals(1, bvs.size()); + assert bvs.get(0).getVersionOrder() == 1; // 2nd is the 1.0 version + + c.addFilterId(bv3.getId()); // 1.5 + bvs = bundleManager.findBundleVersionsByCriteria(overlord, c); + assertNotNull(bvs); + assertEquals(1, bvs.size()); + assert bvs.get(0).getVersionOrder() == 2; // 3nd is the 1.5 version + + c.addFilterId(bv2.getId()); // 2.0 + bvs = bundleManager.findBundleVersionsByCriteria(overlord, c); + assertNotNull(bvs); + assertEquals(1, bvs.size()); + assert bvs.get(0).getVersionOrder() == 3; // 4th is the 2.0 version } @Test(enabled = TESTS_ENABLED) commit 060fb37e49978a66aa2c1b5b94013f2ff9f9e10c Merge: 5de5881... 68dc7f6... Author: John Mazzitelli <mazz(a)redhat.com> Date: Sat Mar 20 01:56:42 2010 -0400 Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt Conflicts: modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleInfoStep.java modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadRecipeStep.java modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java diff --cc modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleInfoStep.java index 7d2db45,74532ae..e5e2653 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleInfoStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleInfoStep.java @@@ -43,14 -45,14 +43,14 @@@ import org.rhq.enterprise.gui.coregui.c public class BundleInfoStep implements WizardStep { private DynamicForm form; - private final AbstractBundleWizard wizard; - private final BundleCreateWizard wizard; ++ private final AbstractBundleCreateWizard wizard; private final BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); private TextItem nameTextItem; private TextItem versionTextItem; private TextAreaItem descriptionTextAreaItem; - public BundleInfoStep(AbstractBundleWizard bundleCreationWizard) { - public BundleInfoStep(BundleCreateWizard bundleCreationWizard) { ++ public BundleInfoStep(AbstractBundleCreateWizard bundleCreationWizard) { this.wizard = bundleCreationWizard; } diff --cc modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUpdateWizard.java index ba64752,0000000..dfb8c15 mode 100644,000000..100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUpdateWizard.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUpdateWizard.java @@@ -1,77 -1,0 +1,77 @@@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle.create; + +import java.util.ArrayList; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.widgets.IButton; +import com.smartgwt.client.widgets.events.ClickEvent; +import com.smartgwt.client.widgets.events.ClickHandler; + +import org.rhq.core.domain.bundle.BundleVersion; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; +import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; +import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; + - public class BundleUpdateWizard extends AbstractBundleWizard { ++public class BundleUpdateWizard extends AbstractBundleCreateWizard { + + public BundleUpdateWizard(BundleVersion bv) { + setWindowTitle("Bundle Update Wizard"); + setTitle("Update a Bundle"); + setSubtitle(bv.getName()); + setBundleVersion(bv); + + ArrayList<WizardStep> steps = new ArrayList<WizardStep>(); + steps.add(new BundleInfoStep(this)); + steps.add(new BundleUploadRecipeStep(this)); + steps.add(new BundleUploadDataStep(this)); + setSteps(steps); + } + + @Override + public void startBundleWizard() { + super.startBundleWizard(); + IButton cancelButton = getView().getCancelButton(); + cancelButton.addClickHandler(new ClickHandler() { + public void onClick(ClickEvent clickEvent) { + final BundleVersion bv = getBundleVersion(); + if (bv != null) { + // the user must have created it already after verification step, delete it + BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); + bundleServer.deleteBundleVersion(bv.getId(), new AsyncCallback<Void>() { + public void onSuccess(Void result) { + CoreGUI.getMessageCenter().notify( + new Message("Canceled bundle [" + bv.getName() + "] version [" + bv.getVersion() + "]", + Severity.Info)); + } + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError( + "Failed to fully cancel - bundle may still exist in the database", caught); + } + }); + } + } + }); + } +} diff --cc modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java index e4deff3,d952500..2a6a7c5 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java @@@ -43,12 -43,12 +43,12 @@@ import org.rhq.enterprise.gui.coregui.c public class BundleUploadDataStep implements WizardStep { - private final AbstractBundleWizard wizard; - private final BundleCreateWizard wizard; ++ private final AbstractBundleCreateWizard wizard; private final BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); private DynamicForm form; private Map<String, Boolean> allFilesStatus; - public BundleUploadDataStep(AbstractBundleWizard bundleCreationWizard) { - public BundleUploadDataStep(BundleCreateWizard bundleCreationWizard) { ++ public BundleUploadDataStep(AbstractBundleCreateWizard bundleCreationWizard) { this.wizard = bundleCreationWizard; } diff --cc modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadRecipeStep.java index 30bb2ac,49dba20..e729d25 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadRecipeStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadRecipeStep.java @@@ -43,11 -43,10 +43,11 @@@ import org.rhq.enterprise.gui.coregui.c public class BundleUploadRecipeStep implements WizardStep { private DynamicCallbackForm form; - private final AbstractBundleWizard wizard; - private final BundleCreateWizard wizard; ++ private final AbstractBundleCreateWizard wizard; private TextAreaItem recipe; + private CanvasItem validatingItem; - public BundleUploadRecipeStep(AbstractBundleWizard bundleCreationWizard) { - public BundleUploadRecipeStep(BundleCreateWizard bundleCreationWizard) { ++ public BundleUploadRecipeStep(AbstractBundleCreateWizard bundleCreationWizard) { this.wizard = bundleCreationWizard; } diff --cc modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java index 9b94cf5,ac0133b..155dcdd --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java @@@ -24,8 -24,8 +24,9 @@@ import com.smartgwt.client.widgets.grid import com.smartgwt.client.widgets.layout.VLayout; import org.rhq.core.domain.bundle.Bundle; - import org.rhq.enterprise.gui.coregui.client.bundle.create.BundleCreationWizard; + import org.rhq.enterprise.gui.coregui.client.bundle.create.BundleCreateWizard; + import org.rhq.enterprise.gui.coregui.client.bundle.deploy.BundleDeployWizard; +import org.rhq.enterprise.gui.coregui.client.bundle.create.BundleUpdateWizard; import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; @@@ -55,17 -56,9 +57,17 @@@ public class BundlesListView extends VL } }); + table.addTableAction("Update Bundle", Table.SelectionEnablement.SINGLE, null, new TableAction() { + public void executeAction(ListGridRecord[] selection) { + Bundle bundle = (Bundle) selection[0].getAttributeAsObject("entity"); + BundleUpdateWizard bundleUpdateWizard = new BundleUpdateWizard(null); + bundleUpdateWizard.startBundleWizard(); + } + }); + - table.addTableAction("Deploy", Table.SelectionEnablement.SINGLE, null, new TableAction() { + table.addTableAction("Deploy Selected Bundle", Table.SelectionEnablement.SINGLE, null, new TableAction() { public void executeAction(ListGridRecord[] selection) { - // TODO: Implement this method. + new BundleDeployWizard((Bundle) selection[0].getAttributeAsObject("object")).startBundleWizard(); } }); commit 5de58818a9b5477f385a47995e9d24918e582674 Author: John Mazzitelli <mazz(a)redhat.com> Date: Sat Mar 20 01:34:34 2010 -0400 more bundle wizard stuff diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleInfoStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleInfoStep.java index 95791a3..7d2db45 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleInfoStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleInfoStep.java @@ -25,8 +25,6 @@ import com.smartgwt.client.types.Alignment; import com.smartgwt.client.types.TitleOrientation; import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.form.DynamicForm; -import com.smartgwt.client.widgets.form.events.ItemChangedEvent; -import com.smartgwt.client.widgets.form.events.ItemChangedHandler; import com.smartgwt.client.widgets.form.fields.TextAreaItem; import com.smartgwt.client.widgets.form.fields.TextItem; import com.smartgwt.client.widgets.form.fields.events.ChangedEvent; @@ -45,14 +43,14 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; public class BundleInfoStep implements WizardStep { private DynamicForm form; - private final BundleCreationWizard wizard; + private final AbstractBundleWizard wizard; private final BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); private TextItem nameTextItem; private TextItem versionTextItem; private TextAreaItem descriptionTextAreaItem; - public BundleInfoStep(BundleCreationWizard bundleCreationWizard) { + public BundleInfoStep(AbstractBundleWizard bundleCreationWizard) { this.wizard = bundleCreationWizard; } @@ -68,17 +66,16 @@ public class BundleInfoStep implements WizardStep { nameTextItem.setTitleAlign(Alignment.LEFT); nameTextItem.addChangedHandler(new ChangedHandler() { public void onChanged(ChangedEvent event) { - String value = form.getValueAsString("name"); + String value = getValueAsString(event.getValue()); wizard.setSubtitle(value); } }); - final TextItem previousVersionTextItem = new TextItem("previousVersion", "Previous Version"); previousVersionTextItem.setTitleAlign(Alignment.LEFT); versionTextItem = new TextItem("version"); - + versionTextItem.setRequired(true); versionTextItem.setTitleAlign(Alignment.LEFT); descriptionTextAreaItem = new TextAreaItem("description", "Description"); @@ -88,25 +85,25 @@ public class BundleInfoStep implements WizardStep { form.setItems(nameTextItem, previousVersionTextItem, versionTextItem, descriptionTextAreaItem); - BundleVersion initialBundleVersion = wizard.getBundleVersion(); if (initialBundleVersion != null) { - form.setValue("name", initialBundleVersion.getName()); + nameTextItem.setValue(initialBundleVersion.getName()); nameTextItem.setDisabled(true); + wizard.setSubtitle(initialBundleVersion.getName()); - form.setValue("previousVersion", initialBundleVersion.getVersion()); + previousVersionTextItem.setValue(initialBundleVersion.getVersion()); previousVersionTextItem.setDisabled(true); versionTextItem.setTitle("New Version"); String versionSuggestion = autoIncrementVersion(initialBundleVersion.getVersion()); - form.setValue("version", versionSuggestion); + versionTextItem.setValue(versionSuggestion); - form.setValue("description", initialBundleVersion.getDescription()); + descriptionTextAreaItem.setValue(initialBundleVersion.getDescription()); } else { previousVersionTextItem.setVisible(Boolean.FALSE); versionTextItem.setTitle("Initial Version"); - form.setValue("version", "1.0"); + versionTextItem.setValue("1.0"); } if (wizard.getBundleType() == null) { @@ -132,22 +129,14 @@ public class BundleInfoStep implements WizardStep { } } - - form.addItemChangedHandler(new ItemChangedHandler() { - public void onItemChanged(ItemChangedEvent itemChangedEvent) { - enableNextButtonWhenAppropriate(); - } - }); - return form; } public boolean nextPage() { - if (form.validate()) { - wizard.setBundleName(form.getValueAsString("name")); - wizard.setBundleVersionString(form.getValueAsString("version")); - wizard.setBundleDescription(form.getValueAsString("description")); - + if (form.validate() && this.wizard.getBundleType() != null) { + wizard.setBundleName(getValueAsString(nameTextItem.getValue())); + wizard.setBundleVersionString(getValueAsString(versionTextItem.getValue())); + wizard.setBundleDescription(getValueAsString(descriptionTextAreaItem.getValue())); return true; } return false; @@ -157,12 +146,6 @@ public class BundleInfoStep implements WizardStep { return "Provide Bundle Information"; } - - private void enableNextButtonWhenAppropriate() { - this.wizard.getView().getNextButton().setDisabled(!(form.validate() && this.wizard.getBundleType() != null)); - } - - private String autoIncrementVersion(String oldVersion) { String newVersion = "1.0"; if (oldVersion != null && oldVersion.length() != 0) { @@ -177,4 +160,8 @@ public class BundleInfoStep implements WizardStep { } return newVersion; } + + private String getValueAsString(Object obj) { + return (obj != null) ? obj.toString() : ""; + } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUpdateWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUpdateWizard.java new file mode 100644 index 0000000..ba64752 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUpdateWizard.java @@ -0,0 +1,77 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle.create; + +import java.util.ArrayList; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.widgets.IButton; +import com.smartgwt.client.widgets.events.ClickEvent; +import com.smartgwt.client.widgets.events.ClickHandler; + +import org.rhq.core.domain.bundle.BundleVersion; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; +import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; +import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; + +public class BundleUpdateWizard extends AbstractBundleWizard { + + public BundleUpdateWizard(BundleVersion bv) { + setWindowTitle("Bundle Update Wizard"); + setTitle("Update a Bundle"); + setSubtitle(bv.getName()); + setBundleVersion(bv); + + ArrayList<WizardStep> steps = new ArrayList<WizardStep>(); + steps.add(new BundleInfoStep(this)); + steps.add(new BundleUploadRecipeStep(this)); + steps.add(new BundleUploadDataStep(this)); + setSteps(steps); + } + + @Override + public void startBundleWizard() { + super.startBundleWizard(); + IButton cancelButton = getView().getCancelButton(); + cancelButton.addClickHandler(new ClickHandler() { + public void onClick(ClickEvent clickEvent) { + final BundleVersion bv = getBundleVersion(); + if (bv != null) { + // the user must have created it already after verification step, delete it + BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); + bundleServer.deleteBundleVersion(bv.getId(), new AsyncCallback<Void>() { + public void onSuccess(Void result) { + CoreGUI.getMessageCenter().notify( + new Message("Canceled bundle [" + bv.getName() + "] version [" + bv.getVersion() + "]", + Severity.Info)); + } + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError( + "Failed to fully cancel - bundle may still exist in the database", caught); + } + }); + } + } + }); + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java index 8bb2498..e4deff3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java @@ -43,12 +43,12 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message; public class BundleUploadDataStep implements WizardStep { - private final BundleCreationWizard wizard; + private final AbstractBundleWizard wizard; private final BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); private DynamicForm form; private Map<String, Boolean> allFilesStatus; - public BundleUploadDataStep(BundleCreationWizard bundleCreationWizard) { + public BundleUploadDataStep(AbstractBundleWizard bundleCreationWizard) { this.wizard = bundleCreationWizard; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadRecipeStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadRecipeStep.java index 84a2a09..30bb2ac 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadRecipeStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadRecipeStep.java @@ -43,10 +43,11 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message; public class BundleUploadRecipeStep implements WizardStep { private DynamicCallbackForm form; - private final BundleCreationWizard wizard; + private final AbstractBundleWizard wizard; private TextAreaItem recipe; + private CanvasItem validatingItem; - public BundleUploadRecipeStep(BundleCreationWizard bundleCreationWizard) { + public BundleUploadRecipeStep(AbstractBundleWizard bundleCreationWizard) { this.wizard = bundleCreationWizard; } @@ -57,21 +58,21 @@ public class BundleUploadRecipeStep implements WizardStep { form.setMargin(Integer.valueOf(20)); form.setShowInlineErrors(false); - final LinkItem showUpload = new LinkItem("showUpload"); showUpload.setValue("Click To Upload A Recipe File"); showUpload.setShowTitle(false); final CanvasItem upload = new CanvasItem("upload"); upload.setShowTitle(false); + upload.setVisible(false); final TextFileRetrieverForm textFileRetrieverForm = new TextFileRetrieverForm(); upload.setCanvas(textFileRetrieverForm); showUpload.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { - form.hideItem("showUpload"); - form.showItem("upload"); + form.hideItem(showUpload.getName()); + form.showItem(upload.getName()); } }); @@ -82,24 +83,21 @@ public class BundleUploadRecipeStep implements WizardStep { recipe.setWidth("*"); recipe.setHeight(220); - textFileRetrieverForm.addFormHandler(new DynamicFormHandler() { public void onSubmitComplete(DynamicFormSubmitCompleteEvent event) { wizard.setRecipe(event.getResults()); recipe.setValue(event.getResults()); textFileRetrieverForm.retrievalStatus(true); - form.showItem("showUpload"); - form.hideItem("upload"); -// enableNextButtonWhenAppropriate(); + form.showItem(showUpload.getName()); + form.hideItem(upload.getName()); } }); - CanvasItem validating = new CanvasItem("validating", "Validating"); - validating.setCanvas(new Img("ajax-loader.gif", 16, 16)); - validating.setVisible(false); + validatingItem = new CanvasItem("validating", "Validating"); + validatingItem.setCanvas(new Img("ajax-loader.gif", 16, 16)); + validatingItem.setVisible(false); - form.setItems(showUpload, upload, recipe, validating); - form.hideItem("upload"); + form.setItems(showUpload, upload, recipe, validatingItem); } else { // we are traversing back to this step - don't allow the recipe to change if we've already created the bundle version if (wizard.getBundleVersion() != null) { @@ -118,7 +116,7 @@ public class BundleUploadRecipeStep implements WizardStep { return true; } else { if (form.validate()) { - validateAndCreateRecipe(); + validateAndCreateRecipe(); // this will move to the next step for us } return false; } @@ -129,43 +127,44 @@ public class BundleUploadRecipeStep implements WizardStep { return "Provide Bundle Recipe"; } - private void validateAndCreateRecipe() { - form.showItem("validating"); - - wizard.setRecipe(form.getValueAsString("recipe")); + form.showItem(validatingItem.getName()); + setButtonsDisableMode(true); + wizard.setRecipe(recipe.getValue().toString()); BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); - bundleServer.createBundleAndBundleVersion( - this.wizard.getBundleName(), - this.wizard.getBundleType().getId(), - this.wizard.getBundleName(), - this.wizard.getBundleVersionString(), - this.wizard.getBundleDescription(), - this.wizard.getRecipe(), - new AsyncCallback<BundleVersion>() { - public void onSuccess(BundleVersion result) { - form.hideItem("validating"); - - CoreGUI.getMessageCenter().notify( - new Message("Created bundle [" + result.getName() + "] version [" + result.getVersion() + "]", - Message.Severity.Info)); - wizard.setBundleVersion(result); - wizard.getView().incrementStep(); - } - - public void onFailure(Throwable caught) { - form.hideItem("validating"); - - HashMap<String, String> errors = new HashMap<String, String>(); - errors.put("recipe", "Invalid Recipe: " + caught.getMessage()); - form.setErrors(errors, true); - CoreGUI.getErrorHandler().handleError("Failed to create bundle: " + caught.getMessage(), caught); - wizard.setBundleVersion(null); -// enableNextButtonWhenAppropriate(); - } - }); + bundleServer.createBundleAndBundleVersion(this.wizard.getBundleName(), this.wizard.getBundleType().getId(), + this.wizard.getBundleName(), this.wizard.getBundleVersionString(), this.wizard.getBundleDescription(), + this.wizard.getRecipe(), new AsyncCallback<BundleVersion>() { + public void onSuccess(BundleVersion result) { + form.hideItem(validatingItem.getName()); + + CoreGUI.getMessageCenter().notify( + new Message("Created bundle [" + result.getName() + "] version [" + result.getVersion() + "]", + Message.Severity.Info)); + wizard.setBundleVersion(result); + wizard.getView().incrementStep(); + setButtonsDisableMode(false); + } + + public void onFailure(Throwable caught) { + form.hideItem(validatingItem.getName()); + + HashMap<String, String> errors = new HashMap<String, String>(); + errors.put(recipe.getName(), "Invalid Recipe: " + caught.getMessage()); + form.setErrors(errors, true); + CoreGUI.getErrorHandler().handleError("Failed to create bundle", caught); + wizard.setBundleVersion(null); + wizard.setRecipe(""); + setButtonsDisableMode(false); + } + }); } + private void setButtonsDisableMode(boolean disabled) { + wizard.getView().getCancelButton().setDisabled(disabled); + wizard.getView().getNextButton().setDisabled(disabled); + wizard.getView().getPreviousButton().setDisabled(disabled); + } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java index 6963019..9b94cf5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java @@ -25,6 +25,7 @@ import com.smartgwt.client.widgets.layout.VLayout; import org.rhq.core.domain.bundle.Bundle; import org.rhq.enterprise.gui.coregui.client.bundle.create.BundleCreationWizard; +import org.rhq.enterprise.gui.coregui.client.bundle.create.BundleUpdateWizard; import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; @@ -33,12 +34,10 @@ import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; */ public class BundlesListView extends VLayout { - @Override protected void onDraw() { super.onDraw(); - Table table = new Table("Bundles"); table.setDataSource(new BundlesDataSource()); @@ -49,37 +48,38 @@ public class BundlesListView extends VLayout { table.getListGrid().setSelectionType(SelectionStyle.SIMPLE); table.getListGrid().setSelectionAppearance(SelectionAppearance.CHECKBOX); - - table.addTableAction("Create Bundle", Table.SelectionEnablement.ALWAYS, null, - new TableAction() { - public void executeAction(ListGridRecord[] selection) { - new BundleCreationWizard().startBundleWizard(); - - } - }); - - table.addTableAction("Deploy", Table.SelectionEnablement.SINGLE, null, - new TableAction() { - public void executeAction(ListGridRecord[] selection) { - // TODO: Implement this method. - } - }); + table.addTableAction("Create New Bundle", Table.SelectionEnablement.ALWAYS, null, new TableAction() { + public void executeAction(ListGridRecord[] selection) { + new BundleCreationWizard().startBundleWizard(); + } + }); + + table.addTableAction("Update Bundle", Table.SelectionEnablement.SINGLE, null, new TableAction() { + public void executeAction(ListGridRecord[] selection) { + Bundle bundle = (Bundle) selection[0].getAttributeAsObject("entity"); + BundleUpdateWizard bundleUpdateWizard = new BundleUpdateWizard(null); + bundleUpdateWizard.startBundleWizard(); + } + }); + + table.addTableAction("Deploy", Table.SelectionEnablement.SINGLE, null, new TableAction() { + public void executeAction(ListGridRecord[] selection) { + // TODO: Implement this method. + } + }); table.addTableAction("Delete", Table.SelectionEnablement.ANY, "Are you sure you want to delete # bundles?", - new TableAction() { - public void executeAction(ListGridRecord[] selection) { - // TODO: Implement this method. - Bundle bundle = (Bundle) selection[0].getAttributeAsObject("entity"); - bundle.getId(); - - } - }); + new TableAction() { + public void executeAction(ListGridRecord[] selection) { + // TODO: Implement this method. + Bundle bundle = (Bundle) selection[0].getAttributeAsObject("entity"); + bundle.getId(); + } + }); addMember(table); - - } } commit ddf0fd0058ae7abf984297c5f36fbddec0576e47 Author: John Mazzitelli <mazz(a)redhat.com> Date: Sat Mar 20 01:34:24 2010 -0400 fix test - need to explicitly set uuid now diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java index f05d8f9..6cdabc7 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java @@ -542,7 +542,6 @@ public class BundleManagerBeanTest extends UpdateSubsytemTestBase { // with the bundle resource type ResourceType resourceType = new ResourceType(TEST_PREFIX + "-platform-" + System.currentTimeMillis(), "test", ResourceCategory.PLATFORM, null); - em.persist(resourceType); Agent agent = new Agent(TEST_PREFIX + "-testagent", "testaddress", 1, "", "testtoken"); @@ -550,6 +549,7 @@ public class BundleManagerBeanTest extends UpdateSubsytemTestBase { em.flush(); resource = new Resource("reskey" + System.currentTimeMillis(), TEST_PREFIX + "-resname", resourceType); + resource.setUuid("" + System.currentTimeMillis()); resource.setInventoryStatus(InventoryStatus.COMMITTED); resource.setAgent(agent); em.persist(resource); commit 2b86c8c0164fd835323c56ee6c2288a71ea76ece Author: John Mazzitelli <mazz(a)redhat.com> Date: Sat Mar 20 01:34:06 2010 -0400 add version order column diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml b/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml index 683c991..75675ef 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml @@ -515,6 +515,7 @@ <column name="NAME" size="200" type="VARCHAR2" required="true"/> <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/> <column name="VERSION" size="500" type="VARCHAR2" required="true"/> + <column name="VERSION_ORDER" type="INTEGER" required="true"/> <column name="ACTION" type="CLOB" required="true"/> <column name="CONFIG_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_DEF" /> <column name="BUNDLE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE"/> diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index 23f1fbd..2b8848f 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -2893,6 +2893,11 @@ </schema-directSQL> </schemaSpec> + <schemaSpec version="2.78.4"> + <schema-addColumn table="RHQ_BUNDLE_VERSION" column="VERSION_ORDER" columnType="INTEGER" /> + <schema-alterColumn table="RHQ_BUNDLE_VERSION" column="VERSION_ORDER" nullable="FALSE" /> + </schemaSpec> + <schemaSpec version="2.79"> <schema-directSQL> <statement desc="Normalizing resource group descriptions"> diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java index 00eb979..a3b01f4 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java @@ -53,8 +53,20 @@ import org.rhq.core.domain.content.Distribution; */ @Entity @NamedQueries( { - @NamedQuery(name = BundleVersion.QUERY_FIND_ALL, query = "SELECT bv FROM BundleVersion bv"), // - @NamedQuery(name = BundleVersion.QUERY_FIND_BY_NAME, query = "SELECT bv FROM BundleVersion bv WHERE bv.name = :name") // + @NamedQuery(name = BundleVersion.UPDATE_VERSION_ORDER, query = "UPDATE BundleVersion bv SET bv.versionOrder = (bv.versionOrder+1) WHERE bv.name = :name AND bv.versionOrder >= :versionOrder"), // + @NamedQuery(name = BundleVersion.QUERY_FIND_LATEST_BY_NAME, query = "" // + + "SELECT bv " // + + " FROM BundleVersion bv " // + + " WHERE bv.name = :name " // + + " AND bv.versionOrder = (SELECT MAX(bv2.versionOrder) FROM BundleVersion bv2 WHERE bv2.name = :name) "), // + // this returns a desc ordered list of a 2-D array - first element in array is the version string, second is its associated version order + @NamedQuery(name = BundleVersion.QUERY_FIND_VERSIONS_BY_NAME, query = "" // + + "SELECT bv.version, bv.versionOrder " // + + " FROM BundleVersion bv " // + + " WHERE bv.name = :name " // + + " ORDER BY bv.versionOrder DESC "), // + @NamedQuery(name = BundleVersion.QUERY_FIND_ALL, query = "SELECT bv FROM BundleVersion bv "), // + @NamedQuery(name = BundleVersion.QUERY_FIND_BY_NAME, query = "SELECT bv FROM BundleVersion bv WHERE bv.name = :name ") // }) @SequenceGenerator(name = "SEQ", sequenceName = "RHQ_BUNDLE_VERSION_ID_SEQ") @Table(name = "RHQ_BUNDLE_VERSION") @@ -62,6 +74,9 @@ import org.rhq.core.domain.content.Distribution; public class BundleVersion implements Serializable { private static final long serialVersionUID = 1L; + public static final String UPDATE_VERSION_ORDER = "BundleVersion.updateVersionOrder"; + public static final String QUERY_FIND_LATEST_BY_NAME = "BundleVersion.findLatestByName"; + public static final String QUERY_FIND_VERSIONS_BY_NAME = "BundleVersion.findVersionsByName"; public static final String QUERY_FIND_ALL = "BundleVersion.findAll"; public static final String QUERY_FIND_BY_NAME = "BundleVersion.findByName"; @@ -79,6 +94,9 @@ public class BundleVersion implements Serializable { @Column(name = "VERSION", nullable = false) private String version; + @Column(name = "VERSION_ORDER", nullable = false) + private int versionOrder; + @Column(name = "ACTION", nullable = false) private String recipe; @@ -143,6 +161,14 @@ public class BundleVersion implements Serializable { this.version = version; } + public int getVersionOrder() { + return versionOrder; + } + + public void setVersionOrder(int versionOrder) { + this.versionOrder = versionOrder; + } + public String getRecipe() { return recipe; } diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/bundle/test/BundleTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/bundle/test/BundleTest.java index 9da25eb..42ed4ab 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/bundle/test/BundleTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/bundle/test/BundleTest.java @@ -74,6 +74,7 @@ public class BundleTest extends AbstractEJB3Test { bundle.setRepo(bundleRepo); em.persist(bundle); BundleVersion bundleVersion = new BundleVersion(name, "1.0.0.BETA", bundle, recipe); + bundleVersion.setVersionOrder(0); em.persist(bundleVersion); id = bundleVersion.getId(); assert id > 0; @@ -124,7 +125,6 @@ public class BundleTest extends AbstractEJB3Test { } public void testBundleVersion() throws Throwable { - boolean done = false; getTransactionManager().begin(); EntityManager em = getEntityManager(); try { @@ -145,6 +145,7 @@ public class BundleTest extends AbstractEJB3Test { assert bundle.getBundleType().getId() != 0 : "bundleType should have been cascade persisted too"; BundleVersion bv = new BundleVersion(name, "1.0.0.BETA", bundle, recipe); + bv.setVersionOrder(777); Query q = em.createNamedQuery(BundleVersion.QUERY_FIND_BY_NAME); q.setParameter("name", bv.getName()); assert q.getResultList().size() == 0; // not in the db yet @@ -155,7 +156,6 @@ public class BundleTest extends AbstractEJB3Test { q = em.createNamedQuery(BundleVersion.QUERY_FIND_BY_NAME); q.setParameter("name", bv.getName()); - q.setParameter("name", bv.getName()); assert q.getResultList().size() == 1; assert ((BundleVersion) q.getSingleResult()).getName().equals(bv.getName()); @@ -164,6 +164,7 @@ public class BundleTest extends AbstractEJB3Test { assert bvFind.getId() == bv.getId(); assert bvFind.getName().equals(bv.getName()); assert bvFind.getVersion().equals(bv.getVersion()); + assert bvFind.getVersionOrder() == bv.getVersionOrder(); assert bvFind.getRecipe().equals(bv.getRecipe()); assert bvFind.getBundle().equals(bv.getBundle()); assert bvFind.equals(bv); @@ -222,8 +223,116 @@ public class BundleTest extends AbstractEJB3Test { } } + public void testMultipleBundleVersions() throws Throwable { + getTransactionManager().begin(); + EntityManager em = getEntityManager(); + try { + int id; + + String name = "BundleTest-testMultipleBundleVersions"; + String recipe = "action/script/recipe is here"; + + Repo repo1 = new Repo(name + "-Repo1"); + em.persist(repo1); + + BundleType bundleType = createBundleType(em, name + "-Type", createResourceType(em)); + Bundle bundle = new Bundle(name + "-Bundle", bundleType); + bundle.setRepo(repo1); + em.persist(bundle); + id = bundle.getId(); + assert id > 0; + assert bundle.getBundleType().getId() != 0 : "bundleType should have been cascade persisted too"; + + BundleVersion bv = new BundleVersion(name, "1.0", bundle, recipe); + bv.setVersionOrder(0); + Query q = em.createNamedQuery(BundleVersion.QUERY_FIND_BY_NAME); + q.setParameter("name", name); + assert q.getResultList().size() == 0; // not in the db yet + em.persist(bv); + id = bv.getId(); + assert id > 0; + + BundleVersion bv2 = new BundleVersion(name, "2.0", bundle, recipe); + bv2.setVersionOrder(1); + q = em.createNamedQuery(BundleVersion.QUERY_FIND_BY_NAME); + q.setParameter("name", name); + assert q.getResultList().size() == 1; + em.persist(bv2); + id = bv2.getId(); + assert id > 0; + + q = em.createNamedQuery(BundleVersion.QUERY_FIND_LATEST_BY_NAME); + q.setParameter("name", name); + assert q.getResultList().size() == 1; + assert ((BundleVersion) q.getSingleResult()).getVersion().equals(bv2.getVersion()); + q = em.createNamedQuery(BundleVersion.QUERY_FIND_VERSIONS_BY_NAME); + q.setParameter("name", name); + List<Object[]> versionsArrays = q.getResultList(); // returns in DESC sort order! + assert versionsArrays.size() == 2; + assert ((String) versionsArrays.get(0)[0]).equals(bv2.getVersion()); + assert ((Number) versionsArrays.get(0)[1]).intValue() == bv2.getVersionOrder(); + assert ((String) versionsArrays.get(1)[0]).equals(bv.getVersion()); + assert ((Number) versionsArrays.get(1)[1]).intValue() == bv.getVersionOrder(); + + // increment all version orders, starting at order #1 + q = em.createNamedQuery(BundleVersion.UPDATE_VERSION_ORDER); + q.setParameter("name", name); + q.setParameter("versionOrder", 1); + assert q.executeUpdate() == 1 : "should have auto-incremented version order in one row"; + em.flush(); + em.clear(); + bv = em.find(BundleVersion.class, bv.getId()); + assert bv.getVersionOrder() == 0 : "should not have incremented version order"; + bv2 = em.find(BundleVersion.class, bv2.getId()); + assert bv2.getVersionOrder() == 2 : "didn't increment version order"; + + BundleVersion bv3 = new BundleVersion(name, "1.5", bundle, recipe); + bv3.setVersionOrder(1); + q = em.createNamedQuery(BundleVersion.QUERY_FIND_BY_NAME); + q.setParameter("name", name); + assert q.getResultList().size() == 2; + em.persist(bv3); + id = bv3.getId(); + assert id > 0; + + q = em.createNamedQuery(BundleVersion.QUERY_FIND_LATEST_BY_NAME); + q.setParameter("name", name); + assert q.getResultList().size() == 1; + assert ((BundleVersion) q.getSingleResult()).getVersion().equals(bv2.getVersion()); + q = em.createNamedQuery(BundleVersion.QUERY_FIND_VERSIONS_BY_NAME); + q.setParameter("name", name); + versionsArrays = q.getResultList(); // returns in DESC sort order! + assert versionsArrays.size() == 3; + assert ((String) versionsArrays.get(0)[0]).equals(bv2.getVersion()); // 2.0 + assert ((Number) versionsArrays.get(0)[1]).intValue() == bv2.getVersionOrder(); + assert ((String) versionsArrays.get(1)[0]).equals(bv3.getVersion()); // 1.5 + assert ((Number) versionsArrays.get(1)[1]).intValue() == bv3.getVersionOrder(); + assert ((String) versionsArrays.get(2)[0]).equals(bv.getVersion()); // 1.0 + assert ((Number) versionsArrays.get(2)[1]).intValue() == bv.getVersionOrder(); + + // increment all version orders, starting at order #0 - makes sure we can update >1 rows + q = em.createNamedQuery(BundleVersion.UPDATE_VERSION_ORDER); + q.setParameter("name", name); + q.setParameter("versionOrder", 0); + assert q.executeUpdate() == 3 : "should have auto-incremented version orders"; + em.flush(); + em.clear(); + bv = em.find(BundleVersion.class, bv.getId()); + assert bv.getVersionOrder() == 1 : "didn't increment version order: " + bv.getVersionOrder(); + bv2 = em.find(BundleVersion.class, bv2.getId()); + assert bv2.getVersionOrder() == 3 : "didn't increment version order: " + bv2.getVersionOrder(); + bv3 = em.find(BundleVersion.class, bv3.getId()); + assert bv3.getVersionOrder() == 2 : "didn't increment version order: " + bv3.getVersionOrder(); + + } catch (Throwable t) { + t.printStackTrace(); + throw t; + } finally { + getTransactionManager().rollback(); + } + } + public void testBundle() throws Throwable { - boolean done = false; getTransactionManager().begin(); EntityManager em = getEntityManager(); try { @@ -301,7 +410,6 @@ public class BundleTest extends AbstractEJB3Test { } public void testBundleType() throws Throwable { - boolean done = false; getTransactionManager().begin(); EntityManager em = getEntityManager(); try {

1 0

[rhq] Branch 'gwt' - 6 commits - modules/core modules/enterprise
by Jay Shaughnessy 19 Mar '10

19 Mar '10

modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleVersionCriteria.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/AbstractBundleWizard.java | 85 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/AbstractBundleCreateWizard.java | 82 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/AbstractBundleWizard.java | 142 --------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleCreateWizard.java | 76 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleCreationWizard.java | 76 ----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleInfoStep.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadRecipeStep.java | 63 +--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleVerificationStep.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/AbstractBundleDeployWizard.java | 149 ++++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/BundleDeployDefinitionInfoStep.java | 103 ++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/BundleDeployWizard.java | 111 +++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/CreateConfigStep.java | 68 ++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/DeployNowStep.java | 92 ++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/DeployStep.java | 136 +++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleStep.java | 112 +++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleVersionStep.java | 122 ++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectPlatformsStep.java | 89 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectTemplateStep.java | 89 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesDataSource.java | 24 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java | 42 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java | 25 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java | 88 +++-- 25 files changed, 1457 insertions(+), 344 deletions(-) New commits: commit 68dc7f64a9884352e3b410a335514f8ccf27f8e0 Merge: 094ec91... 2068333... Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Mar 19 17:46:55 2010 -0400 Merge branch 'gwt' into gwt-jay Conflicts: modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesDataSource.java modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java commit 094ec91da66ec51545bf54036f0a394873111b82 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Mar 19 17:42:11 2010 -0400 Just getting in some initial stuff for deploy wizard. not working yet diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java index 852e765..131cb92 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java @@ -19,14 +19,10 @@ package org.rhq.enterprise.gui.coregui.client.bundle; import com.smartgwt.client.types.VisibilityMode; -import com.smartgwt.client.widgets.IButton; -import com.smartgwt.client.widgets.events.ClickEvent; -import com.smartgwt.client.widgets.events.ClickHandler; import com.smartgwt.client.widgets.layout.HLayout; import com.smartgwt.client.widgets.layout.SectionStack; import com.smartgwt.client.widgets.layout.SectionStackSection; -import org.rhq.enterprise.gui.coregui.client.bundle.create.BundleCreationWizard; import org.rhq.enterprise.gui.coregui.client.bundle.list.BundlesListView; /** @@ -34,7 +30,6 @@ import org.rhq.enterprise.gui.coregui.client.bundle.list.BundlesListView; */ public class BundleTopView extends HLayout { - public BundleTopView() { setWidth100(); setHeight100(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/AbstractBundleCreateWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/AbstractBundleCreateWizard.java new file mode 100644 index 0000000..81d13ca --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/AbstractBundleCreateWizard.java @@ -0,0 +1,82 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle.create; + +import org.rhq.core.domain.bundle.BundleType; +import org.rhq.core.domain.bundle.BundleVersion; +import org.rhq.enterprise.gui.coregui.client.bundle.AbstractBundleWizard; + +public abstract class AbstractBundleCreateWizard extends AbstractBundleWizard { + + // the things we build up in the wizard + private BundleType bundleType; + private String bundleName; + private String bundleVersionString; + private String bundleDescription; + private String recipe; + private BundleVersion bundleVersion; + + public BundleType getBundleType() { + return bundleType; + } + + public void setBundleType(BundleType bundleType) { + this.bundleType = bundleType; + } + + public String getBundleName() { + return bundleName; + } + + public void setBundleName(String bundleName) { + this.bundleName = bundleName; + } + + public String getBundleVersionString() { + return bundleVersionString; + } + + public void setBundleVersionString(String bundleVersionString) { + this.bundleVersionString = bundleVersionString; + } + + public String getBundleDescription() { + return bundleDescription; + } + + public void setBundleDescription(String desc) { + this.bundleDescription = desc; + } + + public String getRecipe() { + return recipe; + } + + public void setRecipe(String recipe) { + this.recipe = recipe; + } + + public BundleVersion getBundleVersion() { + return bundleVersion; + } + + public void setBundleVersion(BundleVersion bv) { + this.bundleVersion = bv; + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/AbstractBundleCreationWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/AbstractBundleCreationWizard.java deleted file mode 100644 index 1edb719..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/AbstractBundleCreationWizard.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.bundle.create; - -import org.rhq.core.domain.bundle.BundleType; -import org.rhq.core.domain.bundle.BundleVersion; -import org.rhq.enterprise.gui.coregui.client.bundle.AbstractBundleWizard; - -public abstract class AbstractBundleCreationWizard extends AbstractBundleWizard { - - // the things we build up in the wizard - private BundleType bundleType; - private String bundleName; - private String bundleVersionString; - private String bundleDescription; - private String recipe; - private BundleVersion bundleVersion; - - public BundleType getBundleType() { - return bundleType; - } - - public void setBundleType(BundleType bundleType) { - this.bundleType = bundleType; - } - - public String getBundleName() { - return bundleName; - } - - public void setBundleName(String bundleName) { - this.bundleName = bundleName; - } - - public String getBundleVersionString() { - return bundleVersionString; - } - - public void setBundleVersionString(String bundleVersionString) { - this.bundleVersionString = bundleVersionString; - } - - public String getBundleDescription() { - return bundleDescription; - } - - public void setBundleDescription(String desc) { - this.bundleDescription = desc; - } - - public String getRecipe() { - return recipe; - } - - public void setRecipe(String recipe) { - this.recipe = recipe; - } - - public BundleVersion getBundleVersion() { - return bundleVersion; - } - - public void setBundleVersion(BundleVersion bv) { - this.bundleVersion = bv; - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleCreateWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleCreateWizard.java index 99b1125..e2fe45f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleCreateWizard.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleCreateWizard.java @@ -33,7 +33,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; -public class BundleCreateWizard extends AbstractBundleCreationWizard { +public class BundleCreateWizard extends AbstractBundleCreateWizard { public BundleCreateWizard() { setWindowTitle("Bundle Creation Wizard"); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadRecipeStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadRecipeStep.java index 84a2a09..49dba20 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadRecipeStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadRecipeStep.java @@ -43,10 +43,10 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message; public class BundleUploadRecipeStep implements WizardStep { private DynamicCallbackForm form; - private final BundleCreationWizard wizard; + private final BundleCreateWizard wizard; private TextAreaItem recipe; - public BundleUploadRecipeStep(BundleCreationWizard bundleCreationWizard) { + public BundleUploadRecipeStep(BundleCreateWizard bundleCreationWizard) { this.wizard = bundleCreationWizard; } @@ -57,7 +57,6 @@ public class BundleUploadRecipeStep implements WizardStep { form.setMargin(Integer.valueOf(20)); form.setShowInlineErrors(false); - final LinkItem showUpload = new LinkItem("showUpload"); showUpload.setValue("Click To Upload A Recipe File"); showUpload.setShowTitle(false); @@ -82,7 +81,6 @@ public class BundleUploadRecipeStep implements WizardStep { recipe.setWidth("*"); recipe.setHeight(220); - textFileRetrieverForm.addFormHandler(new DynamicFormHandler() { public void onSubmitComplete(DynamicFormSubmitCompleteEvent event) { wizard.setRecipe(event.getResults()); @@ -90,7 +88,7 @@ public class BundleUploadRecipeStep implements WizardStep { textFileRetrieverForm.retrievalStatus(true); form.showItem("showUpload"); form.hideItem("upload"); -// enableNextButtonWhenAppropriate(); + // enableNextButtonWhenAppropriate(); } }); @@ -129,43 +127,36 @@ public class BundleUploadRecipeStep implements WizardStep { return "Provide Bundle Recipe"; } - private void validateAndCreateRecipe() { form.showItem("validating"); wizard.setRecipe(form.getValueAsString("recipe")); - BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); - bundleServer.createBundleAndBundleVersion( - this.wizard.getBundleName(), - this.wizard.getBundleType().getId(), - this.wizard.getBundleName(), - this.wizard.getBundleVersionString(), - this.wizard.getBundleDescription(), - this.wizard.getRecipe(), - new AsyncCallback<BundleVersion>() { - public void onSuccess(BundleVersion result) { - form.hideItem("validating"); - - CoreGUI.getMessageCenter().notify( - new Message("Created bundle [" + result.getName() + "] version [" + result.getVersion() + "]", - Message.Severity.Info)); - wizard.setBundleVersion(result); - wizard.getView().incrementStep(); - } - - public void onFailure(Throwable caught) { - form.hideItem("validating"); - - HashMap<String, String> errors = new HashMap<String, String>(); - errors.put("recipe", "Invalid Recipe: " + caught.getMessage()); - form.setErrors(errors, true); - CoreGUI.getErrorHandler().handleError("Failed to create bundle: " + caught.getMessage(), caught); - wizard.setBundleVersion(null); -// enableNextButtonWhenAppropriate(); - } - }); + bundleServer.createBundleAndBundleVersion(this.wizard.getBundleName(), this.wizard.getBundleType().getId(), + this.wizard.getBundleName(), this.wizard.getBundleVersionString(), this.wizard.getBundleDescription(), + this.wizard.getRecipe(), new AsyncCallback<BundleVersion>() { + public void onSuccess(BundleVersion result) { + form.hideItem("validating"); + + CoreGUI.getMessageCenter().notify( + new Message("Created bundle [" + result.getName() + "] version [" + result.getVersion() + "]", + Message.Severity.Info)); + wizard.setBundleVersion(result); + wizard.getView().incrementStep(); + } + + public void onFailure(Throwable caught) { + form.hideItem("validating"); + + HashMap<String, String> errors = new HashMap<String, String>(); + errors.put("recipe", "Invalid Recipe: " + caught.getMessage()); + form.setErrors(errors, true); + CoreGUI.getErrorHandler().handleError("Failed to create bundle: " + caught.getMessage(), caught); + wizard.setBundleVersion(null); + // enableNextButtonWhenAppropriate(); + } + }); } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/CreateConfigStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/CreateConfigStep.java index cd99e44..c388953 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/CreateConfigStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/CreateConfigStep.java @@ -18,12 +18,8 @@ */ package org.rhq.enterprise.gui.coregui.client.bundle.deploy; -import java.util.List; - import com.smartgwt.client.widgets.Canvas; -import com.smartgwt.client.widgets.form.DynamicForm; -import org.rhq.core.clientapi.agent.configuration.ConfigurationUtility; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor; @@ -31,7 +27,6 @@ import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; public class CreateConfigStep implements WizardStep { - private DynamicForm form; private final BundleDeployWizard wizard; // private final BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); private ConfigurationEditor editor; @@ -59,7 +54,8 @@ public class CreateConfigStep implements WizardStep { } public boolean nextPage() { - return form.validate(); + wizard.setConfig(editor.getConfiguration()); + return true; } public boolean isPreviousEnabled() { @@ -67,13 +63,6 @@ public class CreateConfigStep implements WizardStep { } public boolean isNextEnabled() { - wizard.setConfig(editor.getConfiguration()); - List<String> messages = ConfigurationUtility.validateConfiguration(wizard.getConfig(), wizard - .getBundleVersion().getConfigurationDefinition()); - return messages.isEmpty(); - } - - public Configuration getConfiguration() { - return editor.getConfiguration(); + return true; } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleVersionStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleVersionStep.java index a34f34e..9f6af9c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleVersionStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleVersionStep.java @@ -39,17 +39,19 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; public class SelectBundleVersionStep implements WizardStep { - private DynamicForm form; private final BundleDeployWizard wizard; - private final BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); + private DynamicForm form; + private PageList<BundleVersion> bundleVersions = null; + private SelectItem selectVersion = new SelectItem("selectVersion", "Deployment Version"); + private LinkedHashMap<String, Object> selectVersionValues = new LinkedHashMap<String, Object>();; public SelectBundleVersionStep(BundleDeployWizard bundleDeployWizard) { this.wizard = bundleDeployWizard; } public String getName() { - return "Select Version of Bundle to Deploy"; + return "Select Version 1"; } public Canvas getCanvas() { @@ -59,20 +61,36 @@ public class SelectBundleVersionStep implements WizardStep { form.setNumCols(2); form.setColWidths("50%", "*"); - // for now, get all the bundle versions for the bundle + // for now, get all the bundle versions for the bundle + selectVersion.setRequired(true); + //selectVersion.setWidth(150); + selectVersion.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + for (BundleVersion bundleVersion : bundleVersions) { + if (bundleVersion.getVersion().equals(event.getValue())) { + wizard.setBundleVersion(bundleVersion); + break; + } + } + enableNextButtonWhenAppropriate(); + } + }); + final BundleVersionCriteria criteria = new BundleVersionCriteria(); criteria.addFilterBundleId(wizard.getBundle().getId()); criteria.fetchConfigurationDefinition(true); - final LinkedHashMap<String, BundleVersion> bundleVersions = new LinkedHashMap<String, BundleVersion>(); - bundleServer.findBundleVersionsByCriteria(criteria, new AsyncCallback<PageList<BundleVersion>>() { public void onSuccess(PageList<BundleVersion> result) { - if (result.isEmpty()) { + bundleVersions = result; + if (bundleVersions.isEmpty()) { onFailure(new IllegalArgumentException("No bundle versions defined for bundle.")); } for (BundleVersion bundleVersion : result) { - bundleVersions.put(bundleVersion.getVersion(), bundleVersion); + selectVersionValues.put(bundleVersion.getVersion(), bundleVersion.getVersion()); } + selectVersion.setValueMap(selectVersionValues); + selectVersion.redraw(); + form.markForRedraw(); } public void onFailure(Throwable caught) { @@ -80,18 +98,7 @@ public class SelectBundleVersionStep implements WizardStep { } }); - final SelectItem selectBundle = new SelectItem("selectBundle", "Deployment Bundle"); - selectBundle.setRequired(true); - selectBundle.setWidth(150); - selectBundle.setValueMap(bundleVersions); - selectBundle.addChangedHandler(new ChangedHandler() { - public void onChanged(ChangedEvent event) { - wizard.setBundleVersion((BundleVersion) event.getValue()); - enableNextButtonWhenAppropriate(); - } - }); - - form.setItems(selectBundle); + form.setItems(selectVersion); } return form; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesDataSource.java index 50e6214..c24bf0c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesDataSource.java @@ -42,15 +42,14 @@ public class BundlesDataSource extends RPCDataSource<Bundle> { public BundlesDataSource() { - DataSourceIntegerField idField = new DataSourceIntegerField("id","ID"); + DataSourceIntegerField idField = new DataSourceIntegerField("id", "ID"); idField.setPrimaryKey(true); addField(idField); - - DataSourceTextField nameField = new DataSourceTextField("name","Name"); + DataSourceTextField nameField = new DataSourceTextField("name", "Name"); addField(nameField); - DataSourceTextField descriptionField = new DataSourceTextField("description","Description"); + DataSourceTextField descriptionField = new DataSourceTextField("description", "Description"); addField(descriptionField); } @@ -63,9 +62,9 @@ public class BundlesDataSource extends RPCDataSource<Bundle> { bundleService.findBundlesByCriteria(criteria, new AsyncCallback<PageList<Bundle>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load bundle data",caught); + CoreGUI.getErrorHandler().handleError("Failed to load bundle data", caught); response.setStatus(DSResponse.STATUS_FAILURE); - processResponse(request.getRequestId(),response); + processResponse(request.getRequestId(), response); } public void onSuccess(PageList<Bundle> result) { @@ -79,18 +78,20 @@ public class BundlesDataSource extends RPCDataSource<Bundle> { @Override public Bundle copyValues(ListGridRecord from) { - return null; // TODO: Implement this method. + return null; // TODO: Implement this method. } @Override public ListGridRecord copyValues(Bundle from) { ListGridRecord record = new ListGridRecord(); - record.setAttribute("id",from.getId()); - record.setAttribute("name",from.getName()); - record.setAttribute("description",from.getDescription()); - record.setAttribute("bundleType",from.getBundleType()); - record.setAttribute("repos",from.getRepo()); + record.setAttribute("id", from.getId()); + record.setAttribute("name", from.getName()); + record.setAttribute("description", from.getDescription()); + record.setAttribute("bundleType", from.getBundleType()); + record.setAttribute("repos", from.getRepo()); + + record.setAttribute("object", from); return record; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java index 89b69fa..ac0133b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java @@ -23,7 +23,9 @@ import com.smartgwt.client.types.SelectionStyle; import com.smartgwt.client.widgets.grid.ListGridRecord; import com.smartgwt.client.widgets.layout.VLayout; -import org.rhq.enterprise.gui.coregui.client.bundle.create.BundleCreationWizard; +import org.rhq.core.domain.bundle.Bundle; +import org.rhq.enterprise.gui.coregui.client.bundle.create.BundleCreateWizard; +import org.rhq.enterprise.gui.coregui.client.bundle.deploy.BundleDeployWizard; import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; @@ -32,12 +34,10 @@ import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; */ public class BundlesListView extends VLayout { - @Override protected void onDraw() { super.onDraw(); - Table table = new Table("Bundles"); table.setDataSource(new BundlesDataSource()); @@ -48,17 +48,19 @@ public class BundlesListView extends VLayout { table.getListGrid().setSelectionType(SelectionStyle.SIMPLE); table.getListGrid().setSelectionAppearance(SelectionAppearance.CHECKBOX); - - table.addTableAction("Create Bundle", Table.SelectionEnablement.ALWAYS, null, - new TableAction() { - public void executeAction(ListGridRecord[] selection) { - new BundleCreationWizard().startBundleWizard(); - - } - }); + table.addTableAction("Create Bundle", Table.SelectionEnablement.ALWAYS, null, new TableAction() { + public void executeAction(ListGridRecord[] selection) { + new BundleCreateWizard().startBundleWizard(); + } + }); + table.addTableAction("Deploy Selected Bundle", Table.SelectionEnablement.SINGLE, null, new TableAction() { + public void executeAction(ListGridRecord[] selection) { + new BundleDeployWizard((Bundle) selection[0].getAttributeAsObject("object")).startBundleWizard(); + } + }); addMember(table); } commit ba593b00698f588c4b9ec1f27f26cce4bcd5a775 Merge: 376eb68... fc2db3f... Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Mar 19 11:57:06 2010 -0400 Merge branch 'gwt' into gwt-jay Conflicts: modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadRecipeStep.java modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java diff --cc modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleCreateWizard.java index a84b1bf,0000000..99b1125 mode 100644,000000..100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleCreateWizard.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleCreateWizard.java @@@ -1,57 -1,0 +1,76 @@@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle.create; + +import java.util.ArrayList; + ++import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.widgets.IButton; +import com.smartgwt.client.widgets.events.ClickEvent; +import com.smartgwt.client.widgets.events.ClickHandler; + +import org.rhq.core.domain.bundle.BundleVersion; ++import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; ++import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync; ++import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; ++import org.rhq.enterprise.gui.coregui.client.util.message.Message; ++import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; + +public class BundleCreateWizard extends AbstractBundleCreationWizard { + + public BundleCreateWizard() { + setWindowTitle("Bundle Creation Wizard"); + setTitle("Create Bundle"); + + ArrayList<WizardStep> steps = new ArrayList<WizardStep>(); + steps.add(new BundleInfoStep(this)); + steps.add(new BundleUploadRecipeStep(this)); - steps.add(new BundleVerificationStep(this)); ++// steps.add(new BundleVerificationStep(this)); + steps.add(new BundleUploadDataStep(this)); + setSteps(steps); + } + + @Override + public void startBundleWizard() { + super.startBundleWizard(); + IButton cancelButton = getView().getCancelButton(); + cancelButton.addClickHandler(new ClickHandler() { + public void onClick(ClickEvent clickEvent) { - BundleVersion bv = getBundleVersion(); ++ final BundleVersion bv = getBundleVersion(); + if (bv != null) { + // the user must have created it already after verification step, delete it ++ BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); ++ bundleServer.deleteBundleVersion(bv.getId(), new AsyncCallback<Void>() { ++ public void onSuccess(Void result) { ++ CoreGUI.getMessageCenter().notify( ++ new Message("Canceled bundle [" + bv.getName() + "] version [" + bv.getVersion() + "]", ++ Severity.Info)); ++ } ++ ++ public void onFailure(Throwable caught) { ++ CoreGUI.getErrorHandler().handleError( ++ "Failed to fully cancel - bundle may still exist in the database", caught); ++ } ++ }); + } + } + }); + } +} diff --cc modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleInfoStep.java index 84d8dea,95791a3..74532ae --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleInfoStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleInfoStep.java @@@ -37,11 -45,14 +45,14 @@@ import org.rhq.enterprise.gui.coregui.c public class BundleInfoStep implements WizardStep { private DynamicForm form; - private final BundleCreationWizard wizard; + private final BundleCreateWizard wizard; private final BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); + private TextItem nameTextItem; + private TextItem versionTextItem; + private TextAreaItem descriptionTextAreaItem; - public BundleInfoStep(BundleCreationWizard bundleCreationWizard) { + public BundleInfoStep(BundleCreateWizard bundleCreationWizard) { this.wizard = bundleCreationWizard; } commit 376eb685b3de886e3ff1f2a887c292dbd86b85e4 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Mar 19 10:50:46 2010 -0400 Initial impl of bundle deploy wizard - still in progress diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleVersionCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleVersionCriteria.java index 2aab01c..0880b27 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleVersionCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleVersionCriteria.java @@ -38,6 +38,7 @@ public class BundleVersionCriteria extends Criteria { private String filterDescription; private String filterName; private String filterVersion; + private Integer filterBundleId; // needs override private String filterBundleName; // needs override private boolean fetchBundle; @@ -47,6 +48,7 @@ public class BundleVersionCriteria extends Criteria { private boolean fetchConfigurationDefinition; public BundleVersionCriteria() { + filterOverrides.put("bundleId", "bundle.id = ?"); filterOverrides.put("bundleName", "bundle.name like ?"); } @@ -67,6 +69,10 @@ public class BundleVersionCriteria extends Criteria { this.filterName = filterName; } + public void addFilterBundleId(Integer filterBundleId) { + this.filterBundleId = filterBundleId; + } + public void addFilterBundleName(String filterBundleName) { this.filterBundleName = filterBundleName; } @@ -87,6 +93,10 @@ public class BundleVersionCriteria extends Criteria { this.fetchBundleFiles = fetchBundleFiles; } + public void fetchConfigurationDefinition(boolean fetchConfigurationDefinition) { + this.fetchConfigurationDefinition = fetchConfigurationDefinition; + } + public void fetchDistribution(boolean fetchDistribution) { this.fetchDistribution = fetchDistribution; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/AbstractBundleWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/AbstractBundleWizard.java new file mode 100644 index 0000000..afd1f47 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/AbstractBundleWizard.java @@ -0,0 +1,85 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import com.smartgwt.client.widgets.IButton; + +import org.rhq.enterprise.gui.coregui.client.components.wizard.Wizard; +import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; +import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardView; + +public abstract class AbstractBundleWizard implements Wizard { + + private ArrayList<WizardStep> steps; + private WizardView view; + private String windowTitle = ""; + private String title = ""; + private String subtitle = ""; + + public String getWindowTitle() { + return windowTitle; + } + + public void setWindowTitle(String windowTitle) { + this.windowTitle = windowTitle; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getSubtitle() { + return subtitle; + } + + public void setSubtitle(String subtitle) { + this.subtitle = subtitle; + this.view.refreshTitleLabelContents(); + } + + public List<WizardStep> getSteps() { + return steps; + } + + public void setSteps(ArrayList<WizardStep> steps) { + this.steps = steps; + } + + public List<IButton> getCustomButtons(int step) { + return Collections.emptyList(); + } + + public void startBundleWizard() { + view = new WizardView(this); + view.displayDialog(); + } + + public WizardView getView() { + return view; + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java index 8839c76..dfb3ec5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java @@ -23,7 +23,6 @@ import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; import com.smartgwt.client.widgets.layout.HLayout; -import org.rhq.enterprise.gui.coregui.client.bundle.create.BundleCreationWizard; import org.rhq.enterprise.gui.coregui.client.bundle.deploy.BundleDeployWizard; /** @@ -38,18 +37,18 @@ public class BundleTopView extends HLayout { IButton addBundleButton = new IButton("New Bundle"); addBundleButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { - new BundleCreationWizard().startBundleWizard(); + new BundleDeployWizard().startBundleWizard(); } }); - IButton addDefinitionButton = new IButton("New Deployment"); - addDefinitionButton.addClickHandler(new ClickHandler() { + IButton addDeploymentButton = new IButton("New Deployment"); + addDeploymentButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { new BundleDeployWizard().startBundleWizard(); } }); addMember(addBundleButton); - addMember(addDefinitionButton); + addMember(addDeploymentButton); } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/AbstractBundleCreationWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/AbstractBundleCreationWizard.java index 2994948..1edb719 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/AbstractBundleCreationWizard.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/AbstractBundleCreationWizard.java @@ -20,6 +20,7 @@ package org.rhq.enterprise.gui.coregui.client.bundle.create; import org.rhq.core.domain.bundle.BundleType; import org.rhq.core.domain.bundle.BundleVersion; +import org.rhq.enterprise.gui.coregui.client.bundle.AbstractBundleWizard; public abstract class AbstractBundleCreationWizard extends AbstractBundleWizard { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/AbstractBundleWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/AbstractBundleWizard.java deleted file mode 100644 index 0937655..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/AbstractBundleWizard.java +++ /dev/null @@ -1,142 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.bundle.create; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import com.smartgwt.client.widgets.IButton; - -import org.rhq.core.domain.bundle.BundleType; -import org.rhq.core.domain.bundle.BundleVersion; -import org.rhq.enterprise.gui.coregui.client.components.wizard.Wizard; -import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; -import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardView; - -public abstract class AbstractBundleWizard implements Wizard { - - private ArrayList<WizardStep> steps; - private WizardView view; - private String windowTitle = ""; - private String title = ""; - private String subtitle = ""; - - // the things we build up in the wizard - private BundleType bundleType; - private String bundleName; - private String bundleVersionString; - private String bundleDescription; - private String recipe; - private BundleVersion bundleVersion; - - public String getWindowTitle() { - return windowTitle; - } - - public void setWindowTitle(String windowTitle) { - this.windowTitle = windowTitle; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getSubtitle() { - return subtitle; - } - - public void setSubtitle(String subtitle) { - this.subtitle = subtitle; - this.view.refreshTitleLabelContents(); - } - - public List<WizardStep> getSteps() { - return steps; - } - - public void setSteps(ArrayList<WizardStep> steps) { - this.steps = steps; - } - - public List<IButton> getCustomButtons(int step) { - return Collections.emptyList(); - } - - public void startBundleWizard() { - view = new WizardView(this); - view.displayDialog(); - } - - public WizardView getView() { - return view; - } - - public BundleType getBundleType() { - return bundleType; - } - - public void setBundleType(BundleType bundleType) { - this.bundleType = bundleType; - } - - public String getBundleName() { - return bundleName; - } - - public void setBundleName(String bundleName) { - this.bundleName = bundleName; - } - - public String getBundleVersionString() { - return bundleVersionString; - } - - public void setBundleVersionString(String bundleVersionString) { - this.bundleVersionString = bundleVersionString; - } - - public String getBundleDescription() { - return bundleDescription; - } - - public void setBundleDescription(String desc) { - this.bundleDescription = desc; - } - - public String getRecipe() { - return recipe; - } - - public void setRecipe(String recipe) { - this.recipe = recipe; - } - - public BundleVersion getBundleVersion() { - return bundleVersion; - } - - public void setBundleVersion(BundleVersion bv) { - this.bundleVersion = bv; - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleCreateWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleCreateWizard.java new file mode 100644 index 0000000..a84b1bf --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleCreateWizard.java @@ -0,0 +1,57 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle.create; + +import java.util.ArrayList; + +import com.smartgwt.client.widgets.IButton; +import com.smartgwt.client.widgets.events.ClickEvent; +import com.smartgwt.client.widgets.events.ClickHandler; + +import org.rhq.core.domain.bundle.BundleVersion; +import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; + +public class BundleCreateWizard extends AbstractBundleCreationWizard { + + public BundleCreateWizard() { + setWindowTitle("Bundle Creation Wizard"); + setTitle("Create Bundle"); + + ArrayList<WizardStep> steps = new ArrayList<WizardStep>(); + steps.add(new BundleInfoStep(this)); + steps.add(new BundleUploadRecipeStep(this)); + steps.add(new BundleVerificationStep(this)); + steps.add(new BundleUploadDataStep(this)); + setSteps(steps); + } + + @Override + public void startBundleWizard() { + super.startBundleWizard(); + IButton cancelButton = getView().getCancelButton(); + cancelButton.addClickHandler(new ClickHandler() { + public void onClick(ClickEvent clickEvent) { + BundleVersion bv = getBundleVersion(); + if (bv != null) { + // the user must have created it already after verification step, delete it + } + } + }); + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleCreationWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleCreationWizard.java deleted file mode 100644 index c75610a..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleCreationWizard.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.bundle.create; - -import java.util.ArrayList; - -import com.smartgwt.client.widgets.IButton; -import com.smartgwt.client.widgets.events.ClickEvent; -import com.smartgwt.client.widgets.events.ClickHandler; - -import org.rhq.core.domain.bundle.BundleVersion; -import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; - -public class BundleCreationWizard extends AbstractBundleWizard { - - public BundleCreationWizard() { - setWindowTitle("Bundle Creation Wizard"); - setTitle("Create Bundle"); - - ArrayList<WizardStep> steps = new ArrayList<WizardStep>(); - steps.add(new BundleInfoStep(this)); - steps.add(new BundleUploadRecipeStep(this)); - steps.add(new BundleVerificationStep(this)); - steps.add(new BundleUploadDataStep(this)); - setSteps(steps); - } - - @Override - public void startBundleWizard() { - super.startBundleWizard(); - IButton cancelButton = getView().getCancelButton(); - cancelButton.addClickHandler(new ClickHandler() { - public void onClick(ClickEvent clickEvent) { - BundleVersion bv = getBundleVersion(); - if (bv != null) { - // the user must have created it already after verification step, delete it - } - } - }); - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleInfoStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleInfoStep.java index 0b6d176..84d8dea 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleInfoStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleInfoStep.java @@ -37,11 +37,11 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; public class BundleInfoStep implements WizardStep { private DynamicForm form; - private final BundleCreationWizard wizard; + private final BundleCreateWizard wizard; private final BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); - public BundleInfoStep(BundleCreationWizard bundleCreationWizard) { + public BundleInfoStep(BundleCreateWizard bundleCreationWizard) { this.wizard = bundleCreationWizard; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java index 0a0a5c2..ad87a42 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java @@ -42,12 +42,12 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message; public class BundleUploadDataStep implements WizardStep { - private final BundleCreationWizard wizard; + private final BundleCreateWizard wizard; private final BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); private DynamicForm form; private Map<String, Boolean> allFilesStatus; - public BundleUploadDataStep(BundleCreationWizard bundleCreationWizard) { + public BundleUploadDataStep(BundleCreateWizard bundleCreationWizard) { this.wizard = bundleCreationWizard; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadRecipeStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadRecipeStep.java index 34e410e..8324934 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadRecipeStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadRecipeStep.java @@ -37,9 +37,9 @@ import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; public class BundleUploadRecipeStep implements WizardStep { private DynamicCallbackForm form; - private final BundleCreationWizard wizard; + private final BundleCreateWizard wizard; - public BundleUploadRecipeStep(BundleCreationWizard bundleCreationWizard) { + public BundleUploadRecipeStep(BundleCreateWizard bundleCreationWizard) { this.wizard = bundleCreationWizard; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleVerificationStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleVerificationStep.java index 40fd9f9..5dc7fb1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleVerificationStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleVerificationStep.java @@ -36,12 +36,12 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; public class BundleVerificationStep implements WizardStep { - private final BundleCreationWizard wizard; + private final BundleCreateWizard wizard; private final BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); private VLayout canvas; - public BundleVerificationStep(BundleCreationWizard bundleCreationWizard) { + public BundleVerificationStep(BundleCreateWizard bundleCreationWizard) { this.wizard = bundleCreationWizard; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/AbstractBundleDeployWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/AbstractBundleDeployWizard.java index 91b198a..5b11249 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/AbstractBundleDeployWizard.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/AbstractBundleDeployWizard.java @@ -19,17 +19,131 @@ package org.rhq.enterprise.gui.coregui.client.bundle.deploy; import org.rhq.core.domain.bundle.Bundle; +import org.rhq.core.domain.bundle.BundleDeployDefinition; +import org.rhq.core.domain.bundle.BundleDeployment; import org.rhq.core.domain.bundle.BundleVersion; import org.rhq.core.domain.configuration.Configuration; -import org.rhq.enterprise.gui.coregui.client.bundle.create.AbstractBundleWizard; +import org.rhq.core.domain.configuration.definition.ConfigurationTemplate; +import org.rhq.enterprise.gui.coregui.client.bundle.AbstractBundleWizard; public abstract class AbstractBundleDeployWizard extends AbstractBundleWizard { // the things we build up in the wizard private Bundle bundle; private BundleVersion bundleVersion; + private BundleDeployDefinition bundleDeployDefinition; + private BundleDeployment bundleDeployment; private String name; private String description; + private ConfigurationTemplate template; private Configuration config; + private Integer platformGroupId; + private Integer platformId; + private Boolean newDefinition = Boolean.TRUE; + private Boolean deployNow = null; + + public Bundle getBundle() { + return bundle; + } + + public void setBundle(Bundle bundle) { + this.bundle = bundle; + } + + public BundleVersion getBundleVersion() { + return bundleVersion; + } + + public void setBundleVersion(BundleVersion bundleVersion) { + this.bundleVersion = bundleVersion; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Configuration getConfig() { + return config; + } + + public ConfigurationTemplate getTemplate() { + return template; + } + + public void setTemplate(ConfigurationTemplate template) { + this.template = template; + } + + public void setConfig(Configuration config) { + this.config = config; + } + + public BundleDeployDefinition getBundleDeployDefinition() { + return bundleDeployDefinition; + } + + public void setBundleDeployDefinition(BundleDeployDefinition bundleDeployDefinition) { + this.bundleDeployDefinition = bundleDeployDefinition; + } + + public boolean isNewDefinition() { + return Boolean.TRUE.equals(newDefinition); + } + + public Boolean getNewDefinition() { + return newDefinition; + } + + public void setNewDefinition(Boolean newDefinition) { + this.newDefinition = newDefinition; + } + + public boolean isDeployNow() { + return Boolean.TRUE.equals(deployNow); + } + + public Boolean getDeployNow() { + return deployNow; + } + + public void setDeployNow(Boolean deployNow) { + this.deployNow = deployNow; + } + + public Integer getPlatformGroupId() { + return platformGroupId; + } + + public void setPlatformGroupId(Integer platformGroupId) { + this.platformGroupId = platformGroupId; + } + + public Integer getPlatformId() { + return platformId; + } + + public void setPlatformId(Integer platformId) { + this.platformId = platformId; + } + + public BundleDeployment getBundleDeployment() { + return bundleDeployment; + } + + public void setBundleDeployment(BundleDeployment bundleDeployment) { + this.bundleDeployment = bundleDeployment; + } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/BundleDeployDefinitionInfoStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/BundleDeployDefinitionInfoStep.java new file mode 100644 index 0000000..a6edbfe --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/BundleDeployDefinitionInfoStep.java @@ -0,0 +1,103 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle.deploy; + +import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.form.DynamicForm; +import com.smartgwt.client.widgets.form.fields.TextAreaItem; +import com.smartgwt.client.widgets.form.fields.TextItem; +import com.smartgwt.client.widgets.form.fields.events.ChangedEvent; +import com.smartgwt.client.widgets.form.fields.events.ChangedHandler; + +import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; + +public class BundleDeployDefinitionInfoStep implements WizardStep { + + private DynamicForm form; + private final BundleDeployWizard wizard; + + // private final BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); + + public BundleDeployDefinitionInfoStep(BundleDeployWizard bundleDeployWizard) { + this.wizard = bundleDeployWizard; + } + + public String getName() { + return "Provide Deploy Information"; + } + + public Canvas getCanvas() { + if (form == null) { + form = new DynamicForm(); + form.setWidth100(); + form.setNumCols(2); + form.setColWidths("50%", "*"); + + final TextItem nameTextItem = new TextItem("name", "Name"); + nameTextItem.setRequired(true); + nameTextItem.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + Object value = event.getValue(); + if (value == null) { + value = ""; + } + wizard.setSubtitle(value.toString()); + wizard.setName(value.toString()); + enableNextButtonWhenAppropriate(); + } + }); + + final TextAreaItem descriptionTextAreaItem = new TextAreaItem("description", "Description"); + descriptionTextAreaItem.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + Object value = event.getValue(); + if (value == null) { + value = ""; + } + wizard.setDescription(value.toString()); + enableNextButtonWhenAppropriate(); + } + }); + + form.setItems(nameTextItem, descriptionTextAreaItem); + } + + return form; + } + + public boolean nextPage() { + return form.validate(); + } + + public boolean isNextEnabled() { + return isNotEmpty(this.wizard.getName()); + } + + public boolean isPreviousEnabled() { + return false; + } + + private void enableNextButtonWhenAppropriate() { + this.wizard.getView().getNextButton().setDisabled(!isNextEnabled()); + } + + private boolean isNotEmpty(String s) { + return (s != null && s.trim().length() > 0); + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/BundleDeployWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/BundleDeployWizard.java index 3a71dea..eaa29d2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/BundleDeployWizard.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/BundleDeployWizard.java @@ -19,41 +19,93 @@ package org.rhq.enterprise.gui.coregui.client.bundle.deploy; import java.util.ArrayList; +import java.util.List; + +import com.smartgwt.client.widgets.IButton; +import com.smartgwt.client.widgets.events.ClickEvent; +import com.smartgwt.client.widgets.events.ClickHandler; import org.rhq.core.domain.bundle.Bundle; +import org.rhq.core.domain.bundle.BundleDeployDefinition; import org.rhq.core.domain.bundle.BundleVersion; import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; public class BundleDeployWizard extends AbstractBundleDeployWizard { public BundleDeployWizard() { - setWindowTitle("Bundle Deployment Wizard"); - setTitle("Bundle Deployment"); + List<WizardStep> steps = init(); - ArrayList<WizardStep> steps = new ArrayList<WizardStep>(); - /* steps.add(new SelectBundleStep(this)); - steps.add(new BundleUploadRecipeStep(this)); - steps.add(new BundleVerificationStep(this)); - steps.add(new BundleUploadDataStep(this)); - */ - setSteps(steps); + steps.add(new SelectBundleVersionStep(this)); + steps.add(new BundleDeployDefinitionInfoStep(this)); + steps.add(new SelectTemplateStep(this)); + steps.add(new CreateConfigStep(this)); + steps.add(new DeployNowStep(this)); + steps.add(new SelectPlatformsStep(this)); + steps.add(new DeployStep(this)); } public BundleDeployWizard(Bundle bundle) { - setWindowTitle("Bundle Deployment Wizard"); - setTitle("Bundle Deployment"); + List<WizardStep> steps = init(); + setBundle(bundle); - ArrayList<WizardStep> steps = new ArrayList<WizardStep>(); - setSteps(steps); + steps.add(new SelectBundleVersionStep(this)); + steps.add(new BundleDeployDefinitionInfoStep(this)); + steps.add(new SelectTemplateStep(this)); + steps.add(new CreateConfigStep(this)); + steps.add(new DeployNowStep(this)); + steps.add(new SelectPlatformsStep(this)); + steps.add(new DeployStep(this)); } - public BundleDeployWizard(BundleVersion bundleVersion) { + public BundleDeployWizard(Bundle bundle, BundleVersion bundleVersion) { + List<WizardStep> steps = init(); + setBundle(bundle); + setBundleVersion(bundleVersion); + + steps.add(new BundleDeployDefinitionInfoStep(this)); + steps.add(new SelectTemplateStep(this)); + steps.add(new CreateConfigStep(this)); + steps.add(new DeployNowStep(this)); + steps.add(new SelectPlatformsStep(this)); + steps.add(new DeployStep(this)); + } + + public BundleDeployWizard(Bundle bundle, BundleVersion bundleVersion, BundleDeployDefinition bundleDeployDefinition) { + List<WizardStep> steps = init(); + setBundle(bundle); + setBundleVersion(bundleVersion); + setBundleDeployDefinition(bundleDeployDefinition); + setNewDefinition(Boolean.FALSE); + + steps.add(new SelectTemplateStep(this)); + steps.add(new CreateConfigStep(this)); + steps.add(new DeployNowStep(this)); + steps.add(new SelectPlatformsStep(this)); + steps.add(new DeployStep(this)); + } + + private List<WizardStep> init() { setWindowTitle("Bundle Deployment Wizard"); setTitle("Bundle Deployment"); ArrayList<WizardStep> steps = new ArrayList<WizardStep>(); setSteps(steps); + return steps; + } + + @Override + public void startBundleWizard() { + super.startBundleWizard(); + IButton cancelButton = getView().getCancelButton(); + cancelButton.addClickHandler(new ClickHandler() { + public void onClick(ClickEvent clickEvent) { + BundleDeployDefinition bdd = getBundleDeployDefinition(); + if (bdd != null && isNewDefinition()) { + // the user must have created it already after verification step, delete it + } + } + }); } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/CreateConfigStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/CreateConfigStep.java new file mode 100644 index 0000000..cd99e44 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/CreateConfigStep.java @@ -0,0 +1,79 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle.deploy; + +import java.util.List; + +import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.form.DynamicForm; + +import org.rhq.core.clientapi.agent.configuration.ConfigurationUtility; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; +import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor; +import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; + +public class CreateConfigStep implements WizardStep { + + private DynamicForm form; + private final BundleDeployWizard wizard; + // private final BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); + private ConfigurationEditor editor; + + public CreateConfigStep(BundleDeployWizard bundleCreationWizard) { + this.wizard = bundleCreationWizard; + } + + public String getName() { + return "Set Deployment Configuration"; + } + + public Canvas getCanvas() { + if (editor == null) { + ConfigurationDefinition configDef = wizard.getBundleVersion().getConfigurationDefinition(); + Configuration startingConfig = null; + if (null != wizard.getTemplate()) { + startingConfig = wizard.getTemplate().getConfiguration(); + } + + editor = new ConfigurationEditor(configDef, startingConfig); + } + + return editor; + } + + public boolean nextPage() { + return form.validate(); + } + + public boolean isPreviousEnabled() { + return true; + } + + public boolean isNextEnabled() { + wizard.setConfig(editor.getConfiguration()); + List<String> messages = ConfigurationUtility.validateConfiguration(wizard.getConfig(), wizard + .getBundleVersion().getConfigurationDefinition()); + return messages.isEmpty(); + } + + public Configuration getConfiguration() { + return editor.getConfiguration(); + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/DeployNowStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/DeployNowStep.java new file mode 100644 index 0000000..e3bc504 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/DeployNowStep.java @@ -0,0 +1,92 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle.deploy; + +import java.util.LinkedHashMap; + +import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.form.DynamicForm; +import com.smartgwt.client.widgets.form.fields.RadioGroupItem; +import com.smartgwt.client.widgets.form.fields.events.ChangedEvent; +import com.smartgwt.client.widgets.form.fields.events.ChangedHandler; + +import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; +import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; + +public class DeployNowStep implements WizardStep { + + private DynamicForm form; + private final BundleDeployWizard wizard; + + private final BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); + + public DeployNowStep(BundleDeployWizard bundleCreationWizard) { + this.wizard = bundleCreationWizard; + } + + public String getName() { + return "Deploy Now or Later"; + } + + public Canvas getCanvas() { + if (form == null) { + form = new DynamicForm(); + form.setWidth100(); + form.setNumCols(2); + form.setColWidths("50%", "*"); + + LinkedHashMap<String, Boolean> values = new LinkedHashMap<String, Boolean>(); + values.put("Deploy Now", Boolean.TRUE); + values.put("Save Definition and Deploy Later", Boolean.FALSE); + final RadioGroupItem radioGroupItem = new RadioGroupItem("options", "Deploy Options"); + radioGroupItem.setRequired(true); + radioGroupItem.setValueMap(values); + radioGroupItem.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + wizard.setDeployNow((Boolean) event.getValue()); + enableNextButtonWhenAppropriate(); + } + }); + + form.setItems(radioGroupItem); + } + return form; + } + + public boolean nextPage() { + return form.validate(); + } + + public boolean isNextEnabled() { + return (null != this.wizard.getDeployNow()); + } + + public boolean isPreviousEnabled() { + return true; + } + + private void enableNextButtonWhenAppropriate() { + this.wizard.getView().getNextButton().setDisabled(!isNextEnabled()); + } + + private boolean isNotEmpty(String s) { + return (s != null && s.trim().length() > 0); + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/DeployStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/DeployStep.java new file mode 100644 index 0000000..bbf30bf --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/DeployStep.java @@ -0,0 +1,136 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle.deploy; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.ui.HasHorizontalAlignment; +import com.google.gwt.user.client.ui.Label; +import com.smartgwt.client.types.Alignment; +import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.Img; +import com.smartgwt.client.widgets.layout.VLayout; + +import org.rhq.core.domain.bundle.BundleDeployDefinition; +import org.rhq.core.domain.bundle.BundleDeployment; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; +import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; +import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; + +public class DeployStep implements WizardStep { + + private VLayout canvas; + private final BundleDeployWizard wizard; + + private final BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); + + public DeployStep(BundleDeployWizard bundleCreationWizard) { + this.wizard = bundleCreationWizard; + } + + public Canvas getCanvas() { + if (canvas == null) { + canvas = new VLayout(); + canvas.setWidth100(); + canvas.setHeight100(); + canvas.setAlign(Alignment.CENTER); + + final Img deployingImage = new Img("/images/status-bar.gif"); + deployingImage.setLayoutAlign(Alignment.CENTER); + deployingImage.setWidth(50); + deployingImage.setHeight(15); + + final Label deployingMessage = new Label("Deploying..."); + deployingMessage.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER); + + canvas.addMember(deployingImage); + canvas.addMember(deployingMessage); + + if (wizard.isNewDefinition()) { + bundleServer.createBundleDeployDefinition(wizard.getBundleVersion().getId(), wizard.getName(), wizard + .getDescription(), wizard.getConfig(), false, -1, false, + new AsyncCallback<BundleDeployDefinition>() { + public void onSuccess(BundleDeployDefinition result) { + deployingImage.setSrc("/images/status_complete.gif"); + deployingMessage.setText("Created Deploy Definition..."); + CoreGUI.getMessageCenter().notify( + new Message("Created deploy definition [" + result.getName() + "] description [" + + result.getDescription(), Severity.Info)); + wizard.setBundleDeployDefinition(result); + enableNextButtonWhenAppropriate(); + } + + public void onFailure(Throwable caught) { + deployingImage.setSrc("/images/status_error.gif"); + deployingMessage.setText("Failed to create deply definition!"); + CoreGUI.getErrorHandler().handleError( + "Failed to create deploy definition: " + caught.getMessage(), caught); + enableNextButtonWhenAppropriate(); + } + }); + } + + bundleServer.scheduleBundleDeployment(wizard.getBundleDeployDefinition().getId(), wizard.getPlatformId(), + new AsyncCallback<BundleDeployment>() { + public void onSuccess(BundleDeployment result) { + deployingImage.setSrc("/images/status_complete.gif"); + deployingMessage.setText("Bundle Deployment Scheduled!"); + CoreGUI.getMessageCenter().notify( + new Message("Schedule bundle deployment [" + wizard.getBundleDeployDefinition().getName() + + "] resource [" + result.getResource() + "]", Severity.Info)); + wizard.setBundleDeployment(result); + enableNextButtonWhenAppropriate(); + } + + public void onFailure(Throwable caught) { + deployingImage.setSrc("/images/status_error.gif"); + deployingMessage.setText("Failed to Schedule Deployment!"); + CoreGUI.getErrorHandler().handleError("Failed to schedule deployment: " + caught.getMessage(), + caught); + wizard.setBundleDeployment(null); + enableNextButtonWhenAppropriate(); + } + }); + } + + return canvas; + } + + public boolean nextPage() { + return this.wizard.getBundleVersion() != null; + } + + public String getName() { + return "Deploy Bundle to Target Platforms"; + } + + public boolean isNextEnabled() { + return this.wizard.getBundleDeployment() != null; + } + + public boolean isPreviousEnabled() { + return true; + } + + private void enableNextButtonWhenAppropriate() { + this.wizard.getView().getNextButton().setDisabled(!isNextEnabled()); + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleStep.java new file mode 100644 index 0000000..1404567 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleStep.java @@ -0,0 +1,112 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle.deploy; + +import java.util.LinkedHashMap; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.form.DynamicForm; +import com.smartgwt.client.widgets.form.fields.SelectItem; +import com.smartgwt.client.widgets.form.fields.events.ChangedEvent; +import com.smartgwt.client.widgets.form.fields.events.ChangedHandler; + +import org.rhq.core.domain.bundle.Bundle; +import org.rhq.core.domain.criteria.BundleCriteria; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; +import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; + +/** Temporary step pending creation of Bundle navigatin screen */ + +public class SelectBundleStep implements WizardStep { + + private DynamicForm form; + private final BundleDeployWizard wizard; + private final BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); + + public SelectBundleStep(BundleDeployWizard bundleDeployWizard) { + this.wizard = bundleDeployWizard; + } + + public String getName() { + return "Select Bundle to Deploy"; + } + + public Canvas getCanvas() { + if (form == null) { + form = new DynamicForm(); + form.setWidth100(); + form.setNumCols(2); + form.setColWidths("50%", "*"); + + // for now, get all the bundles + final BundleCriteria criteria = new BundleCriteria(); + final LinkedHashMap<String, Bundle> bundleNames = new LinkedHashMap<String, Bundle>(); + + bundleServer.findBundlesByCriteria(criteria, new AsyncCallback<PageList<Bundle>>() { + public void onSuccess(PageList<Bundle> result) { + if (result.isEmpty()) { + onFailure(new IllegalArgumentException("No bundles defined.")); + } + for (Bundle bundle : result) { + bundleNames.put(bundle.getName(), bundle); + } + } + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError("Failed to find defined bundles.", caught); + } + }); + + final SelectItem selectBundle = new SelectItem("selectBundle", "Deployment Bundle"); + selectBundle.setRequired(true); + selectBundle.setWidth(150); + selectBundle.setValueMap(bundleNames); + selectBundle.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + wizard.setBundle((Bundle) event.getValue()); + enableNextButtonWhenAppropriate(); + } + }); + + form.setItems(selectBundle); + } + + return form; + } + + public boolean nextPage() { + return form.validate(); + } + + public boolean isNextEnabled() { + return (null != this.wizard.getBundle()); + } + + public boolean isPreviousEnabled() { + return false; + } + + private void enableNextButtonWhenAppropriate() { + this.wizard.getView().getNextButton().setDisabled(!isNextEnabled()); + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleVersionStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleVersionStep.java new file mode 100644 index 0000000..a34f34e --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleVersionStep.java @@ -0,0 +1,115 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle.deploy; + +import java.util.LinkedHashMap; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.form.DynamicForm; +import com.smartgwt.client.widgets.form.fields.SelectItem; +import com.smartgwt.client.widgets.form.fields.events.ChangedEvent; +import com.smartgwt.client.widgets.form.fields.events.ChangedHandler; + +import org.rhq.core.domain.bundle.BundleVersion; +import org.rhq.core.domain.criteria.BundleVersionCriteria; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; +import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; + +/** Temporary step pending creation of BundleVersion navigation screen */ + +public class SelectBundleVersionStep implements WizardStep { + + private DynamicForm form; + private final BundleDeployWizard wizard; + + private final BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); + + public SelectBundleVersionStep(BundleDeployWizard bundleDeployWizard) { + this.wizard = bundleDeployWizard; + } + + public String getName() { + return "Select Version of Bundle to Deploy"; + } + + public Canvas getCanvas() { + if (form == null) { + form = new DynamicForm(); + form.setWidth100(); + form.setNumCols(2); + form.setColWidths("50%", "*"); + + // for now, get all the bundle versions for the bundle + final BundleVersionCriteria criteria = new BundleVersionCriteria(); + criteria.addFilterBundleId(wizard.getBundle().getId()); + criteria.fetchConfigurationDefinition(true); + final LinkedHashMap<String, BundleVersion> bundleVersions = new LinkedHashMap<String, BundleVersion>(); + + bundleServer.findBundleVersionsByCriteria(criteria, new AsyncCallback<PageList<BundleVersion>>() { + public void onSuccess(PageList<BundleVersion> result) { + if (result.isEmpty()) { + onFailure(new IllegalArgumentException("No bundle versions defined for bundle.")); + } + for (BundleVersion bundleVersion : result) { + bundleVersions.put(bundleVersion.getVersion(), bundleVersion); + } + } + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError("Failed to find defined bundles.", caught); + } + }); + + final SelectItem selectBundle = new SelectItem("selectBundle", "Deployment Bundle"); + selectBundle.setRequired(true); + selectBundle.setWidth(150); + selectBundle.setValueMap(bundleVersions); + selectBundle.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + wizard.setBundleVersion((BundleVersion) event.getValue()); + enableNextButtonWhenAppropriate(); + } + }); + + form.setItems(selectBundle); + } + + return form; + } + + public boolean nextPage() { + return form.validate(); + } + + public boolean isNextEnabled() { + return (null != this.wizard.getBundle()); + } + + public boolean isPreviousEnabled() { + return true; + } + + private void enableNextButtonWhenAppropriate() { + this.wizard.getView().getNextButton().setDisabled(!isNextEnabled()); + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectPlatformsStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectPlatformsStep.java new file mode 100644 index 0000000..d523fbe --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectPlatformsStep.java @@ -0,0 +1,89 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle.deploy; + +import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.form.DynamicForm; +import com.smartgwt.client.widgets.form.fields.TextItem; +import com.smartgwt.client.widgets.form.fields.events.ChangedEvent; +import com.smartgwt.client.widgets.form.fields.events.ChangedHandler; + +import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; +import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; + +public class SelectPlatformsStep implements WizardStep { + + private DynamicForm form; + private final BundleDeployWizard wizard; + + private final BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); + + public SelectPlatformsStep(BundleDeployWizard bundleCreationWizard) { + this.wizard = bundleCreationWizard; + } + + public Canvas getCanvas() { + if (form == null) { + form = new DynamicForm(); + form.setWidth100(); + form.setNumCols(2); + form.setColWidths("50%", "*"); + + // TODO: this is temporary until we have a resource selection step + final TextItem platformIdTextItem = new TextItem("platformId", "Platform Resource Id"); + platformIdTextItem.setRequired(true); + platformIdTextItem.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + Object value = event.getValue(); + if (value == null) { + value = ""; + } + wizard.setSubtitle(value.toString()); + wizard.setPlatformId(Integer.valueOf(value.toString())); + enableNextButtonWhenAppropriate(); + } + }); + + form.setItems(platformIdTextItem); + } + + return form; + } + + public boolean nextPage() { + return form.validate(); + } + + public String getName() { + return "Select Target Platforms"; + } + + public boolean isNextEnabled() { + return (null != this.wizard.getPlatformId()); + } + + public boolean isPreviousEnabled() { + return true; + } + + private void enableNextButtonWhenAppropriate() { + this.wizard.getView().getNextButton().setDisabled(!isNextEnabled()); + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectTemplateStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectTemplateStep.java new file mode 100644 index 0000000..982eb90 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectTemplateStep.java @@ -0,0 +1,89 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle.deploy; + +import java.util.Map; + +import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.form.DynamicForm; +import com.smartgwt.client.widgets.form.fields.SelectItem; +import com.smartgwt.client.widgets.form.fields.events.ChangedEvent; +import com.smartgwt.client.widgets.form.fields.events.ChangedHandler; + +import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; +import org.rhq.core.domain.configuration.definition.ConfigurationTemplate; +import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; + +public class SelectTemplateStep implements WizardStep { + + private DynamicForm form; + private final BundleDeployWizard wizard; + + //private final BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); + + public SelectTemplateStep(BundleDeployWizard bundleDeployWizard) { + this.wizard = bundleDeployWizard; + } + + public String getName() { + return "Select a Configuration Template"; + } + + public Canvas getCanvas() { + if (form == null) { + form = new DynamicForm(); + form.setWidth100(); + form.setNumCols(2); + form.setColWidths("50%", "*"); + + SelectItem selectTemplate = new SelectItem("template", "Template"); + selectTemplate.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + wizard.setTemplate((ConfigurationTemplate) event.getValue()); + } + }); + + ConfigurationDefinition definition = wizard.getBundleVersion().getConfigurationDefinition(); + Map<String, ConfigurationTemplate> templates = definition.getTemplates(); + + if (templates != null && !templates.isEmpty()) { + selectTemplate.setValueMap(templates.keySet().toArray(new String[templates.size()])); + } else { + selectTemplate.setDisabled(true); + } + + form.setItems(selectTemplate); + } + + this.wizard.getView().getNextButton().setDisabled(false); + return form; + } + + public boolean nextPage() { + return form.validate(); + } + + public boolean isPreviousEnabled() { + return false; + } + + public boolean isNextEnabled() { + return true; + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java index 1b0f296..82d6166 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java @@ -24,24 +24,37 @@ import java.util.HashMap; import com.google.gwt.user.client.rpc.RemoteService; import org.rhq.core.domain.bundle.Bundle; +import org.rhq.core.domain.bundle.BundleDeployDefinition; +import org.rhq.core.domain.bundle.BundleDeployment; import org.rhq.core.domain.bundle.BundleType; import org.rhq.core.domain.bundle.BundleVersion; +import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.criteria.BundleCriteria; +import org.rhq.core.domain.criteria.BundleVersionCriteria; import org.rhq.core.domain.util.PageList; public interface BundleGWTService extends RemoteService { - ArrayList<BundleType> getAllBundleTypes(); - - PageList<Bundle> findBundlesByCriteria(BundleCriteria criteria) throws Exception; Bundle createBundle(String name, int bundleTypeId) throws Exception; - BundleVersion createBundleVersion(int bundleId, String name, String version, String recipe) throws Exception; - BundleVersion createBundleAndBundleVersion(String bundleName, int bundleTypeId, String name, String version, String description, String recipe) throws Exception; - HashMap<String, Boolean> getAllBundleVersionFilenames(int bundleVersionId) throws Exception; + BundleDeployDefinition createBundleDeployDefinition(int bundleVersionId, String name, String description, + Configuration configuration, boolean enforcePolicy, int enforcementInterval, boolean pinToBundle) + throws Exception; + + BundleVersion createBundleVersion(int bundleId, String name, String version, String recipe) throws Exception; void deleteBundleVersion(int bundleVersionId); + + PageList<Bundle> findBundlesByCriteria(BundleCriteria criteria) throws Exception; + + PageList<BundleVersion> findBundleVersionsByCriteria(BundleVersionCriteria criteria) throws Exception; + + HashMap<String, Boolean> getAllBundleVersionFilenames(int bundleVersionId) throws Exception; + + ArrayList<BundleType> getAllBundleTypes(); + + BundleDeployment scheduleBundleDeployment(int bundleDeployDefinitionId, int resourceId) throws Exception; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java index a4de053..4cc3293 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java @@ -22,8 +22,11 @@ import java.util.ArrayList; import java.util.HashMap; import org.rhq.core.domain.bundle.Bundle; +import org.rhq.core.domain.bundle.BundleDeployDefinition; +import org.rhq.core.domain.bundle.BundleDeployment; import org.rhq.core.domain.bundle.BundleType; import org.rhq.core.domain.bundle.BundleVersion; +import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.criteria.BundleCriteria; import org.rhq.core.domain.criteria.BundleVersionCriteria; import org.rhq.core.domain.util.PageList; @@ -38,73 +41,87 @@ public class BundleGWTServiceImpl extends AbstractGWTServiceImpl implements Bund private BundleManagerLocal bundleManager = LookupUtil.getBundleManager(); - public void deleteBundleVersion(int bundleVersionId) { + public Bundle createBundle(String name, int bundleTypeId) throws Exception { + Bundle results; try { - bundleManager.deleteBundleVersion(getSessionSubject(), bundleVersionId); + results = bundleManager.createBundle(getSessionSubject(), name, null, bundleTypeId); } catch (Exception e) { - throw new RuntimeException(ThrowableUtil.getAllMessages(e)); + throw new Exception(ThrowableUtil.getAllMessages(e)); } + return SerialUtility.prepare(results, "createBundle"); } - public ArrayList<BundleType> getAllBundleTypes() { + public BundleVersion createBundleAndBundleVersion(String bundleName, int bundleTypeId, String name, String version, + String description, String recipe) throws Exception { + + BundleVersion results; try { - ArrayList<BundleType> bundleTypes = new ArrayList<BundleType>(); - bundleTypes.addAll(bundleManager.getAllBundleTypes(getSessionSubject())); - return SerialUtility.prepare(bundleTypes, "getBundleTypes"); + results = bundleManager.createBundleAndBundleVersion(getSessionSubject(), bundleName, description, + bundleTypeId, name, null, version, recipe); } catch (Exception e) { throw new RuntimeException(ThrowableUtil.getAllMessages(e)); } + return SerialUtility.prepare(results, "createBundleAndBundleVersion"); } - public PageList<Bundle> findBundlesByCriteria(BundleCriteria criteria) { + public BundleDeployDefinition createBundleDeployDefinition(int bundleVersionId, String name, String description, + Configuration configuration, boolean enforcePolicy, int enforcementInterval, boolean pinToBundle) + throws Exception { + try { - PageList<Bundle> results = bundleManager.findBundlesByCriteria(getSessionSubject(), criteria); - return SerialUtility.prepare(results, "findBundlesByCriteria"); + BundleDeployDefinition result = bundleManager.createBundleDeployDefinition(getSessionSubject(), + bundleVersionId, name, description, configuration, enforcePolicy, enforcementInterval, pinToBundle); + + return SerialUtility.prepare(result, "createBundleDeployDefinition"); } catch (Exception e) { - throw new RuntimeException(ThrowableUtil.getAllMessages(e)); + throw new Exception(ThrowableUtil.getAllMessages(e)); } } - public PageList<BundleVersion> findBundleVersionsByCriteria(BundleVersionCriteria criteria) { + public BundleVersion createBundleVersion(int bundleId, String name, String version, String recipe) throws Exception { + BundleVersion results; try { - PageList<BundleVersion> results = bundleManager.findBundleVersionsByCriteria(getSessionSubject(), criteria); - return SerialUtility.prepare(results, "findBundleVersionsByCriteria"); + results = bundleManager.createBundleVersion(getSessionSubject(), bundleId, name, null, version, recipe); } catch (Exception e) { - throw new RuntimeException(ThrowableUtil.getAllMessages(e)); + throw new Exception(ThrowableUtil.getAllMessages(e)); } + return SerialUtility.prepare(results, "createBundleVersion"); } - public Bundle createBundle(String name, int bundleTypeId) throws Exception { - Bundle results; + public void deleteBundleVersion(int bundleVersionId) { try { - results = bundleManager.createBundle(getSessionSubject(), name, null, bundleTypeId); + bundleManager.deleteBundleVersion(getSessionSubject(), bundleVersionId); } catch (Exception e) { - throw new Exception(ThrowableUtil.getAllMessages(e)); + throw new RuntimeException(ThrowableUtil.getAllMessages(e)); } - return SerialUtility.prepare(results, "createBundle"); } - public BundleVersion createBundleVersion(int bundleId, String name, String version, String recipe) throws Exception { - BundleVersion results; + public PageList<Bundle> findBundlesByCriteria(BundleCriteria criteria) { try { - results = bundleManager.createBundleVersion(getSessionSubject(), bundleId, name, null, version, recipe); + PageList<Bundle> results = bundleManager.findBundlesByCriteria(getSessionSubject(), criteria); + return SerialUtility.prepare(results, "findBundlesByCriteria"); } catch (Exception e) { - throw new Exception(ThrowableUtil.getAllMessages(e)); + throw new RuntimeException(ThrowableUtil.getAllMessages(e)); } - return SerialUtility.prepare(results, "createBundleVersion"); } - public BundleVersion createBundleAndBundleVersion(String bundleName, int bundleTypeId, String name, String version, - String description, String recipe) throws Exception { + public PageList<BundleVersion> findBundleVersionsByCriteria(BundleVersionCriteria criteria) { + try { + PageList<BundleVersion> results = bundleManager.findBundleVersionsByCriteria(getSessionSubject(), criteria); + return SerialUtility.prepare(results, "findBundleVersionsByCriteria"); + } catch (Exception e) { + throw new RuntimeException(ThrowableUtil.getAllMessages(e)); + } + } - BundleVersion results; + public ArrayList<BundleType> getAllBundleTypes() { try { - results = bundleManager.createBundleAndBundleVersion(getSessionSubject(), bundleName, description, - bundleTypeId, name, null, version, recipe); + ArrayList<BundleType> bundleTypes = new ArrayList<BundleType>(); + bundleTypes.addAll(bundleManager.getAllBundleTypes(getSessionSubject())); + return SerialUtility.prepare(bundleTypes, "getBundleTypes"); } catch (Exception e) { throw new RuntimeException(ThrowableUtil.getAllMessages(e)); } - return SerialUtility.prepare(results, "createBundleAndBundleVersion"); } public HashMap<String, Boolean> getAllBundleVersionFilenames(int bundleVersionId) throws Exception { @@ -117,4 +134,13 @@ public class BundleGWTServiceImpl extends AbstractGWTServiceImpl implements Bund return SerialUtility.prepare(results, "getAllBundleVersionFilenames"); } + public BundleDeployment scheduleBundleDeployment(int bundleDeployDefinitionId, int resourceId) throws Exception { + try { + BundleDeployment result = bundleManager.scheduleBundleDeployment(getSessionSubject(), + bundleDeployDefinitionId, resourceId); + return SerialUtility.prepare(result, "scheduleBundleDeployment"); + } catch (Exception e) { + throw new RuntimeException(ThrowableUtil.getAllMessages(e)); + } + } } \ No newline at end of file commit 1c240f01dcc5b833a517c53a783a775617f1d753 Merge: 3f76833... 32aaf25... Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Mar 18 13:41:28 2010 -0400 Merge branch 'gwt' into gwt-jay commit 3f76833e9b01a888b7b29ab91790adfed384bd45 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Mar 18 13:40:26 2010 -0400 Basic framework for Deploy wizard diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java index 46bee74..8839c76 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java @@ -24,6 +24,7 @@ import com.smartgwt.client.widgets.events.ClickHandler; import com.smartgwt.client.widgets.layout.HLayout; import org.rhq.enterprise.gui.coregui.client.bundle.create.BundleCreationWizard; +import org.rhq.enterprise.gui.coregui.client.bundle.deploy.BundleDeployWizard; /** * @author Greg Hinkle @@ -34,13 +35,21 @@ public class BundleTopView extends HLayout { protected void onDraw() { super.onDraw(); - IButton addButton = new IButton("New Bundle"); - addButton.addClickHandler(new ClickHandler() { + IButton addBundleButton = new IButton("New Bundle"); + addBundleButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { new BundleCreationWizard().startBundleWizard(); } }); - addMember(addButton); + IButton addDefinitionButton = new IButton("New Deployment"); + addDefinitionButton.addClickHandler(new ClickHandler() { + public void onClick(ClickEvent clickEvent) { + new BundleDeployWizard().startBundleWizard(); + } + }); + + addMember(addBundleButton); + addMember(addDefinitionButton); } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/AbstractBundleCreationWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/AbstractBundleCreationWizard.java new file mode 100644 index 0000000..2994948 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/AbstractBundleCreationWizard.java @@ -0,0 +1,81 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle.create; + +import org.rhq.core.domain.bundle.BundleType; +import org.rhq.core.domain.bundle.BundleVersion; + +public abstract class AbstractBundleCreationWizard extends AbstractBundleWizard { + + // the things we build up in the wizard + private BundleType bundleType; + private String bundleName; + private String bundleVersionString; + private String bundleDescription; + private String recipe; + private BundleVersion bundleVersion; + + public BundleType getBundleType() { + return bundleType; + } + + public void setBundleType(BundleType bundleType) { + this.bundleType = bundleType; + } + + public String getBundleName() { + return bundleName; + } + + public void setBundleName(String bundleName) { + this.bundleName = bundleName; + } + + public String getBundleVersionString() { + return bundleVersionString; + } + + public void setBundleVersionString(String bundleVersionString) { + this.bundleVersionString = bundleVersionString; + } + + public String getBundleDescription() { + return bundleDescription; + } + + public void setBundleDescription(String desc) { + this.bundleDescription = desc; + } + + public String getRecipe() { + return recipe; + } + + public void setRecipe(String recipe) { + this.recipe = recipe; + } + + public BundleVersion getBundleVersion() { + return bundleVersion; + } + + public void setBundleVersion(BundleVersion bv) { + this.bundleVersion = bv; + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/AbstractBundleDeployWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/AbstractBundleDeployWizard.java new file mode 100644 index 0000000..91b198a --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/AbstractBundleDeployWizard.java @@ -0,0 +1,35 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle.deploy; + +import org.rhq.core.domain.bundle.Bundle; +import org.rhq.core.domain.bundle.BundleVersion; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.enterprise.gui.coregui.client.bundle.create.AbstractBundleWizard; + +public abstract class AbstractBundleDeployWizard extends AbstractBundleWizard { + + // the things we build up in the wizard + private Bundle bundle; + private BundleVersion bundleVersion; + private String name; + private String description; + private Configuration config; + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/BundleDeployWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/BundleDeployWizard.java new file mode 100644 index 0000000..3a71dea --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/BundleDeployWizard.java @@ -0,0 +1,59 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle.deploy; + +import java.util.ArrayList; + +import org.rhq.core.domain.bundle.Bundle; +import org.rhq.core.domain.bundle.BundleVersion; +import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; + +public class BundleDeployWizard extends AbstractBundleDeployWizard { + + public BundleDeployWizard() { + setWindowTitle("Bundle Deployment Wizard"); + setTitle("Bundle Deployment"); + + ArrayList<WizardStep> steps = new ArrayList<WizardStep>(); + /* + steps.add(new SelectBundleStep(this)); + steps.add(new BundleUploadRecipeStep(this)); + steps.add(new BundleVerificationStep(this)); + steps.add(new BundleUploadDataStep(this)); + */ + setSteps(steps); + } + + public BundleDeployWizard(Bundle bundle) { + setWindowTitle("Bundle Deployment Wizard"); + setTitle("Bundle Deployment"); + + ArrayList<WizardStep> steps = new ArrayList<WizardStep>(); + setSteps(steps); + } + + public BundleDeployWizard(BundleVersion bundleVersion) { + setWindowTitle("Bundle Deployment Wizard"); + setTitle("Bundle Deployment"); + + ArrayList<WizardStep> steps = new ArrayList<WizardStep>(); + setSteps(steps); + } + +}

1 0

[rhq] Branch 'bugfixes' - modules/enterprise pom.xml
by ips 19 Mar '10

19 Mar '10

modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/fileUpload.xhtml | 39 + modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create.xhtml | 230 +++++----- modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/file-upload.xhtml | 49 -- modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/inventory/create-file-upload.xhtml | 52 -- pom.xml | 2 5 files changed, 184 insertions(+), 188 deletions(-) New commits: commit ba33dfa1d25f9f3e386e0f4e8124aa1654fa3a0e Author: Ian P. Springer <ips(a)jetengine.(none)> Date: Fri Mar 19 17:30:50 2010 -0400 fix file upload hanging by implementing workaround for https://jira.jboss.org/jira/browse/RF-8359; upgrade RichFaces from 3.3.2.GA to 3.3.3.CR1; create fileUpload.xhtml template that is shared by both file upload pages diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/fileUpload.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/fileUpload.xhtml new file mode 100644 index 0000000..b2b5aca --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/fileUpload.xhtml @@ -0,0 +1,39 @@ +<?xml version="1.0"?> + +<ui:composition + template="/rhq/layout/popup.xhtml" + xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:c="http://java.sun.com/jstl/core" + xmlns:fn="http://java.sun.com/jsp/jstl/functions" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich" + xmlns:onc="http://jboss.org/on/component"> + + <ui:define name="body-area"> + + <rich:panel id="fileUploadPanel"> + <f:facet name="header"> + <h:outputText value="#{pageTitle}"/> + </f:facet> + + <h:panelGrid columns="1" width="100%"> + <h:form id="fileUploadForm" enctype="multipart/form-data"> + <rich:fileUpload + fileUploadListener="#{fileUploadUIBean.fileUploadListener}" + listHeight="60px" + maxFilesQuantity="1" + immediateUpload="false" + autoclear="false" + onuploadcomplete="javascript:window.opener.location.reload();window.close()" + allowFlash="false"> + </rich:fileUpload> + </h:form> + </h:panelGrid> + </rich:panel> + + </ui:define> + +</ui:composition> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create.xhtml index dfe7cd8..fd72919 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create.xhtml @@ -1,125 +1,125 @@ -<?xml version="1.0"?> - -<!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:c="http://java.sun.com/jstl/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.ajax4jsf.org/rich"> - -<ui:composition template="/rhq/resource/layout/main.xhtml"> - - <ui:param name="pageTitle" value="Upload New Package"/> - <ui:param name="selectedTabName" value="Content.New"/> - <ui:define name="content"> - - <rich:panel id="fileUploadPanel"> - <f:facet name="header"> - <h:outputText value="Package File"/> - </f:facet> - - <h:panelGrid columns="1" width="100%" rendered="${ResourceUIBean.permissions.content}"> - <rich:panel> - <input type="button" - class="buttonmed" - value="UPLOAD FILE..." - onclick="javascript:open('/rhq/resource/content/file-upload.xhtml', 'uploadwin', 'titlebar=0,toolbar=0,location=0,menubar=0,directories=0,resizable=0,height=160,width=450')"/> - <rich:spacer width="5" /> - <h:outputText rendered="#{UploadNewPackageUIBean.fileUploaded}" - value="File Uploaded: #{UploadNewPackageUIBean.fileItem.fileName}"/> - </rich:panel> - </h:panelGrid> - - <h:outputText rendered="#{!ResourceUIBean.permissions.content}" - value="You do not have permissions to upload content"/> - - </rich:panel> - - <h:form id="uploadForm"> - <input type="hidden" name="id" value="${param.id}"/> - - <rich:panel rendered="#{CreateNewPackageUIBean.needRequestPackageDetails}"> - - <f:facet name="header">New Package Details</f:facet> - - <input type="hidden" name="newPackage" value="true"/> - - <table> - <tr> - <td align="right"><b>Name*</b></td> - <td align="left"><h:inputText value="#{CreateNewPackageUIBean.packageName}"/></td> - </tr> - <tr> - <td align="right"><b>Version*</b></td> - <td align="left"><h:inputText value="#{CreateNewPackageUIBean.version}"/></td> - </tr> - <tr> - <td align="right"><b>Architecture*</b></td> - <td align="left"> - <h:selectOneMenu value="#{CreateNewPackageUIBean.selectedArchitectureId}"> - <f:selectItems value="#{CreateNewPackageUIBean.architectures}" /> - </h:selectOneMenu> - </td> - </tr> - <tr> - <td align="right"><b>Type*</b></td> - <td align="left"> - <h:selectOneMenu value="#{CreateNewPackageUIBean.selectedPackageTypeId}"> - <f:selectItems value="#{CreateNewPackageUIBean.packageTypes}" /> - </h:selectOneMenu> - </td> - </tr> - </table> - - <div class="note-panel"><span class="required-marker-text">*</span><span> denotes a required field.</span></div> - - </rich:panel> - - <rich:panel> - +<?xml version="1.0"?> + +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:c="http://java.sun.com/jstl/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.ajax4jsf.org/rich"> + +<ui:composition template="/rhq/resource/layout/main.xhtml"> + + <ui:param name="pageTitle" value="Upload New Package"/> + <ui:param name="selectedTabName" value="Content.New"/> + <ui:define name="content"> + + <rich:panel id="fileUploadPanel"> + <f:facet name="header"> + <h:outputText value="Package File"/> + </f:facet> + + <h:panelGrid columns="1" width="100%" rendered="${ResourceUIBean.permissions.content}"> + <rich:panel> + <input type="button" + class="buttonmed" + value="UPLOAD FILE..." + onclick="javascript:open('/rhq/resource/content/file-upload.xhtml', 'uploadwin', 'titlebar=0,toolbar=0,location=0,menubar=0,directories=0,resizable=0,height=160,width=450')"/> + <rich:spacer width="5" /> + <h:outputText rendered="#{UploadNewPackageUIBean.fileUploaded}" + value="File Uploaded: #{UploadNewPackageUIBean.fileItem.fileName}"/> + </rich:panel> + </h:panelGrid> + + <h:outputText rendered="#{!ResourceUIBean.permissions.content}" + value="You do not have permissions to upload content"/> + + </rich:panel> + + <h:form id="uploadForm"> + <input type="hidden" name="id" value="${param.id}"/> + + <rich:panel rendered="#{CreateNewPackageUIBean.needRequestPackageDetails}"> + + <f:facet name="header">New Package Details</f:facet> + + <input type="hidden" name="newPackage" value="true"/> + + <table> + <tr> + <td align="right"><b>Name*</b></td> + <td align="left"><h:inputText value="#{CreateNewPackageUIBean.packageName}"/></td> + </tr> + <tr> + <td align="right"><b>Version*</b></td> + <td align="left"><h:inputText value="#{CreateNewPackageUIBean.version}"/></td> + </tr> + <tr> + <td align="right"><b>Architecture*</b></td> + <td align="left"> + <h:selectOneMenu value="#{CreateNewPackageUIBean.selectedArchitectureId}"> + <f:selectItems value="#{CreateNewPackageUIBean.architectures}" /> + </h:selectOneMenu> + </td> + </tr> + <tr> + <td align="right"><b>Type*</b></td> + <td align="left"> + <h:selectOneMenu value="#{CreateNewPackageUIBean.selectedPackageTypeId}"> + <f:selectItems value="#{CreateNewPackageUIBean.packageTypes}" /> + </h:selectOneMenu> + </td> + </tr> + </table> + + <div class="note-panel"><span class="required-marker-text">*</span><span> denotes a required field.</span></div> + + </rich:panel> + + <rich:panel> + <f:facet name="header">Repository</f:facet> - + <p>Select one of the following options describing in which repository the new package should be created.</p> - + <input type="radio" name="repoOption" value="subscribed">Currently Subscribed Repository</input> - <rich:spacer width="5"/> + <rich:spacer width="5"/> <h:selectOneMenu value="#{CreateNewPackageUIBean.subscribedRepoId}"> <f:selectItems value="#{CreateNewPackageUIBean.subscribedRepos}" /> - </h:selectOneMenu> - <br/> + </h:selectOneMenu> + <br/> <input type="radio" name="repoOption" value="unsubscribed">Existing Repository</input> - <rich:spacer width="5"/> + <rich:spacer width="5"/> <h:selectOneMenu value="#{CreateNewPackageUIBean.unsubscribedRepoId}"> <f:selectItems value="#{CreateNewPackageUIBean.unsubscribedRepos}" /> - </h:selectOneMenu> - <br/> + </h:selectOneMenu> + <br/> <input type="radio" name="repoOption" value="new">New Repository</input> <rich:spacer width="5"/><h:inputText value="#{CreateNewPackageUIBean.newRepoName}"/> - - </rich:panel> - - <h:panelGrid id="buttonGrid" columns="2" styleClass="buttons-table" columnClasses="button-cell"> - - <h:commandButton style="margin-top: 10px;" value="CONTINUE" - action="#{CreateNewPackageUIBean.createPackage}" styleClass="buttonmed" - rendered="#{UploadNewPackageUIBean.fileUploaded}"/> - <h:commandButton style="margin-top: 10px;" value="CONTINUE" - disabled="true" styleClass="buttonmed-disabled" - rendered="#{!UploadNewPackageUIBean.fileUploaded}"/> - - <h:commandButton style="margin-top: 10px;" value="CANCEL" - action="#{CreateNewPackageUIBean.cancel}" styleClass="buttonmed"/> - - </h:panelGrid> - - </h:form> - - </ui:define> -</ui:composition> - -</html> + + </rich:panel> + + <h:panelGrid id="buttonGrid" columns="2" styleClass="buttons-table" columnClasses="button-cell"> + + <h:commandButton style="margin-top: 10px;" value="CONTINUE" + action="#{CreateNewPackageUIBean.createPackage}" styleClass="buttonmed" + rendered="#{UploadNewPackageUIBean.fileUploaded}"/> + <h:commandButton style="margin-top: 10px;" value="CONTINUE" + disabled="true" styleClass="buttonmed-disabled" + rendered="#{!UploadNewPackageUIBean.fileUploaded}"/> + + <h:commandButton style="margin-top: 10px;" value="CANCEL" + action="#{CreateNewPackageUIBean.cancel}" styleClass="buttonmed"/> + + </h:panelGrid> + + </h:form> + + </ui:define> +</ui:composition> + +</html> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/file-upload.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/file-upload.xhtml index 9745ebc..2f3386c 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/file-upload.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/file-upload.xhtml @@ -1,40 +1,19 @@ <?xml version="1.0"?> -<!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition + template="/rhq/common/fileUpload.xhtml" + xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:c="http://java.sun.com/jstl/core" + xmlns:fn="http://java.sun.com/jsp/jstl/functions" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich" + xmlns:onc="http://jboss.org/on/component"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:c="http://java.sun.com/jstl/core" - xmlns:a4j="https://ajax4jsf.dev.java.net/ajax" - xmlns:rich="http://richfaces.ajax4jsf.org/rich"> + <ui:param name="pageTitle" value="Package File Upload"/> + <ui:param name="fileUploadUIBean" value="#{UploadNewPackageUIBean}"/> - <ui:composition template="/rhq/layout/popup.xhtml"> - <ui:param name="pageTitle" value="Package File Upload"/> - - <ui:define name="body-area"> - <rich:panel id="fileUploadPanel"> - <f:facet name="header"> - <h:outputText value="Package File Upload"/> - </f:facet> - - <h:panelGrid columns="1" width="100%"> - <rich:fileUpload - id="contentUpload" - fileUploadListener="#{UploadNewPackageUIBean.fileUploadListener}" - listHeight="60px" - maxFilesQuantity="1" - immediateUpload="false" - autoclear="false" - onuploadcomplete="javascript:window.opener.location.reload();window.close()" - allowFlash="false"> - </rich:fileUpload> - </h:panelGrid> - </rich:panel> - </ui:define> - </ui:composition> -</html> +</ui:composition> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/inventory/create-file-upload.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/inventory/create-file-upload.xhtml index 12ab23c..4074817 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/inventory/create-file-upload.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/inventory/create-file-upload.xhtml @@ -1,40 +1,18 @@ <?xml version="1.0"?> -<!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:c="http://java.sun.com/jstl/core" - xmlns:a4j="https://ajax4jsf.dev.java.net/ajax" - xmlns:rich="http://richfaces.ajax4jsf.org/rich"> - - <ui:composition template="/rhq/layout/popup.xhtml"> - <ui:param name="pageTitle" value="New Child Resource Package File Upload"/> - - <ui:define name="body-area"> - <rich:panel id="fileUploadPanel"> - <f:facet name="header"> - <h:outputText value="New Child Resource Package File Upload"/> - </f:facet> - - <h:panelGrid columns="1" width="100%"> - <rich:fileUpload - id="contentUpload" - fileUploadListener="#{UploadNewChildPackageUIBean.fileUploadListener}" - listHeight="60px" - maxFilesQuantity="1" - immediateUpload="false" - autoclear="false" - onuploadcomplete="javascript:window.opener.location.reload();window.close()" - allowFlash="false"> - </rich:fileUpload> - </h:panelGrid> - </rich:panel> - </ui:define> - </ui:composition> -</html> +<ui:composition + template="/rhq/common/fileUpload.xhtml" + xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:c="http://java.sun.com/jstl/core" + xmlns:fn="http://java.sun.com/jsp/jstl/functions" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich" + xmlns:onc="http://jboss.org/on/component"> + <ui:param name="pageTitle" value="New Child Resource Package File Upload"/> + <ui:param name="fileUploadUIBean" value="#{UploadNewChildPackageUIBean}"/> + +</ui:composition> diff --git a/pom.xml b/pom.xml index e2cc42b..0574c8e 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ <postgresql.version>8.4-701.jdbc3</postgresql.version> <h2.version>1.1.117</h2.version> <jtds.version>1.2.2</jtds.version> - <richfaces.version>3.3.2.GA</richfaces.version> + <richfaces.version>3.3.3.CR1</richfaces.version> <jline.version>0.9.94</jline.version> <sigar.version>1.6.3.82</sigar.version> <quartz.version>1.6.5</quartz.version>

1 0

[rhq] pom.xml
by ips 19 Mar '10

19 Mar '10

pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit d49f3d1ce688cdfff563a1f78c66b1a516b8ccc3 Author: Ian P. Springer <ips(a)jetengine.(none)> Date: Fri Mar 19 15:10:45 2010 -0400 ... diff --git a/pom.xml b/pom.xml index 1a21ab1..054740c 100644 --- a/pom.xml +++ b/pom.xml @@ -587,7 +587,7 @@ </executions> </plugin> - <plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <executions> @@ -608,7 +608,7 @@ </configuration> </execution> </executions> - </plugin> + </plugin> <plugin> <groupId>org.codehaus.mojo</groupId>

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits March 2010