rhq-commits February 2012

rhq-commits@lists.fedorahosted.org

11 participants
265 discussions

[rhq] Branch 'release/jon3.0.x' - 2 commits - modules/core modules/enterprise
by ips 14 Feb '12

14 Feb '12

modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java | 21 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java | 105 ++-------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java | 70 ++++-- 4 files changed, 93 insertions(+), 104 deletions(-) New commits: commit f3c5218d16aa49a744d6df68f7cbbf87575dc03c Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Nov 4 10:39:27 2011 -0400 [BZ 751097] various improvements to the code used to load top-level server and service ResourceTypes (hopefully this will fix https://bugzilla.redhat.com/show_bug.cgi?id=751097) (cherry picked from commit 7f74d068c450a65502c07975c2942d9e9a8b2f67) Conflicts: modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java index 7abb782..de69bae 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2011 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -23,7 +23,9 @@ package org.rhq.core.domain.criteria; import java.util.Arrays; +import java.util.HashSet; import java.util.List; +import java.util.Set; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -59,6 +61,8 @@ public class ResourceTypeCriteria extends Criteria { // by default, we don't want to fetch resource types that // are marked deleted private Boolean filterDeleted = false; + private Set<ResourceCategory> filterCategories; // needs overrides + private Boolean filterParentResourceTypesEmpty; // needs overrides private boolean fetchSubCategory; private boolean fetchChildResourceTypes; @@ -87,10 +91,15 @@ public class ResourceTypeCriteria extends Criteria { + " FROM ResourceType innerRt " // + " JOIN innerRt.parentResourceTypes innerParentRt " // + " WHERE innerParentRt.id IN ( ? ) )"); - filterOverrides.put("pluginName", "plugin like ?"); filterOverrides.put("ids", "id in ( ? )"); filterOverrides.put("bundleTypeId", "bundleType.id = ?"); + filterOverrides.put("categories", "category in ( ? )"); + filterOverrides.put("parentResourceTypesEmpty", "" // + + "id IN ( SELECT innerRt.id FROM ResourceType innerRt " // + + " LEFT JOIN innerRt.parentResourceTypes " // + + " WHERE ( ? = true AND innerRt.parentResourceTypes IS EMPTY ) " // + + " OR ( ? = false AND innerRt.parentResourceTypes IS NOT EMPTY ) )"); sortOverrides.put("pluginName", "plugin"); } @@ -148,6 +157,14 @@ public class ResourceTypeCriteria extends Criteria { this.filterDeleted = deleted; } + public void addFilterCategories(ResourceCategory... filterCategories) { + this.filterCategories = new HashSet<ResourceCategory>(Arrays.asList(filterCategories)); + } + + public void addFilterParentResourceTypesEmpty(boolean filterParentResourceTypesEmpty) { + this.filterParentResourceTypesEmpty = filterParentResourceTypesEmpty; + } + public void fetchSubCategory(boolean fetchSubCategory) { this.fetchSubCategory = fetchSubCategory; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java index 2fb7802..2a33d98 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -37,6 +38,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.PageList; +import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; @@ -46,6 +48,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.ResourceTypeGWTServiceAsync; * A cache for ResourceTypes and their various fields. Fields are only fetched as needed. * * @author Greg Hinkle + * @author Ian Springer */ public class ResourceTypeRepository { static private final Messages MSG = CoreGUI.getMessages(); @@ -159,12 +162,18 @@ public class ResourceTypeRepository { Set<Integer> types = new HashSet<Integer>(); for (ResourceGroup group : groups) { - types.add(group.getResourceType().getId()); + ResourceType type = group.getResourceType(); + if (type != null) { + types.add(type.getId()); + } } getResourceTypes(types.toArray(new Integer[types.size()]), metadataTypes, new TypesLoadedCallback() { public void onTypesLoaded(Map<Integer, ResourceType> types) { for (ResourceGroup group : groups) { - group.setResourceType(types.get(group.getResourceType().getId())); + ResourceType type = group.getResourceType(); + if (type != null) { + group.setResourceType(types.get(type.getId())); + } } if (callback != null) { callback.onResourceTypeLoaded(groups); @@ -293,12 +302,13 @@ public class ResourceTypeRepository { Log.info("Loading " + typesNeeded.size() + ((metadataTypes != null) ? (" types: " + metadataTypes) : "")); - if ((topLevelServerAndServiceTypes == null) && (metadataTypes != null) && - metadataTypes.contains(MetadataType.children)) { + if ((topLevelServerAndServiceTypes == null) && metadataTypesNeeded.contains(MetadataType.children)) { // Perform a one-time load of server and service types with no parent types. These types are implicitly // children of all platform types, even though they are not included in the platform types' - // childResourceTypes field. - loadTopLevelServerAndServiceTypes(callback, metadataTypes, criteria, cachedTypes); + // childResourceTypes field in the DB. After the top-level types are loaded, loadRequestedTypes() will be + // called to load the requested types. For any requested types that are platforms, the top-level + // server/service types will be added to the platform types' childResourceTypes fields. + loadTopLevelServerAndServiceTypes(callback, metadataTypesNeeded, criteria, cachedTypes); } else { loadRequestedTypes(callback, metadataTypes, criteria, cachedTypes); } @@ -309,21 +319,34 @@ public class ResourceTypeRepository { final ResourceTypeCriteria criteria, final Map<Integer, ResourceType> cachedTypes) { ResourceTypeCriteria topLevelCriteria = new ResourceTypeCriteria(); - topLevelCriteria.fetchParentResourceTypes(true); + topLevelCriteria.addFilterCategories(ResourceCategory.SERVER, ResourceCategory.SERVICE); + topLevelCriteria.addFilterParentResourceTypesEmpty(true); + topLevelCriteria.addSortCategory(PageOrdering.DESC); + topLevelCriteria.addSortName(PageOrdering.ASC); resourceTypeService.findResourceTypesByCriteria(topLevelCriteria, new AsyncCallback<PageList<ResourceType>>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.widget_typeCache_loadFail(), caught); - loadRequestedTypes(callback, metadataTypes, criteria, cachedTypes); - } - public void onSuccess(PageList<ResourceType> types) { - topLevelServerAndServiceTypes = new HashSet<ResourceType>(); + topLevelServerAndServiceTypes = new LinkedHashSet<ResourceType>(types.size()); for (ResourceType type : types) { - if ((type.getCategory() != ResourceCategory.PLATFORM) && - (type.getParentResourceTypes() == null || type.getParentResourceTypes().isEmpty())) { + if (cachedTypes.containsKey(type.getId())) { + ResourceType cachedType = cachedTypes.get(type.getId()); + topLevelServerAndServiceTypes.add(cachedType); + } else { + cachedTypes.put(type.getId(), type); topLevelServerAndServiceTypes.add(type); } } + if (Log.isDebugEnabled()) { + Set<String> typeNames = new LinkedHashSet<String>(topLevelServerAndServiceTypes.size()); + for (ResourceType type : topLevelServerAndServiceTypes) { + typeNames.add(type.getPlugin() + ":" + type.getName()); + } + Log.debug("Loaded " + typeNames.size() + " top-level server and service types: " + typeNames); + } + loadRequestedTypes(callback, metadataTypes, criteria, cachedTypes); + } + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.widget_typeCache_loadFail(), caught); loadRequestedTypes(callback, metadataTypes, criteria, cachedTypes); } }); commit 0d4efdc85ef65f6cdcf7954766cd28186a36ab63 Author: Ian Springer <ian.springer(a)redhat.com> Date: Mon Aug 1 14:09:29 2011 -0400 [BZ 720456] fix so all child types are shown in manual-add dropdown on Inventory>Child Resources view (https://bugzilla.redhat.com/show_bug.cgi?id=720456) (cherry picked from commit d47438f7a5a56de5539f8635a44aed53833837dc) Conflicts: modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java index e5ec18a..b23e733 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java @@ -22,13 +22,8 @@ */ package org.rhq.enterprise.gui.coregui.client.inventory.resource; -import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.TreeSet; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.Criteria; @@ -133,98 +128,50 @@ public class ResourceCompositeSearchView extends ResourceSearchView { super.configureTable(); } - @SuppressWarnings("unchecked") private void addImportButton() { ResourceType parentType = parentResourceComposite.getResource().getResourceType(); // manual import type menu - Set<ResourceType> importableChildTypes = getImportableChildTypes(parentType); - if (!importableChildTypes.isEmpty()) { - Map<String, ResourceType> displayNames = getDisplayNames(importableChildTypes); - LinkedHashMap<String, ResourceType> importTypeValueMap = new LinkedHashMap<String, ResourceType>(displayNames); + // TODO: Use TreeMap instead, so the types will be sorted by name. + LinkedHashMap<String, ResourceType> importTypeValueMap = new LinkedHashMap<String, ResourceType>(); + for (ResourceType childType : parentType.getChildResourceTypes()) { + if (childType.isSupportsManualAdd()) { + importTypeValueMap.put(childType.getName(), childType); + } + } + if (!importTypeValueMap.isEmpty()) { addTableAction(extendLocatorId("Import"), MSG.common_button_import(), null, importTypeValueMap, - new AbstractTableAction(TableActionEnablement.ALWAYS) { - public void executeAction(ListGridRecord[] selection, Object actionValue) { - ResourceFactoryImportWizard.showImportWizard(parentResourceComposite.getResource(), - (ResourceType) actionValue); - // we can refresh the table buttons immediately since the wizard is a dialog, the - // user can't access enabled buttons anyway. - ResourceCompositeSearchView.this.refreshTableInfo(); - } - }); + new AbstractTableAction(TableActionEnablement.ALWAYS) { + + public void executeAction(ListGridRecord[] selection, Object actionValue) { + ResourceFactoryImportWizard.showImportWizard(parentResourceComposite.getResource(), + (ResourceType) actionValue); + } + }); } // creatable child type menu - Set<ResourceType> creatableChildTypes = getCreatableChildTypes(parentType); - if (!creatableChildTypes.isEmpty()) { - Map<String, ResourceType> displayNames = getDisplayNames(creatableChildTypes); - LinkedHashMap<String, ResourceType> createTypeValueMap = new LinkedHashMap<String, ResourceType>(displayNames); + // TODO: Use TreeMap instead, so the types will be sorted by name. + LinkedHashMap<String, ResourceType> createTypeValueMap = new LinkedHashMap<String, ResourceType>(); - addTableAction(extendLocatorId("CreateChild"), MSG.common_button_create_child(), null, createTypeValueMap, - new AbstractTableAction(TableActionEnablement.ALWAYS) { + for (ResourceType childType : parentType.getChildResourceTypes()) { + if (childType.isCreatable()) { + createTypeValueMap.put(childType.getName(), childType); + } + } + if (!createTypeValueMap.isEmpty()) { + addTableAction(extendLocatorId("CreateChild"), MSG.common_button_create_child(), null, + createTypeValueMap, new AbstractTableAction(TableActionEnablement.ALWAYS) { public void executeAction(ListGridRecord[] selection, Object actionValue) { ResourceFactoryCreateWizard.showCreateWizard(parentResourceComposite.getResource(), - (ResourceType) actionValue); - // we can refresh the table buttons immediately since the wizard is a dialog, the - // user can't access enabled buttons anyway. - ResourceCompositeSearchView.this.refreshTableInfo(); + (ResourceType) actionValue); } }); } } - private static Set<ResourceType> getImportableChildTypes(ResourceType type) { - Set<ResourceType> results = new TreeSet<ResourceType>(); - Set<ResourceType> childTypes = type.getChildResourceTypes(); - for (ResourceType childType : childTypes) { - if (childType.isSupportsManualAdd()) { - results.add(childType); - } - } - return results; - } - - private static Set<ResourceType> getCreatableChildTypes(ResourceType type) { - Set<ResourceType> results = new TreeSet<ResourceType>(); - Set<ResourceType> childTypes = type.getChildResourceTypes(); - for (ResourceType childType : childTypes) { - if (childType.isCreatable()) { - results.add(childType); - } - } - return results; - } - - private static Map<String, ResourceType> getDisplayNames(Set<ResourceType> types) { - Set<String> allNames = new HashSet<String>(); - Set<String> repeatedNames = new HashSet<String>(); - for (ResourceType type : types) { - String typeName = type.getName(); - if (allNames.contains(typeName)) { - repeatedNames.add(typeName); - } else { - allNames.add(typeName); - } - } - Map<String, ResourceType> results = new TreeMap<String, ResourceType>(); - for (ResourceType type : types) { - String displayName = type.getName(); - if (repeatedNames.contains(type.getName())) { - displayName += " (" + type.getPlugin() + " plugin)"; - } - results.put(displayName, type); - } - return results; - } - - protected void onUninventorySuccess() { - // refresh the entire gui so it encompasses any relevant tree view. Don't call this.refresh() - // because CoreGUI.refresh is more comprehensive. - CoreGUI.refresh(); - } - public ResourceComposite getParentResourceComposite() { return parentResourceComposite; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java index 44f3b90..d2cfb26 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java @@ -548,6 +548,7 @@ public class ResourceTreeView extends LocatableVLayout { } importChildMenu.setSubmenu(importChildSubMenu); } + resourceContextMenu.addItem(importChildMenu); } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java index 15d7221..2fb7802 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java @@ -290,22 +290,24 @@ public class ResourceTypeRepository { criteria.setPageControl(PageControl.getUnlimitedInstance()); - Log.info("Loading [" + typesNeeded.size() + "] types with facets=[" + metadataTypesNeeded + "]..."); + Log.info("Loading " + typesNeeded.size() + + ((metadataTypes != null) ? (" types: " + metadataTypes) : "")); - if ((topLevelServerAndServiceTypes == null) && (metadataTypesNeeded != null) - && metadataTypesNeeded.contains(MetadataType.children)) { + if ((topLevelServerAndServiceTypes == null) && (metadataTypes != null) && + metadataTypes.contains(MetadataType.children)) { // Perform a one-time load of server and service types with no parent types. These types are implicitly // children of all platform types, even though they are not included in the platform types' // childResourceTypes field. - loadTopLevelServerAndServiceTypes(callback, metadataTypesNeeded, criteria, cachedTypes); + loadTopLevelServerAndServiceTypes(callback, metadataTypes, criteria, cachedTypes); } else { - loadRequestedTypes(callback, metadataTypesNeeded, criteria, cachedTypes); + loadRequestedTypes(callback, metadataTypes, criteria, cachedTypes); } } private void loadTopLevelServerAndServiceTypes(final TypesLoadedCallback callback, - final EnumSet<MetadataType> metadataTypes, final ResourceTypeCriteria criteria, - final Map<Integer, ResourceType> cachedTypes) { + final EnumSet<MetadataType> metadataTypes, + final ResourceTypeCriteria criteria, final Map<Integer, + ResourceType> cachedTypes) { ResourceTypeCriteria topLevelCriteria = new ResourceTypeCriteria(); topLevelCriteria.fetchParentResourceTypes(true); resourceTypeService.findResourceTypesByCriteria(topLevelCriteria, new AsyncCallback<PageList<ResourceType>>() { @@ -317,8 +319,8 @@ public class ResourceTypeRepository { public void onSuccess(PageList<ResourceType> types) { topLevelServerAndServiceTypes = new HashSet<ResourceType>(); for (ResourceType type : types) { - if ((type.getCategory() != ResourceCategory.PLATFORM) - && (type.getParentResourceTypes() == null || type.getParentResourceTypes().isEmpty())) { + if ((type.getCategory() != ResourceCategory.PLATFORM) && + (type.getParentResourceTypes() == null || type.getParentResourceTypes().isEmpty())) { topLevelServerAndServiceTypes.add(type); } } @@ -327,8 +329,7 @@ public class ResourceTypeRepository { }); } - private void loadRequestedTypes(final TypesLoadedCallback callback, final EnumSet<MetadataType> metadataTypes, - ResourceTypeCriteria criteria, final Map<Integer, ResourceType> cachedTypes) { + private void loadRequestedTypes(final TypesLoadedCallback callback, final EnumSet<MetadataType> metadataTypes, ResourceTypeCriteria criteria, final Map<Integer, ResourceType> cachedTypes) { resourceTypeService.findResourceTypesByCriteria(criteria, new AsyncCallback<PageList<ResourceType>>() { public void onFailure(Throwable caught) { CoreGUI.getErrorHandler().handleError(MSG.widget_typeCache_loadFail(), caught); @@ -343,8 +344,8 @@ public class ResourceTypeRepository { switch (metadataType) { case children: Set<ResourceType> childTypes = type.getChildResourceTypes(); - if (type.getCategory() == ResourceCategory.PLATFORM - && topLevelServerAndServiceTypes != null) { + if (type.getCategory() == ResourceCategory.PLATFORM && + topLevelServerAndServiceTypes != null) { // Add server and service types with no parent types to the list of child types. // These types are implicitly children of all platform types, even though they // are not included in the platform types' childResourceTypes field. @@ -389,7 +390,7 @@ public class ResourceTypeRepository { break; default: Log.error("ERROR: metadataType " + metadataType.name() - + " not merged into cached ResourceType."); + + " not merged into cached ResourceType."); } } }

1 0

[rhq] modules/plugins
by ips 14 Feb '12

14 Feb '12

modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java | 17 +++++++--- 1 file changed, 12 insertions(+), 5 deletions(-) New commits: commit 1fcca6baf6272cfdc833cc00a25f48b1cd144a14 Author: Ian Springer <ian.springer(a)redhat.com> Date: Mon Feb 13 22:59:54 2012 -0500 [BZ 736737] log a detailed DEBUG message if an exception occurs during an avail check (https://bugzilla.redhat.com/show_bug.cgi?id=736737) diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java index 98f861b..f1e2c51 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java @@ -350,20 +350,27 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM } public AvailabilityType getAvailability() { + AvailabilityType avail; try { EmsConnection connection = loadConnection(); EmsBean bean = connection.getBean("Catalina:type=Server"); // this is necessary to prove that that not only the connection exists but is servicing requests. bean.getAttribute("serverInfo").refresh(); - return AvailabilityType.UP; + avail = AvailabilityType.UP; } catch (Exception e) { - // If the connection is not servicing requests then close it. this seems necessary for the - // Tomcat connection as when Tomcat does come up again it seems a new EMS connection is required, - // otherwise we're not seeing EMS be able to pick up the new process. + if (log.isDebugEnabled()) { + log.debug("An exception occurred during availability check for Tomcat Server Resource with key [" + + this.getResourceContext().getResourceKey() + "] and plugin config [" + + this.getPluginConfiguration().getAllProperties() + "].", e); + } + // If the connection is not servicing requests, then close it. this seems necessary for the + // Tomcat connection, as, when Tomcat does come up again, it seems a new EMS connection is required, + // otherwise EMS is not able to pick up the new process. closeConnection(); - return AvailabilityType.DOWN; + avail = AvailabilityType.DOWN; } + return avail; } ResourceContext<T> getResourceContext() {

1 0

[rhq] Branch 'release/jon3.0.x' - modules/plugins
by ips 14 Feb '12

14 Feb '12

modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java | 53 ++++++---- 1 file changed, 33 insertions(+), 20 deletions(-) New commits: commit de6785597ed7e619d01c59e9c556f604570b46f6 Author: Ian Springer <ian.springer(a)redhat.com> Date: Mon Feb 13 22:46:47 2012 -0500 [BZ 736737] log a detailed DEBUG message if an exception occurs during an avail check (https://bugzilla.redhat.com/show_bug.cgi?id=736737) diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java index bc843ef..f1e2c51 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java @@ -23,7 +23,6 @@ package org.jboss.on.plugins.tomcat; import java.io.File; -import java.sql.SQLException; import java.util.Properties; import java.util.Set; @@ -124,7 +123,7 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM */ private TomcatServerOperationsDelegate operationsDelegate; - private ResourceContext resourceContext; + private ResourceContext<T> resourceContext; // JMXComponent Implementation -------------------------------------------- @@ -134,7 +133,9 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM try { emsConnection = loadConnection(); } catch (Exception e) { - log.error("Component attempting to access a connection that could not be loaded"); + if (log.isTraceEnabled()) { + log.debug("Component attempting to access a connection that could not be loaded:" + e.getMessage()); + } } return emsConnection; @@ -232,6 +233,7 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM if (log.isDebugEnabled()) log.debug("Successfully made connection to the Tomcat Server for resource [" + this.resourceContext.getResourceKey() + "]"); + } catch (Exception e) { // The connection will be established even in the case that the principal cannot be authenticated, @@ -239,8 +241,9 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM // the connection is established. If we get to this point that an exception was thrown, close any // connection that was made and null it out so we can try to establish it again. if (this.connection != null) { - if (log.isDebugEnabled()) + if (log.isDebugEnabled()) { log.debug("Connection created but an exception was thrown. Closing the connection.", e); + } try { this.connection.close(); } catch (Exception e2) { @@ -250,19 +253,21 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM } // Since the connection is attempted each time it's used, failure to connect could result in log - // file spamming. Log it once for every 10 consecutive times it's encountered. - if (consecutiveConnectionErrors % 10 == 0) { - log.warn( - "Could not establish connection to the Tomcat instance [" + (consecutiveConnectionErrors + 1) - + "] times for resource [" + resourceContext.getResourceKey() + "]", e); + // file spamming. Log a warning only one time outside of debug mode, and throttle even in debug + // mode (once for every 10 connect errors). + if (0 == consecutiveConnectionErrors) { + log.warn("Could not connect to the Tomcat instance for resource [" + + resourceContext.getResourceKey() + "] (enable debug logging for more info): " + + e.getMessage()); } - if (log.isDebugEnabled()) + if (log.isDebugEnabled() && (consecutiveConnectionErrors % 10 == 0)) { log.debug( - "Could not connect to the Tomcat instance for resource [" + resourceContext.getResourceKey() - + "]", e); + "Could not establish connection to the Tomcat instance [" + (consecutiveConnectionErrors + 1) + + "] times for resource [" + resourceContext.getResourceKey() + "]", e); + } - consecutiveConnectionErrors++; + ++consecutiveConnectionErrors; throw e; } @@ -293,7 +298,8 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM } } - public void start(ResourceContext context) throws SQLException { + @Override + public void start(ResourceContext<T> context) throws InvalidPluginConfigurationException, Exception { this.resourceContext = context; this.operationsDelegate = new TomcatServerOperationsDelegate(this, resourceContext.getSystemInformation()); @@ -344,23 +350,30 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM } public AvailabilityType getAvailability() { + AvailabilityType avail; try { EmsConnection connection = loadConnection(); EmsBean bean = connection.getBean("Catalina:type=Server"); // this is necessary to prove that that not only the connection exists but is servicing requests. bean.getAttribute("serverInfo").refresh(); - return AvailabilityType.UP; + avail = AvailabilityType.UP; } catch (Exception e) { - // If the connection is not servicing requests then close it. this seems necessary for the - // Tomcat connection as when Tomcat does come up again it seems a new EMS connection is required, - // otherwise we're not seeing EMS be able to pick up the new process. + if (log.isDebugEnabled()) { + log.debug("An exception occurred during availability check for Tomcat Server Resource with key [" + + this.getResourceContext().getResourceKey() + "] and plugin config [" + + this.getPluginConfiguration().getAllProperties() + "].", e); + } + // If the connection is not servicing requests, then close it. this seems necessary for the + // Tomcat connection, as, when Tomcat does come up again, it seems a new EMS connection is required, + // otherwise EMS is not able to pick up the new process. closeConnection(); - return AvailabilityType.DOWN; + avail = AvailabilityType.DOWN; } + return avail; } - ResourceContext getResourceContext() { + ResourceContext<T> getResourceContext() { return this.resourceContext; }

1 0

[rhq] Branch 'release/jon3.0.x' - modules/enterprise
by ips 13 Feb '12

13 Feb '12

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java | 66 ----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java | 57 ----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/util/DiffUtility.java | 112 ++++++++++ 3 files changed, 122 insertions(+), 113 deletions(-) New commits: commit 1156454c955bb49b9faf5ff413ee675c068b2863 Author: Ian Springer <ian.springer(a)redhat.com> Date: Wed Dec 14 18:07:25 2011 -0500 [BZ 765593] escape HTML in unified diff output (https://bugzilla.redhat.com/show_bug.cgi?id=765593) (cherry picked from commit 6e70db5abb0b3db8b93730c27695503a461f8f40) diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java index bea8c99..10545bb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java @@ -20,17 +20,13 @@ package org.rhq.enterprise.gui.coregui.client.drift; import java.util.ArrayList; import java.util.LinkedHashMap; -import java.util.List; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.Criteria; import com.smartgwt.client.data.Record; import com.smartgwt.client.widgets.Canvas; -import com.smartgwt.client.widgets.form.DynamicForm; -import com.smartgwt.client.widgets.form.fields.CanvasItem; import com.smartgwt.client.widgets.form.fields.SelectItem; import com.smartgwt.client.widgets.form.fields.TextItem; -import com.smartgwt.client.widgets.layout.VLayout; import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.criteria.DriftDefinitionCriteria; @@ -45,12 +41,12 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.DetailsView; import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.LinkManager; -import org.rhq.enterprise.gui.coregui.client.PopupWindow; import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton; import org.rhq.enterprise.gui.coregui.client.components.carousel.BookmarkableCarousel; import org.rhq.enterprise.gui.coregui.client.components.form.EnumSelectItem; import org.rhq.enterprise.gui.coregui.client.drift.DriftCarouselMemberView.DriftSelectionListener; +import org.rhq.enterprise.gui.coregui.client.drift.util.DiffUtility; import org.rhq.enterprise.gui.coregui.client.gwt.DriftGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; @@ -266,7 +262,6 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi addCarouselAction("Compare", MSG.common_button_compare(), null, new CarouselAction() { public void executeAction(Object actionValue) { - Record record1 = selectedRecords.get(0); Record record2 = selectedRecords.get(1); final String path = record1.getAttribute(DriftDataSource.ATTR_PATH); @@ -280,68 +275,16 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi GWTServiceLookup.getDriftService().generateUnifiedDiffByIds(diffOldId, diffNewId, new AsyncCallback<FileDiffReport>() { - @Override public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to generate diff", caught); + CoreGUI.getErrorHandler().handleError("Failed to generate diff.", caught); } - @Override public void onSuccess(FileDiffReport diffReport) { - String diffContents = toHtml(diffReport.getDiff(), 1, 2); - LocatableWindow window = createDiffViewer(diffContents, path, 1, 2); + String diffContents = DiffUtility.formatAsHtml(diffReport.getDiff(), 1, 2); + LocatableWindow window = DiffUtility.createDiffViewerWindow(diffContents, path, 1, 2); window.show(); } - - private String toHtml(List<String> deltas, int oldVersion, int newVersion) { - StringBuilder diff = new StringBuilder(); - diff.append("").append(deltas.get(0)).append(":").append(oldVersion) - .append(" "); - diff.append("").append(deltas.get(1)).append(":").append(newVersion) - .append(" "); - - for (String line : deltas.subList(2, deltas.size())) { - if (line.startsWith("@@")) { - diff.append("").append(line).append(" "); - } else if (line.startsWith("-")) { - diff.append("").append(line).append(" "); - } else if (line.startsWith("+")) { - diff.append("").append(line).append(" "); - } else { - diff.append(line).append(" "); - } - } - return diff.toString(); - } - - private LocatableWindow createDiffViewer(String contents, String path, int oldVersion, - int newVersion) { - VLayout layout = new VLayout(); - DynamicForm form = new DynamicForm(); - form.setWidth100(); - form.setHeight100(); - - CanvasItem canvasItem = new CanvasItem(); - canvasItem.setColSpan(2); - canvasItem.setShowTitle(false); - canvasItem.setWidth("*"); - canvasItem.setHeight("*"); - - Canvas canvas = new Canvas(); - canvas.setContents(contents); - canvasItem.setCanvas(canvas); - - form.setItems(canvasItem); - layout.addMember(form); - - PopupWindow window = new PopupWindow("diffViewer", layout); - window.setTitle(path + ":" + oldVersion + ":" + newVersion); - window.setIsModal(false); - - return window; - } - }); - } public boolean isEnabled() { @@ -354,6 +297,7 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi return false; } + }); super.configureCarousel(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java index 1dcf23b..e42de69 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java @@ -47,6 +47,7 @@ import org.rhq.core.domain.drift.FileDiffReport; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.PopupWindow; import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; +import org.rhq.enterprise.gui.coregui.client.drift.util.DiffUtility; import org.rhq.enterprise.gui.coregui.client.gwt.DriftGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm; @@ -287,51 +288,23 @@ public class DriftDetailsView extends LocatableVLayout { return window; } - private LocatableWindow createDiffViewer(String contents, String path, int oldVersion, int newVersion) { - VLayout layout = new VLayout(); - DynamicForm form = new DynamicForm(); - form.setWidth100(); - form.setHeight100(); - - CanvasItem canvasItem = new CanvasItem(); - canvasItem.setColSpan(2); - canvasItem.setShowTitle(false); - canvasItem.setWidth("*"); - canvasItem.setHeight("*"); - - Canvas canvas = new Canvas(); - canvas.setContents(contents); - canvasItem.setCanvas(canvas); - - form.setItems(canvasItem); - layout.addMember(form); - - PopupWindow window = new PopupWindow("diffViewer", layout); - window.setTitle(path + ":" + oldVersion + ":" + newVersion); - window.setIsModal(false); - - return window; - } - private LinkItem createViewDiffLink(final Drift<?, ?> drift, final int oldVersion) { LinkItem viewDiffLink = new LinkItem("viewDiff"); viewDiffLink.setLinkTitle("(view diff)"); viewDiffLink.setShowTitle(false); viewDiffLink.addClickHandler(new ClickHandler() { - @Override public void onClick(ClickEvent clickEvent) { GWTServiceLookup.getDriftService().generateUnifiedDiff(drift, new AsyncCallback<FileDiffReport>() { - @Override public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to generate diff", caught); + CoreGUI.getErrorHandler().handleError("Failed to generate diff.", caught); } - @Override public void onSuccess(FileDiffReport diffReport) { int newVersion = drift.getChangeSet().getVersion(); - String diffContents = toHtml(diffReport.getDiff(), oldVersion, newVersion); - LocatableWindow window = createDiffViewer(diffContents, drift.getPath(), oldVersion, newVersion); + String diffContents = DiffUtility.formatAsHtml(diffReport.getDiff(), oldVersion, newVersion); + LocatableWindow window = DiffUtility.createDiffViewerWindow(diffContents, drift.getPath(), + oldVersion, newVersion); window.show(); } }); @@ -340,24 +313,4 @@ public class DriftDetailsView extends LocatableVLayout { return viewDiffLink; } - private String toHtml(List<String> deltas, int oldVersion, int newVersion) { - StringBuilder diff = new StringBuilder(); - diff.append("").append(deltas.get(0)).append(":").append(oldVersion).append(" "); - diff.append("").append(deltas.get(1)).append(":").append(newVersion).append( - " "); - - for (String line : deltas.subList(2, deltas.size())) { - if (line.startsWith("@@")) { - diff.append("").append(line).append(" "); - } else if (line.startsWith("-")) { - diff.append("").append(line).append(" "); - } else if (line.startsWith("+")) { - diff.append("").append(line).append(" "); - } else { - diff.append(line).append(" "); - } - } - return diff.toString(); - } - } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/util/DiffUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/util/DiffUtility.java new file mode 100644 index 0000000..dc3fbb0 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/util/DiffUtility.java @@ -0,0 +1,112 @@ +/* + * RHQ Management Platform + * Copyright (C) 2011 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.drift.util; + +import java.util.List; + +import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.form.DynamicForm; +import com.smartgwt.client.widgets.form.fields.CanvasItem; +import com.smartgwt.client.widgets.layout.VLayout; +import org.rhq.enterprise.gui.coregui.client.PopupWindow; +import org.rhq.enterprise.gui.coregui.client.util.StringUtility; +import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWindow; + +/** + * A collection of utility methods for working with unified diffs. + */ +public class DiffUtility { + + /** + * Formats the specified unified diff output as HTML. + * + * @param deltas + * @param oldVersion + * @param newVersion + * + * @return the specified unified diff output formatted as HTML + */ + public static String formatAsHtml(List<String> deltas, int oldVersion, int newVersion) { + StringBuilder html = new StringBuilder(); + + String originalFilename = deltas.get(0); + html.append("").append(StringUtility.escapeHtml(originalFilename)). + append(":").append(oldVersion).append(" "); + String revisedFilename = deltas.get(1); + html.append("").append(StringUtility.escapeHtml(revisedFilename)). + append(":").append(newVersion).append(" "); + + List<String> lines = deltas.subList(2, deltas.size()); + for (String line : lines) { + String escapedLine = StringUtility.escapeHtml(line); + if (line.startsWith("@@")) { + html.append("").append(escapedLine).append(""); + } else if (line.startsWith("-")) { + html.append("").append(escapedLine).append(""); + } else if (line.startsWith("+")) { + html.append("").append(escapedLine).append(""); + } else { + html.append(escapedLine); + } + html.append(" "); + } + + return html.toString(); + } + + /** + * Create a non-modal window containing unified diff HTML. + * + * @param contents + * @param path + * @param oldVersion + * @param newVersion + * + * @return a non-modal window containing unified diff HTML + */ + public static LocatableWindow createDiffViewerWindow(String contents, String path, int oldVersion, int newVersion) { + VLayout layout = new VLayout(); + DynamicForm form = new DynamicForm(); + form.setWidth100(); + form.setHeight100(); + + CanvasItem canvasItem = new CanvasItem(); + canvasItem.setColSpan(2); + canvasItem.setShowTitle(false); + canvasItem.setWidth("*"); + canvasItem.setHeight("*"); + + Canvas canvas = new Canvas(); + canvas.setContents(contents); + canvasItem.setCanvas(canvas); + + form.setItems(canvasItem); + layout.addMember(form); + + PopupWindow window = new PopupWindow("diffViewer", layout); + window.setTitle(path + ":" + oldVersion + ":" + newVersion); + window.setIsModal(false); + + return window; + } + + private DiffUtility() { + } + +}

1 0

[rhq] etc/scripts
by ips 13 Feb '12

13 Feb '12

etc/scripts/jboss-as-spawn.sh | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) New commits: commit f353bcb47dc425f4753ef2afd61879a31cf6b698 Author: Ian Springer <ian.springer(a)redhat.com> Date: Mon Feb 13 16:26:10 2012 -0500 a shell script for spawning n JBoss AS or EAP instances diff --git a/etc/scripts/jboss-as-spawn.sh b/etc/scripts/jboss-as-spawn.sh new file mode 100755 index 0000000..1174707 --- /dev/null +++ b/etc/scripts/jboss-as-spawn.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +######### begin config ########## + +# the number of instances to start +INSTANCES=5 + +# the JBoss AS home directory +JBOSS_HOME=${HOME}/Applications/jboss-eap-5.1.2/jboss-as + +# the name of the config to be cloned +JBOSS_CONFIG=production + +# options to pass to the JBoss AS JVM +JAVA_OPTS="-Xms200M -Xmx400M -XX:MaxPermSize=150M -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dsun.lang.ClassLoader.allowArraySyntax=true" + +########## end config ########### + +echo "JBOSS_HOME=${JBOSS_HOME}" +echo "JAVA_OPTS=${JAVA_OPTS}" + +# export these, since they are used by the forked run.sh processes. +export JBOSS_HOME JAVA_OPTS + +cd "${JBOSS_HOME}" +for (( i = 1 ; i <= ${INSTANCES}; i++ )); do + JBOSS_CONFIG_COPY="${JBOSS_CONFIG}${i}" + if [ ! -d "server/${JBOSS_CONFIG_COPY}" ]; then + echo "Creating new config dir '${JBOSS_HOME}/server/${JBOSS_CONFIG_COPY}'..." + cp -pr server/${JBOSS_CONFIG} server/${JBOSS_CONFIG_COPY} + ( cd server/${JBOSS_CONFIG_COPY} ; rm -rf data log tmp work ) + fi + BIND_ADDRESS="127.0.0.$(($i + 1))" + echo "Starting instance with config '${JBOSS_CONFIG_COPY}' and bind address '${BIND_ADDRESS}'..." + nohup $JBOSS_HOME/bin/run.sh -c ${JBOSS_CONFIG_COPY} -b ${BIND_ADDRESS} >$JBOSS_HOME/bin/${JBOSS_CONFIG_COPY}.out 2>&1 & +done +

1 0

[rhq] modules/enterprise
by ips 13 Feb '12

13 Feb '12

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 18 +++++----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationFactory.java | 16 ++++++-- 2 files changed, 21 insertions(+), 13 deletions(-) New commits: commit cf4407c4f5b77323777758f8e9d2e9d54151f604 Author: Ian Springer <ian.springer(a)redhat.com> Date: Mon Feb 13 15:41:54 2012 -0500 [BZ 790179] temptoray workaround for https://bugzilla.redhat.com/show_bug.cgi?id=790179 that makes list-o-map members always editable diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java index c1fb328..1fc8349 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java @@ -600,19 +600,13 @@ public class ConfigurationEditor extends LocatableVLayout { return; } - public void addItemsForPropertyRecursively(String locatorId, PropertyDefinition propertyDefinition, + private void addItemsForPropertyRecursively(String locatorId, PropertyDefinition propertyDefinition, Property property, boolean oddRow, List<FormItem> fields) { List<FormItem> fieldsForThisProperty; if (propertyDefinition instanceof PropertyDefinitionSimple) { final PropertyDefinitionSimple propertyDefinitionSimple = (PropertyDefinitionSimple) propertyDefinition; PropertySimple propertySimple = (PropertySimple) property; - - if (propertySimple == null) { - propertySimple = new PropertySimple(propertyDefinitionSimple.getName(), null); - configuration.put(propertySimple); - } - fieldsForThisProperty = buildFieldsForPropertySimple(propertyDefinition, propertyDefinitionSimple, propertySimple); } else if (propertyDefinition instanceof PropertyDefinitionList) { @@ -1067,14 +1061,20 @@ public class ConfigurationEditor extends LocatableVLayout { } private static boolean isAllReadOnly(List<PropertyDefinition> propertyDefinitions) { - boolean allPropsDefsReadOnly = true; + // TODO (ips, 02/13/12): If we are going to do this correctly, we need to call isPropertyReadOnly() on each + // member property to determine whether that particular property is read-only or not, + // rather than relying solely on whether the member property definition is read-only; this + // is because, for a couple special cases, isPropertyReadOnly() returns false even when + // the prop def is read-only. + /*boolean allPropsDefsReadOnly = true; for (PropertyDefinition subDef : propertyDefinitions) { if (!subDef.isReadOnly()) { allPropsDefsReadOnly = false; break; } } - return allPropsDefsReadOnly; + return allPropsDefsReadOnly;*/ + return false; } private PropertyMapListGridRecord[] buildSummaryRecords(PropertyList propertyList, diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationFactory.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationFactory.java index f5e7993..2142764 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationFactory.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationFactory.java @@ -155,10 +155,18 @@ public abstract class TestConfigurationFactory { PropertyDefinitionMap mapInReadOnlyListPropDef = new PropertyDefinitionMap("MapOfSimplesInReadOnlyList", "a map of simples in a list", false); - mapInReadOnlyListPropDef.put(createStringPropDef1()); - mapInReadOnlyListPropDef.put(createStringPropDef2()); - mapInReadOnlyListPropDef.put(createBooleanPropDef()); - mapInReadOnlyListPropDef.put(createIntegerPropDef()); + PropertyDefinitionSimple propDef = createStringPropDef1(); + propDef.setReadOnly(true); + mapInReadOnlyListPropDef.put(propDef); + propDef = createStringPropDef2(); + propDef.setReadOnly(true); + mapInReadOnlyListPropDef.put(propDef); + propDef = createBooleanPropDef(); + propDef.setReadOnly(true); + mapInReadOnlyListPropDef.put(propDef); + propDef = createIntegerPropDef(); + propDef.setReadOnly(true); + mapInReadOnlyListPropDef.put(propDef); mapInReadOnlyListPropDef.setDisplayName(mapInReadOnlyListPropDef.getName()); PropertyDefinitionList readOnlyListPropDef = new PropertyDefinitionList("ReadOnlyListOfMaps",

1 0

[rhq] Branch 'release/jon3.0.x' - modules/enterprise
by mazz 13 Feb '12

13 Feb '12

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java | 23 +++++++--- 1 file changed, 18 insertions(+), 5 deletions(-) New commits: commit b032370f71979d1513416a44d109bb03a20f9884 Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Jan 9 15:23:50 2012 -0500 [BZ 771984] is appears that trying to concurrently update a subject's user preferences fails when one of the updates involves inserting a new property. The problem appears from the GWT client, so at the GWT servlet layer, we will now ensure that no two GWT requests can concurrently update a subject. (cherry picked from commit ac2391109a7b141312f95595341a7dabed4551a4) diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java index b790b79..e175134 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java @@ -36,6 +36,7 @@ public class SubjectGWTServiceImpl extends AbstractGWTServiceImpl implements Sub private static final long serialVersionUID = 1L; private SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager(); + private Object subjectLock = new Object(); // used to lock out concurrent subject updates public void createPrincipal(String username, String password) throws RuntimeException { try { @@ -57,7 +58,7 @@ public class SubjectGWTServiceImpl extends AbstractGWTServiceImpl implements Sub public Subject createSubject(Subject subjectToCreate, String password) throws RuntimeException { try { return SerialUtility.prepare(subjectManager.createSubject(getSessionSubject(), subjectToCreate, password), - "SubjectManager.createSubject"); + "SubjectManager.createSubjectPW"); } catch (Throwable t) { throw getExceptionToThrowToClient(t); } @@ -89,8 +90,12 @@ public class SubjectGWTServiceImpl extends AbstractGWTServiceImpl implements Sub public Subject updateSubject(Subject subjectToModify) throws RuntimeException { try { - Subject subject = SerialUtility.prepare(subjectManager.updateSubject(getSessionSubject(), subjectToModify), - "SubjectManager.updateSubject"); + Subject sessionSubject = getSessionSubject(); + Subject modifiedSubject; + synchronized (subjectLock) { + modifiedSubject = subjectManager.updateSubject(sessionSubject, subjectToModify); + } + Subject subject = SerialUtility.prepare(modifiedSubject, "SubjectManager.updateSubject"); // Clear the prefs for this subject from the user prefs cache that portal-war uses, in case we just // changed any prefs; otherwise the cache would contain stale prefs. SubjectPreferencesCache.getInstance().clearConfiguration(subject.getId()); @@ -102,8 +107,16 @@ public class SubjectGWTServiceImpl extends AbstractGWTServiceImpl implements Sub public Subject updateSubject(Subject subjectToModify, String newPassword) throws RuntimeException { try { - return SerialUtility.prepare(subjectManager - .updateSubject(getSessionSubject(), subjectToModify, newPassword), "SubjectManager.updateSubject"); + Subject sessionSubject = getSessionSubject(); + Subject modifiedSubject; + synchronized (subjectLock) { + modifiedSubject = subjectManager.updateSubject(sessionSubject, subjectToModify, newPassword); + } + Subject subject = SerialUtility.prepare(modifiedSubject, "SubjectManager.updateSubjectPW"); + // Clear the prefs for this subject from the user prefs cache that portal-war uses, in case we just + // changed any prefs; otherwise the cache would contain stale prefs. + SubjectPreferencesCache.getInstance().clearConfiguration(subject.getId()); + return subject; } catch (Throwable t) { throw getExceptionToThrowToClient(t); }

1 0

[rhq] Branch 'release/jon3.0.x' - modules/core
by mazz 13 Feb '12

13 Feb '12

modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java | 4 modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java | 46 +++++++--- 2 files changed, 38 insertions(+), 12 deletions(-) New commits: commit 69cd904c42b383eaa93abb244347df45cf716e3e Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Jan 27 16:56:27 2012 -0500 [BZ 785268] fix the case where you do a clean deploy but a file was edited (where the file content didn't change from bundle v1 to bundle v2) (cherry picked from commit 657f2f242c2193173b8e68b6cdb34f04f2057d43) diff --git a/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java b/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java index 40ce727..602df4c 100644 --- a/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java +++ b/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java @@ -422,9 +422,11 @@ public class Deployer { // that a file is different from the deployment distribution. // If the new is different from the original and if the new is different than the current, we need to backup the // current because we will be overwriting the current file with the new. + // Note that if we were told to "clean", we never leave files alone (since everything must be cleaned) but + // we will backup the touched file that is being removed String changedFileHashcode = changed.getValue(); String originalFileHashcode = original.get(changedFilePath); - if (newHashcode.equals(originalFileHashcode)) { + if (newHashcode.equals(originalFileHashcode) && !clean) { currentFilesToLeaveAlone.put(changedFilePath, originalFileHashcode); } else if (!newHashcode.equals(changedFileHashcode)) { currentFilesToBackup.add(changedFilePath); diff --git a/modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java b/modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java index 2736f16..58ff326 100644 --- a/modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java +++ b/modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java @@ -118,7 +118,11 @@ public class SimpleDeployerTest { } public void testX_Y_X() throws Exception { - baseX_Y_X(false); + baseX_Y_X(false, false); + } + + public void testX_Y_X_Clean() throws Exception { + baseX_Y_X(false, true); } public void testX_Y_Y() throws Exception { @@ -166,7 +170,11 @@ public class SimpleDeployerTest { } public void testX_Y_X_DryRun() throws Exception { - baseX_Y_X(true); + baseX_Y_X(true, false); + } + + public void testX_Y_X_DryRun_Clean() throws Exception { + baseX_Y_X(true, true); } public void testX_Y_Y_DryRun() throws Exception { @@ -398,7 +406,7 @@ public class SimpleDeployerTest { } } - private void baseX_Y_X(boolean dryRun) throws Exception { + private void baseX_Y_X(boolean dryRun, boolean clean) throws Exception { String newContent = "testX_Y_X"; String newHashcode = MessageDigestGenerator.getDigestString(newContent); writeFile(newContent, this.currentFile); @@ -407,11 +415,7 @@ public class SimpleDeployerTest { null, null, true, null); Deployer deployer = new Deployer(dd); FileHashcodeMap newFileHashcodeMap; - if (dryRun) { - newFileHashcodeMap = deployer.dryRun(this.diff); - } else { - newFileHashcodeMap = deployer.deploy(this.diff); - } + newFileHashcodeMap = deployer.deploy(this.diff, clean, dryRun); // very important to understand this - even though the current file is changed, the hashcode // stored in the map and the metadata directory is the ORIGINAL hashcode. This is to make it @@ -423,17 +427,37 @@ public class SimpleDeployerTest { assert newFileHashcodeMap.equals(this.originalFileHashcodeMap); String[] contentHash = getOriginalFilenameContentHashcode(); - assert contentHash[0].equals(newContent); - assert contentHash[1].equals(newHashcode); + + // if we are cleaning, then the old content is blown away anyway and the original is replaced + // (but not if this is a dryRun - dryRun always means the changed/new content remains) + if (clean && !dryRun) { + assert contentHash[0].equals(originalContent); + assert contentHash[1].equals(originalHashcode); + } else { + assert contentHash[0].equals(newContent); + assert contentHash[1].equals(newHashcode); + } // note nothing changed - our current file remains as is assert this.diff.getAddedFiles().isEmpty() : this.diff; assert this.diff.getDeletedFiles().isEmpty() : this.diff; assert this.diff.getChangedFiles().isEmpty() : this.diff; - assert this.diff.getBackedUpFiles().isEmpty() : this.diff; + if (clean) { + assert this.diff.getBackedUpFiles().size() == 1 : this.diff; + assert this.diff.getBackedUpFiles().containsKey(originalFileName) : this.diff; + File backupFile = new File(this.diff.getBackedUpFiles().get(originalFileName)); + if (dryRun) { + assert !backupFile.exists() : "dry run should not create backup"; + } else { + assert readFile(backupFile).equals(newContent) : "did not backup the correct file?"; + } + } else { + assert this.diff.getBackedUpFiles().isEmpty() : this.diff; + } assert this.diff.getIgnoredFiles().isEmpty() : this.diff; assert this.diff.getRealizedFiles().isEmpty() : this.diff; assert this.diff.getErrors().isEmpty() : this.diff; + assert this.diff.wasCleaned() == clean : this.diff; if (dryRun) { assert this.metadata.getCurrentDeploymentProperties().equals(originalDeployProps);

1 0

[rhq] Branch 'feature/gwt-upgrade' - modules/enterprise
by mike thompson 13 Feb '12

13 Feb '12

modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 2 ++ 1 file changed, 2 insertions(+) New commits: commit 70f4a60a2aaabbdbad567794df8de6ab016c773b Author: Mike Thompson <mithomps(a)redhat.com> Date: Mon Feb 13 11:22:06 2012 -0800 [BZ752215 - at runtime, automatically detect what GWT locale to use as the default, based on the user's browser preferences] Fixed the runtime detection of browser by explicitly declaring the order of priority of locale resolution. The user agent method was getting lost in the priority. The query param method has the highest resolution (for overriding in testing etc.) followed by user agent for automatic locale detection. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml index 559ede5..2746532 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml @@ -121,6 +121,8 @@ --> <extend-property name="locale" values="${gwt.locale}" /> <set-configuration-property name="locale.useragent" value="Y"/> + <set-configuration-property name="locale.usemeta" value="N"/> + <set-configuration-property name="locale.searchorder" value="queryparam,useragent,cookie"/>

1 0

[rhq] Branch 'release/jon3.0.x' - 3 commits - modules/enterprise modules/plugins
by Jay Shaughnessy 13 Feb '12

13 Feb '12

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java | 2 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java | 9 +++++- modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 14 ++-------- modules/plugins/platform/src/main/java/org/rhq/plugins/platform/CpuComponent.java | 11 ++++--- 4 files changed, 19 insertions(+), 17 deletions(-) New commits: commit 63957050f668025e2284b9db58dd6ca863036f16 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Dec 5 11:08:25 2011 -0500 [Bug 760105 - Drift: Unchecking the 'File Changed' option in 'Category' drop-down in the carousel view displays Globally uncaught exception] This had to do with the filtering leaving no eligible snapshots. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java index 6899913..bea8c99 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java @@ -167,7 +167,7 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi break; } } - if (null == maxSnapshotVersion || maxSnapshotVersion < carouselStart) { + if (null == maxSnapshotVersion || null == carouselStart || maxSnapshotVersion < carouselStart) { maxSnapshotVersion = carouselStart; setCarouselStartFilterMax(maxSnapshotVersion); } commit 34653b7a47a6f3aaea2485928d5f31e0c17f2a94 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Dec 2 13:52:59 2011 -0500 [Bug 759485 - Error viewing live data in the resource metric graph portlet] - Fixed the live graph code to throw out metric requests returning no values - Fixed CpuComponent to return valid data on a live metric request, instead of null. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java index 01284cc..5076804 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java @@ -19,6 +19,7 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring; import java.util.Date; +import java.util.Iterator; import java.util.Set; import ca.nanometrics.gflot.client.Axis; @@ -81,6 +82,7 @@ public class LiveGraphView extends LocatableVLayout { private SimplePlot plot; private Timer dataLoader; + @SuppressWarnings("unused") private long min, max; public LiveGraphView(String locatorId) { @@ -231,7 +233,12 @@ public class LiveGraphView extends LocatableVLayout { } public void onSuccess(Set<MeasurementData> result) { - MeasurementDataNumeric d = (MeasurementDataNumeric) result.iterator().next(); + Iterator<MeasurementData> i = result.iterator(); + if (!i.hasNext()) { + return; + } + + MeasurementDataNumeric d = (MeasurementDataNumeric) i.next(); handler.add(new DataPoint(d.getTimestamp(), d.getValue())); plot.redraw(); diff --git a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/CpuComponent.java b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/CpuComponent.java index d5bc264..f045126 100644 --- a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/CpuComponent.java +++ b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/CpuComponent.java @@ -124,14 +124,15 @@ public class CpuComponent implements ResourceComponent<PlatformComponent>, Measu CpuEntry previousCpu = cpuCache.put(property, currentCpu); previousCpu = (null == previousCpu) ? startCpuEntry : previousCpu; - // if for some reason the delta time is excessive then toss - // the metric, since it depends on a reasonable interval between - // prev and curr. This can happen due to avail down or a newly - // activated metric. Allow up to twice the metric interval. + // if for some reason the delta time is excessive then toss the metric, since it depends + // on a reasonable interval between prev and curr. This can happen due to avail down or a newly + // activated metric. Allow up to twice the metric interval. If the metric interval is + // 0 (for a live data request) then just use a 10 minute interval. Number num = null; long deltaTime = currentCpu.getTimestamp() - previousCpu.getTimestamp(); + long metricInterval = (0 < request.getInterval()) ? request.getInterval() : 600000L; - if (deltaTime <= (2 * request.getInterval())) { + if (deltaTime <= (2 * metricInterval)) { // Use the same calculation that SIGAR uses to generate the percentages. The difference is that // we use a safe "previous" cpu record. num = getPercentage(previousCpu.getCpu(), cpu, property); commit 238435dfb011275596e27aae58fc54cdd15d2282 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jan 16 13:45:09 2012 -0500 [Bug 758503 - Various AS-5 plugin types have unset read-only plugin config props] required/read-only contextPath and filename props were not being set [reliably] at discovery time. Removed filename props, which did not seem to be used by the plugin. Set contextPath props to required="false". The value does not seem to be used by the plugin but the property is at least defined in the code. diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml index e1b8d25..2d1e86a 100644 --- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml @@ -2278,7 +2278,6 @@ <plugin-configuration> <c:group name="general" displayName="General"> <c:simple-property name="deploymentName" description="The name of this EAR" readOnly="true"/> - <c:simple-property name="filename" readOnly="true"/> </c:group> <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> <c:simple-property name="extension" default="ear" readOnly="true"/> @@ -2335,8 +2334,8 @@ <plugin-configuration> <c:group name="general" displayName="General"> <c:simple-property name="deploymentName" description="the name of this WAR" readOnly="true"/> - <c:simple-property name="filename" readOnly="true"/> - <c:simple-property name="contextPath" description="this WAR's context path (e.g. /admin-console)" readOnly="true"/> +  + <c:simple-property name="contextPath" description="this WAR's context path (e.g. /admin-console)" required="false" readOnly="false"/> </c:group> <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> <c:simple-property name="extension" default="war" readOnly="true"/> @@ -2418,7 +2417,8 @@ <plugin-configuration> <c:group name="general" displayName="General"> <c:simple-property name="deploymentName" description="the name of this WAR" readOnly="true"/> - <c:simple-property name="contextPath" description="this WAR's context path (e.g. /admin-console" readOnly="true"/> +  + <c:simple-property name="contextPath" description="this WAR's context path (e.g. /admin-console" required="false" readOnly="false"/> </c:group> <c:group name="ResponseTime"> <c:simple-property name="responseTimeLogFile" required="false" @@ -2485,7 +2485,6 @@ <plugin-configuration> <c:group name="general" displayName="General"> <c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/> - <c:simple-property name="filename" readOnly="true"/> </c:group> <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> <c:simple-property name="extension" default="jar" readOnly="true"/> @@ -2581,7 +2580,6 @@ <plugin-configuration> <c:group name="general" displayName="General"> <c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/> - <c:simple-property name="filename" readOnly="true"/> </c:group> <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> <c:simple-property name="extension" default="jar" readOnly="true"/> @@ -2654,7 +2652,6 @@ <plugin-configuration> <c:group name="general" displayName="General"> <c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/> - <c:simple-property name="filename" readOnly="true"/> </c:group> <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> <c:simple-property name="extension" default="jar" readOnly="true"/> @@ -2731,7 +2728,6 @@ <plugin-configuration> <c:group name="general" displayName="General"> <c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/> - <c:simple-property name="filename" readOnly="true"/> </c:group> <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> <c:simple-property name="extension" default="jar" readOnly="true"/> @@ -2793,7 +2789,6 @@ <plugin-configuration> <c:group name="general" displayName="General"> <c:simple-property name="deploymentName" description="the name of this RAR" readOnly="true"/> - <c:simple-property name="filename" readOnly="true"/> </c:group> <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> <c:simple-property name="extension" default="rar" readOnly="true"/> @@ -2839,7 +2834,6 @@ <plugin-configuration> <c:group name="general" displayName="General"> <c:simple-property name="deploymentName" description="the name of this RAR" readOnly="true"/> - <c:simple-property name="filename" readOnly="true"/> </c:group> <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> <c:simple-property name="extension" default="rar" readOnly="true"/>

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits February 2012