modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/EnhancedTreeNode.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeView.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java | 91 +++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 21 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java | 148 +++++----- modules/jopr/etc/jbas5-jnp-client/client.sh | 38 +- modules/jopr/etc/jbas5-jnp-client/src/main/java/test/RmiClient.java | 7 10 files changed, 189 insertions(+), 143 deletions(-)
New commits: commit 71a661acf8ce99a02f857bbd02a0c51bba5bebc3 Author: Ian Springer ian.springer@redhat.com Date: Wed Sep 22 18:29:17 2010 -0400
fix bug in restype cache that was preventing subcats from being fetched for restypes that were loaded by a previous cache request; various minor refactoring of resource tree code (better variable names, etc.)
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java index 8218909..a94560d 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java @@ -739,6 +739,14 @@ public class ResourceType implements Serializable, Comparable<ResourceType> { this.subCategories.add(subCategory); }
+ public Set<ProductVersion> getProductVersions() { + return productVersions; + } + + public void setProductVersions(Set<ProductVersion> productVersions) { + this.productVersions = productVersions; + } + public int compareTo(ResourceType that) { return this.name.compareTo(that.getName()); // TODO: Order by category too? 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 a8472b8..1de6dd2 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 @@ -25,6 +25,7 @@ import java.util.EnumSet; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import java.util.Set;
import com.google.gwt.user.client.rpc.AsyncCallback; @@ -232,7 +233,7 @@ public class ConfigurationEditor extends LocatableVLayout { ResourceTypeRepository.Cache.getInstance().getResourceTypes(new Integer[] { resourceTypeId }, EnumSet.of(ResourceTypeRepository.MetadataType.resourceConfigurationDefinition), new ResourceTypeRepository.TypesLoadedCallback() { - public void onTypesLoaded(HashMap<Integer, ResourceType> types) { + public void onTypesLoaded(Map<Integer, ResourceType> types) { System.out.println("ConfigDef retreived in: " + (System.currentTimeMillis() - start)); definition = types.get(resourceTypeId).getResourceConfigurationDefinition(); if (definition == null) { @@ -258,7 +259,7 @@ public class ConfigurationEditor extends LocatableVLayout { ResourceTypeRepository.Cache.getInstance().getResourceTypes(new Integer[] { resourceTypeId }, EnumSet.of(ResourceTypeRepository.MetadataType.pluginConfigurationDefinition), new ResourceTypeRepository.TypesLoadedCallback() { - public void onTypesLoaded(HashMap<Integer, ResourceType> types) { + public void onTypesLoaded(Map<Integer, ResourceType> types) { System.out.println("ConfigDef retreived in: " + (System.currentTimeMillis() - start)); definition = types.get(resourceTypeId).getPluginConfigurationDefinition(); if (definition == null) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/EnhancedTreeNode.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/EnhancedTreeNode.java index 91303ee..89583b4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/EnhancedTreeNode.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/EnhancedTreeNode.java @@ -37,7 +37,8 @@ public class EnhancedTreeNode extends TreeNode { StringBuilder buffer = new StringBuilder(); String className = this.getClass().getName(); String simpleClassName = className.substring(className.lastIndexOf(".") + 1); - buffer.append(simpleClassName).append("["); + String innerClassName = simpleClassName.substring(simpleClassName.lastIndexOf("$") + 1); + buffer.append(innerClassName).append("["); String id = getID(); buffer.append("id=").append(id); String parentId = getParentID(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java index ba57920..acaca4a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java @@ -25,6 +25,7 @@ package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.Map; import java.util.Set;
import com.google.gwt.user.client.History; @@ -69,7 +70,7 @@ public class ResourceGroupTreeView extends VLayout implements BookmarkableView { private ResourceGroupTreeContextMenu contextMenu;
private ResourceGroup rootResourceGroup; - private HashMap<Integer, ResourceType> typeMap; + private Map<Integer, ResourceType> typeMap; private ResourceGroup selectedGroup;
public ResourceGroupTreeView() { @@ -226,7 +227,7 @@ public class ResourceGroupTreeView extends VLayout implements BookmarkableView { ResourceTypeRepository.Cache.getInstance().getResourceTypes(typeIds.toArray(new Integer[typeIds.size()]), new ResourceTypeRepository.TypesLoadedCallback() { @Override - public void onTypesLoaded(HashMap<Integer, ResourceType> types) { + public void onTypesLoaded(Map<Integer, ResourceType> types) { ResourceGroupTreeView.this.typeMap = types; loadTree(root); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeView.java index 38dc487..bad1ada 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeView.java @@ -149,8 +149,8 @@ public class NewResourceTreeView extends LocatableVLayout { event.getNode(); event.cancel();
- if (event.getNode() instanceof ResourceTreeDatasource.TypeTreeNode) { - showContextMenu((ResourceTreeDatasource.TypeTreeNode) event.getNode()); + if (event.getNode() instanceof ResourceTreeDatasource.AutoGroupTreeNode) { + showContextMenu((ResourceTreeDatasource.AutoGroupTreeNode) event.getNode()); } else if (event.getNode() instanceof ResourceTreeDatasource.ResourceTreeNode) { showContextMenu((ResourceTreeDatasource.ResourceTreeNode) event.getNode()); } @@ -158,7 +158,7 @@ public class NewResourceTreeView extends LocatableVLayout { }); }
- private void showContextMenu(ResourceTreeDatasource.TypeTreeNode node) { + private void showContextMenu(ResourceTreeDatasource.AutoGroupTreeNode node) {
contextMenu.setItems(new MenuItem(node.getName())); contextMenu.showContextMenu(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java index 9b39e8a..ca3f8e6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java @@ -23,6 +23,7 @@ import java.util.EnumSet; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set;
import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.DSRequest; @@ -168,7 +169,9 @@ public class ResourceTreeDatasource extends DataSource {
ResourceTypeRepository.Cache.getInstance().loadResourceTypes( result, - EnumSet.of(ResourceTypeRepository.MetadataType.operations, ResourceTypeRepository.MetadataType.children, + EnumSet.of( + ResourceTypeRepository.MetadataType.operations, + ResourceTypeRepository.MetadataType.children, ResourceTypeRepository.MetadataType.subCategory), new ResourceTypeRepository.ResourceTypeLoadedCallback() { public void onResourceTypeLoaded(List<Resource> result) { @@ -197,39 +200,41 @@ public class ResourceTreeDatasource extends DataSource { return introduceTypeAndCategoryNodes(nodes); }
- private static TreeNode[] introduceTypeAndCategoryNodes(ResourceTreeNode[] nodes) { + private static TreeNode[] introduceTypeAndCategoryNodes(ResourceTreeNode[] resourceNodes) { List<TreeNode> updatedNodes = new ArrayList<TreeNode>(); // Maps category node IDs to the corresponding category nodes. - Map<String, CategoryTreeNode> categories = new HashMap<String, CategoryTreeNode>(); + Map<String, SubCategoryTreeNode> subcategoryNodes = new HashMap<String, SubCategoryTreeNode>(); // Maps type node IDs to the corresponding type nodes. - Map<String, TypeTreeNode> types = new HashMap<String, TypeTreeNode>(); + Map<String, AutoGroupTreeNode> autogroupNodes = new HashMap<String, AutoGroupTreeNode>();
- for (ResourceTreeNode node : nodes) { - updatedNodes.add(node); + for (ResourceTreeNode resourceNode : resourceNodes) { + updatedNodes.add(resourceNode);
- Resource resource = node.getResource(); + Resource resource = resourceNode.getResource(); ResourceType type = resource.getResourceType(); if (type.getCategory() != ResourceCategory.PLATFORM) { - String typeNodeId = TypeTreeNode.idOf(resource); - if (!types.containsKey(typeNodeId)) { + String autogroupNodeId = AutoGroupTreeNode.idOf(resource); + if (!autogroupNodes.containsKey(autogroupNodeId)) { Resource parentResource = resource.getParentResource(); - ResourceSubCategory category = type.getSubCategory(); - if (category != null) { + ResourceSubCategory subcategory = type.getSubCategory(); + if (subcategory != null) { + System.out.println("Processing " + subcategory + "..."); do { - String categoryNodeId = CategoryTreeNode.idOf(category, parentResource); - CategoryTreeNode categoryNode = categories.get(categoryNodeId); - if (categoryNode == null) { - categoryNode = new CategoryTreeNode(category, parentResource); - categories.put(categoryNode.getID(), categoryNode); - updatedNodes.add(categoryNode); + String subcategoryNodeId = SubCategoryTreeNode.idOf(subcategory, parentResource); + if (!subcategoryNodes.containsKey(subcategoryNodeId)) { + SubCategoryTreeNode subcategoryNode = new SubCategoryTreeNode(subcategory, parentResource); + subcategoryNodes.put(subcategoryNode.getID(), subcategoryNode); + System.out.println("Adding " + subcategoryNode + " to tree..."); + updatedNodes.add(subcategoryNode); } - } while ((category = category.getParentSubCategory()) != null); + } while ((subcategory = subcategory.getParentSubCategory()) != null); }
if (!type.isSingleton()) { - TypeTreeNode typeNode = new TypeTreeNode(resource); - updatedNodes.add(typeNode); - types.put(typeNodeId, typeNode); + AutoGroupTreeNode autogroupNode = new AutoGroupTreeNode(resource); + autogroupNodes.put(autogroupNodeId, autogroupNode); + System.out.println("Adding " + autogroupNode + " to tree..."); + updatedNodes.add(autogroupNode); } } } @@ -238,15 +243,18 @@ public class ResourceTreeDatasource extends DataSource { return updatedNodes.toArray(new TreeNode[updatedNodes.size()]); }
- public static class CategoryTreeNode extends EnhancedTreeNode { - public CategoryTreeNode(ResourceSubCategory category, Resource parentResource) { + /** + * The folder node for a Resource subcategory. + */ + public static class SubCategoryTreeNode extends EnhancedTreeNode { + public SubCategoryTreeNode(ResourceSubCategory category, Resource parentResource) { String id = idOf(category, parentResource); setID(id); setAttribute(Attributes.ID, id);
ResourceSubCategory parentCategory = category.getParentSubCategory(); String parentId = (parentCategory != null) ? - CategoryTreeNode.idOf(parentCategory, parentResource) : + SubCategoryTreeNode.idOf(parentCategory, parentResource) : ResourceTreeNode.idOf(parentResource); setParentID(parentId); setAttribute(Attributes.PARENT_ID, parentId); @@ -255,6 +263,8 @@ public class ResourceTreeDatasource extends DataSource { String name = category.getDisplayName(); setName(name); setAttribute(Attributes.NAME, name); + + setAttribute(Attributes.DESCRIPTION, category.getDescription()); }
public static String idOf(ResourceSubCategory category, Resource parentResource) { @@ -263,10 +273,10 @@ public class ResourceTreeDatasource extends DataSource { }
/** - * The Resource type folder node for an autogroup. + * The folder node for a Resource autogroup. */ - public static class TypeTreeNode extends EnhancedTreeNode { - private TypeTreeNode(Resource resource) { + public static class AutoGroupTreeNode extends EnhancedTreeNode { + private AutoGroupTreeNode(Resource resource) { String id = idOf(resource); setID(id); setAttribute(Attributes.ID, id); @@ -281,21 +291,23 @@ public class ResourceTreeDatasource extends DataSource { String name = StringUtility.pluralize(type.getName()); setName(name); setAttribute(Attributes.NAME, name); + + setAttribute(Attributes.DESCRIPTION, type.getDescription()); }
public static String idOf(Resource resource) { Resource parentResource = resource.getParentResource(); - return (parentResource != null) ? "type" + resource.getResourceType().getId() + "_" - + parentResource.getId() : null; + return (parentResource != null) ? + "autogroup" + resource.getResourceType().getId() + "_" + parentResource.getId() : + null; }
public static String parentIdOf(Resource resource) { ResourceType type = resource.getResourceType(); ResourceSubCategory parentCategory = type.getSubCategory(); - String parentId = (parentCategory != null) ? - CategoryTreeNode.idOf(parentCategory, resource.getParentResource()) : + return (parentCategory != null) ? + SubCategoryTreeNode.idOf(parentCategory, resource.getParentResource()) : ResourceTreeNode.idOf(resource.getParentResource()); - return parentId; } }
@@ -313,8 +325,8 @@ public class ResourceTreeDatasource extends DataSource { String parentId; if (parentResource != null) { parentId = resource.getResourceType().isSingleton() ? - TypeTreeNode.parentIdOf(resource) : - TypeTreeNode.idOf(resource); + AutoGroupTreeNode.parentIdOf(resource) : + AutoGroupTreeNode.idOf(resource); } else { parentId = null; @@ -325,17 +337,20 @@ public class ResourceTreeDatasource extends DataSource { // System.out.println(id + " / " + parentId); // setAttribute("parentKey", resource.getParentResource() == null ? 0 : (resource.getParentResource().getId() + resource.getResourceType().getName()));
- setName(resource.getName()); - setAttribute(Attributes.NAME, resource.getName()); + String name = resource.getName(); + setName(name); + setAttribute(Attributes.NAME, name); + setAttribute(Attributes.DESCRIPTION, resource.getDescription()); + ResourceAvailability currentAvail = resource.getCurrentAvailability(); setAttribute( "currentAvailability", (null != currentAvail && currentAvail.getAvailabilityType() == AvailabilityType.UP) ? "/images/icons/availability_green_16.png" : "/images/icons/availability_red_16.png");
- setIsFolder((resource.getResourceType().getChildResourceTypes() != null && !resource.getResourceType() - .getChildResourceTypes().isEmpty())); + Set<ResourceType> childTypes = resource.getResourceType().getChildResourceTypes(); + setIsFolder((childTypes != null && !childTypes.isEmpty())); }
public Resource getResource() { 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 418a334..a03acaf 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 @@ -153,8 +153,8 @@ public class ResourceTreeView extends LocatableVLayout { event.getNode(); event.cancel();
- if (event.getNode() instanceof ResourceTreeDatasource.TypeTreeNode) { - showContextMenu((ResourceTreeDatasource.TypeTreeNode) event.getNode()); + if (event.getNode() instanceof ResourceTreeDatasource.AutoGroupTreeNode) { + showContextMenu((ResourceTreeDatasource.AutoGroupTreeNode) event.getNode()); } else if (event.getNode() instanceof ResourceTreeDatasource.ResourceTreeNode) { showContextMenu((ResourceTreeDatasource.ResourceTreeNode) event.getNode()); } @@ -196,18 +196,18 @@ public class ResourceTreeView extends LocatableVLayout { } }
- private void showContextMenu(ResourceTreeDatasource.TypeTreeNode node) { - + private void showContextMenu(ResourceTreeDatasource.AutoGroupTreeNode node) { contextMenu.setItems(new MenuItem(node.getName())); contextMenu.showContextMenu(); - }
private void showContextMenu(final ResourceTreeDatasource.ResourceTreeNode node) { ResourceType type = node.getResource().getResourceType(); ResourceTypeRepository.Cache.getInstance().getResourceTypes( type.getId(), - EnumSet.of(ResourceTypeRepository.MetadataType.operations, ResourceTypeRepository.MetadataType.children, + EnumSet.of( + ResourceTypeRepository.MetadataType.operations, + ResourceTypeRepository.MetadataType.children, ResourceTypeRepository.MetadataType.subCategory, ResourceTypeRepository.MetadataType.pluginConfigurationDefinition, ResourceTypeRepository.MetadataType.resourceConfigurationDefinition), @@ -501,8 +501,8 @@ public class ResourceTreeView extends LocatableVLayout { addMember(treeGrid);
treeGrid.fetchData(treeGrid.getCriteria(), new DSCallback() { - public void execute(DSResponse dsResponse, Object o, DSRequest dsRequest) { - System.out.println("Here!!!!!"); + public void execute(DSResponse response, Object rawData, DSRequest request) { + System.out.println("Done fetching data for tree."); updateBreadcrumbs(); } }); @@ -539,11 +539,10 @@ public class ResourceTreeView extends LocatableVLayout { ResourceTypeRepository.MetadataType.subCategory), new ResourceTypeRepository.ResourceTypeLoadedCallback() { public void onResourceTypeLoaded(List<Resource> result) { - - TreeUtility.printTree(treeGrid.getTree()); - treeGrid.getTree().linkNodes(ResourceTreeDatasource.buildNodes(result));
+ //TreeUtility.printTree(treeGrid.getTree()); + TreeNode selectedNode = treeGrid.getTree().findById(resourceNodeId); if (selectedNode != null) { treeGrid.deselectAllRecords(); 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 d488d14..cfa51bf 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 @@ -40,6 +40,8 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; 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 */ public class ResourceTypeRepository { @@ -66,7 +68,7 @@ public class ResourceTypeRepository { }
public static interface TypesLoadedCallback { - void onTypesLoaded(HashMap<Integer, ResourceType> types); + void onTypesLoaded(Map<Integer, ResourceType> types); }
public static interface ResourceTypeLoadedCallback { @@ -97,7 +99,7 @@ public class ResourceTypeRepository { types.add(res.getResourceType().getId()); } getResourceTypes(types.toArray(new Integer[types.size()]), metadataTypes, new TypesLoadedCallback() { - public void onTypesLoaded(HashMap<Integer, ResourceType> types) { + public void onTypesLoaded(Map<Integer, ResourceType> types) { for (Resource res : resources) { res.setResourceType(types.get(res.getResourceType().getId())); } @@ -130,7 +132,7 @@ public class ResourceTypeRepository { types.add(group.getResourceType().getId()); } getResourceTypes(types.toArray(new Integer[types.size()]), metadataTypes, new TypesLoadedCallback() { - public void onTypesLoaded(HashMap<Integer, ResourceType> types) { + public void onTypesLoaded(Map<Integer, ResourceType> types) { for (ResourceGroup group : groups) { group.setResourceType(types.get(group.getResourceType().getId())); } @@ -150,7 +152,7 @@ public class ResourceTypeRepository { public void getResourceTypes(final Integer resourceTypeId, final EnumSet<MetadataType> metadataTypes, final TypeLoadedCallback callback) { getResourceTypes(new Integer[] { resourceTypeId }, metadataTypes, new TypesLoadedCallback() { - public void onTypesLoaded(HashMap<Integer, ResourceType> types) { + public void onTypesLoaded(Map<Integer, ResourceType> types) { if (callback != null) { callback.onTypesLoaded(types.get(resourceTypeId)); } @@ -162,9 +164,9 @@ public class ResourceTypeRepository { final TypesLoadedCallback callback) { ResourceTypeCriteria criteria = new ResourceTypeCriteria();
- final HashMap<Integer, ResourceType> cachedTypes = new HashMap<Integer, ResourceType>(); + final Map<Integer, ResourceType> cachedTypes = new HashMap<Integer, ResourceType>();
- ArrayList<Integer> typesNeeded = new ArrayList<Integer>(); + List<Integer> typesNeeded = new ArrayList<Integer>(); if (resourceTypeIds == null) { //preload all } else { @@ -191,39 +193,41 @@ public class ResourceTypeRepository { if (metadataTypes != null) { for (MetadataType metadataType : metadataTypes) { switch (metadataType) { - case children: - criteria.fetchChildResourceTypes(true); - break; - case content: - criteria.fetchPackageTypes(true); - break; - case measurements: - criteria.fetchMetricDefinitions(true); - break; - case operations: - criteria.fetchOperationDefinitions(true); - break; - case events: - criteria.fetchEventDefinitions(true); - break; - case pluginConfigurationDefinition: - criteria.fetchPluginConfigurationDefinition(true); - break; - case resourceConfigurationDefinition: - criteria.fetchResourceConfigurationDefinition(true); - break; - case subCategory: - criteria.fetchSubCategory(true); - break; - case parentTypes: - criteria.fetchParentResourceTypes(true); - break; - case processScans: - criteria.fetchProcessScans(true); - break; - case productVersions: - criteria.fetchProductVersions(true); - break; + case children: + criteria.fetchChildResourceTypes(true); + break; + case content: + criteria.fetchPackageTypes(true); + break; + case events: + criteria.fetchEventDefinitions(true); + break; + case measurements: + criteria.fetchMetricDefinitions(true); + break; + case operations: + criteria.fetchOperationDefinitions(true); + break; + case parentTypes: + criteria.fetchParentResourceTypes(true); + break; + case pluginConfigurationDefinition: + criteria.fetchPluginConfigurationDefinition(true); + break; + case processScans: + criteria.fetchProcessScans(true); + break; + case productVersions: + criteria.fetchProductVersions(true); + break; + case resourceConfigurationDefinition: + criteria.fetchResourceConfigurationDefinition(true); + break; + case subCategory: + criteria.fetchSubCategory(true); + break; + default: + System.err.println("ERROR: metadataType " + metadataType.name() + " not incorporated into ResourceType criteria."); } } } @@ -231,7 +235,7 @@ public class ResourceTypeRepository { criteria.setPageControl(PageControl.getUnlimitedInstance());
System.out.println("Loading " + typesNeeded.size() - + ((metadataTypes != null) ? (" types: " + metadataTypes.toString()) : "")); + + ((metadataTypes != null) ? (" types: " + metadataTypes) : ""));
resourceTypeService.findResourceTypesByCriteria(criteria, new AsyncCallback<PageList<ResourceType>>() { public void onFailure(Throwable caught) { @@ -245,29 +249,43 @@ public class ResourceTypeRepository { if (metadataTypes != null) { for (MetadataType metadataType : metadataTypes) { switch (metadataType) { - case children: - cachedType.setChildResourceTypes(type.getChildResourceTypes()); - break; - case operations: - cachedType.setOperationDefinitions(type.getOperationDefinitions()); - break; - case measurements: - cachedType.setMetricDefinitions(type.getMetricDefinitions()); - break; - case content: - cachedType.setPackageTypes(type.getPackageTypes()); - break; - case events: - cachedType.setPackageTypes(type.getPackageTypes()); - break; - case pluginConfigurationDefinition: - cachedType - .setPluginConfigurationDefinition(type.getPluginConfigurationDefinition()); - break; - case resourceConfigurationDefinition: - cachedType.setResourceConfigurationDefinition(type - .getResourceConfigurationDefinition()); - break; + case children: + cachedType.setChildResourceTypes(type.getChildResourceTypes()); + break; + case content: + cachedType.setPackageTypes(type.getPackageTypes()); + break; + case events: + cachedType.setPackageTypes(type.getPackageTypes()); + break; + case measurements: + cachedType.setMetricDefinitions(type.getMetricDefinitions()); + break; + case operations: + cachedType.setOperationDefinitions(type.getOperationDefinitions()); + break; + case parentTypes: + cachedType.setParentResourceTypes(type.getParentResourceTypes()); + break; + case pluginConfigurationDefinition: + cachedType + .setPluginConfigurationDefinition(type.getPluginConfigurationDefinition()); + break; + case processScans: + cachedType.setProcessScans(type.getProcessScans()); + break; + case productVersions: + cachedType.setProductVersions(type.getProductVersions()); + break; + case resourceConfigurationDefinition: + cachedType.setResourceConfigurationDefinition(type + .getResourceConfigurationDefinition()); + break; + case subCategory: + cachedType.setSubCategory(type.getSubCategory()); + break; + default: + System.err.println("ERROR: metadataType " + metadataType.name() + " not merged into cached ResourceType."); } } } @@ -294,8 +312,8 @@ public class ResourceTypeRepository {
public void preloadAll() { getResourceTypes((Integer[]) null, EnumSet.allOf(MetadataType.class), new TypesLoadedCallback() { - public void onTypesLoaded(HashMap<Integer, ResourceType> types) { - System.out.println("Preloaded [" + types.size() + "] resource types"); + public void onTypesLoaded(Map<Integer, ResourceType> types) { + System.out.println("Preloaded [" + types.size() + "] Resource types."); } }); } diff --git a/modules/jopr/etc/jbas5-jnp-client/client.sh b/modules/jopr/etc/jbas5-jnp-client/client.sh index 3dc0f94..240f137 100644 --- a/modules/jopr/etc/jbas5-jnp-client/client.sh +++ b/modules/jopr/etc/jbas5-jnp-client/client.sh @@ -9,7 +9,7 @@ MAIN_JAR_NAME=jbas5-jnp-client-1.0.jar MAIN_CLASS=test.RmiClient
-JBOSS_HOME=/devel/jboss-5.1.0.CR1 +JBOSS_HOME=/home/ips/Applications/jboss-6.0.0-SNAPSHOT JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8788"
@@ -43,29 +43,29 @@ JAVA=$JAVA_HOME/bin/java # only include jbossall-client.jar in classpath, if # JBOSS_CLASSPATH was not yet set #if not "%JBOSS_CLASSPATH%" == "" GOTO HAVE_JB_CP -# set JBOSS_CLASSPATH=%JBOSS_HOME%/client/jbossall-client.jar +JBOSS_CLASSPATH=$JBOSS_HOME/client/jbossall-client.jar
# For the call to new InitialContext() (using org.jnp.interfaces.NamingContextFactory)... -JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jnp-client.jar -JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/common/lib/jboss-security-aspects.jar -JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jbosssx-client.jar -JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jboss-aop-client.jar -JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jboss-common-core.jar +#JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jnp-client.jar +#JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/common/lib/jboss-security-aspects.jar +#JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jbosssx-client.jar +#JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jboss-aop-client.jar +#JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jboss-common-core.jar # For the call to InitialContext.lookup()... -JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jboss-#oting.jar -JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jboss-aspect-jdk50-client.jar -JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/trove.jar -JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/javassist.jar -JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jboss-security-spi.jar -JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jboss-javaee.jar +#JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jboss-#oting.jar +#JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jboss-aspect-jdk50-client.jar +#JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/trove.jar +#JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/javassist.jar +#JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jboss-security-spi.jar +#JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jboss-javaee.jar # For remote invocations on the ProfileService proxy (e.g. ProfileService.getViewManager())... -JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/concurrent.jar -JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jboss-client.jar -JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jboss-mdr.jar -JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jboss-integration.jar +#JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/concurrent.jar +#JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jboss-client.jar +#JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jboss-mdr.jar +#JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/client/jboss-integration.jar
-JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/lib/jboss-managed.jar -JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/lib/jboss-metatype.jar +#JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/lib/jboss-managed.jar +#JBOSS_CLASSPATH=$JBOSS_CLASSPATH:$JBOSS_HOME/lib/jboss-metatype.jar
#:HAVE_JB_CP
diff --git a/modules/jopr/etc/jbas5-jnp-client/src/main/java/test/RmiClient.java b/modules/jopr/etc/jbas5-jnp-client/src/main/java/test/RmiClient.java index 6aa13c4..91b23ee 100644 --- a/modules/jopr/etc/jbas5-jnp-client/src/main/java/test/RmiClient.java +++ b/modules/jopr/etc/jbas5-jnp-client/src/main/java/test/RmiClient.java @@ -17,9 +17,11 @@ public class RmiClient
public static void main(String[] args) throws Exception - { + { + String jnpUrl = (args.length == 1) ? args[0] : "jnp://127.0.0.1:1099"; + Properties env = new Properties(); - env.setProperty(Context.PROVIDER_URL, "jnp://127.0.0.1:1099"); + env.setProperty(Context.PROVIDER_URL, jnpUrl); env.setProperty(Context.INITIAL_CONTEXT_FACTORY, NAMING_CONTEXT_FACTORY); env.setProperty("jnp.disableDiscovery", "true"); env.setProperty("jnp.timeout", "120"); @@ -40,3 +42,4 @@ public class RmiClient deploymentManager.getProfiles(); } } +
rhq-commits@lists.fedorahosted.org