August 2012 - rhq-commits - Fedora Mailing-Lists

[rhq] Changes to 'rc/jon3.1.1.ER3'

by John Sanda

New branch 'rc/jon3.1.1.ER3' available with the following commits:

11 years, 9 months

1
0
0 / 0

[rhq] Changes to 'feature/gsoc-charts'

by mike thompson

New branch 'feature/gsoc-charts' available with the following commits: commit c66363e964a3f796cdd323844607dcbf96f2593c Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Aug 21 14:38:40 2012 -0700 GSoC 2012 RHQ Graph replacement project. Original commit from Denis Krusko (kruskod(a)gmail.com) on August 21st, 2012.

11 years, 9 months

1
0
0 / 0

[rhq] modules/core modules/enterprise

by Jay Shaughnessy

modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/drift/DriftServerService.java | 5 ++ modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/sync/DriftSyncManager.java | 12 +++--- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java | 20 +++++----- 3 files changed, 22 insertions(+), 15 deletions(-) New commits: commit 5ffd6e1eb155bf0208690cce526fb18b832ba344 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Aug 21 16:04:42 2012 -0400 Make drift def sync more efficient, and possibly avoid an NPE that was seen intermittently. - DriftServerServiceImpl.getDriftDefinitions() now only generates Map entries for resources with drift definitions, avoiding unnecessary list creation and subsequent processing. - Added jdoc to that effect - Changed private DriftSyncManager.syncConfigs() to syncDriftDefinitions for clarity. diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/drift/DriftServerService.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/drift/DriftServerService.java index a6df831..1b2d048 100644 --- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/drift/DriftServerService.java +++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/drift/DriftServerService.java @@ -121,6 +121,11 @@ public interface DriftServerService { @Asynchronous void repeatChangeSet(int resourceId, String driftDefName, int version); + /** + * @param resourceIds The resourceIds for which to fetch definitions. + * @return A Map from resourceId to its list of DriftDefinitions. Resources without DriftDefinitions are not included + * in the Map. + */ Map<Integer, List<DriftDefinition>> getDriftDefinitions(Set<Integer> resourceIds); DriftSnapshot getCurrentSnapshot(int driftDefinitionId); diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/sync/DriftSyncManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/sync/DriftSyncManager.java index b24849b..5f4ec36 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/sync/DriftSyncManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/sync/DriftSyncManager.java @@ -111,11 +111,11 @@ public class DriftSyncManager { synchronizer = synchronizerFactory.getRuntimeSynchronizer(driftMgr); } - syncConfigs(synchronizer, resourceIds); + syncDriftDefinitions(synchronizer, resourceIds); syncContent(synchronizer); } - private void syncConfigs(DriftSynchronizer synchronizer, Set<Integer> resourceIds) { + private void syncDriftDefinitions(DriftSynchronizer synchronizer, Set<Integer> resourceIds) { log.info("Starting server sync for drift definitions..."); long startTime = System.currentTimeMillis(); @@ -127,15 +127,15 @@ public class DriftSyncManager { int totalAdded = 0; for (Integer resourceId : driftDefs.keySet()) { - Set<DriftDefinition> resourceConfigsOnServer = new TreeSet<DriftDefinition>(comparator); - resourceConfigsOnServer.addAll(driftDefs.get(resourceId)); + Set<DriftDefinition> driftDefinitionsOnServer = new TreeSet<DriftDefinition>(comparator); + driftDefinitionsOnServer.addAll(driftDefs.get(resourceId)); List<DriftDefinition> deletedDefs = synchronizer.getDeletedDefinitions(resourceId, - resourceConfigsOnServer); + driftDefinitionsOnServer); totalDeleted += deletedDefs.size(); synchronizer.purgeFromLocalInventory(resourceId, deletedDefs); - List<DriftDefinition> addedDefs = synchronizer.getAddedDefinitions(resourceId, resourceConfigsOnServer); + List<DriftDefinition> addedDefs = synchronizer.getAddedDefinitions(resourceId, driftDefinitionsOnServer); totalAdded += addedDefs.size(); synchronizer.addToLocalInventory(resourceId, addedDefs); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java index b22caa7..b206b54 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java @@ -84,17 +84,19 @@ public class DriftServerServiceImpl implements DriftServerService { Subject overlord = getSubjectManager().getOverlord(); PageList<DriftDefinition> definitions = getDriftManager().findDriftDefinitionsByCriteria(overlord, criteria); - Map<Integer, List<DriftDefinition>> map = new HashMap<Integer, List<DriftDefinition>>(); - for (Integer resourceId : resourceIds) { - map.put(resourceId, new ArrayList<DriftDefinition>()); - } - for (DriftDefinition c : definitions) { - List<DriftDefinition> list = map.get(c.getResource().getId()); - list.add(c); - map.put(c.getResource().getId(), list); + Map<Integer, List<DriftDefinition>> result = new HashMap<Integer, List<DriftDefinition>>(); + + for (DriftDefinition driftDef : definitions) { + Integer resourceId = driftDef.getResource().getId(); + List<DriftDefinition> list = result.get(resourceId); + if (null == list) { + list = new ArrayList<DriftDefinition>(); + result.put(resourceId, list); + } + list.add(driftDef); } - return map; + return result; } @Override

11 years, 9 months

1
0
0 / 0

[rhq] Branch 'rhq-on-as7' - 3 commits - modules/core modules/enterprise

by mazz

modules/core/domain/src/main/resources/META-INF/persistence.xml | 6 +++--- modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/display.tld | 2 ++ modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/hq.tld | 2 ++ modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/struts-template.tld | 6 ++++++ modules/enterprise/server/ear/pom.xml | 4 +++- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java | 2 +- 6 files changed, 17 insertions(+), 5 deletions(-) New commits: commit c4275e4a436ea6bed3fe0d04ff0536e8edc459cc Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Aug 21 15:05:33 2012 -0400 we use internal arjuna classes, so we need a dep on it diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index dc64e36..ae8d25e 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -226,7 +226,9 @@ <unpackTypes>war,ejb</unpackTypes> <archive> <manifestEntries> - <Dependencies>org.jboss.common-core export</Dependencies>  +  +  + <Dependencies>org.jboss.common-core export,org.jboss.jts</Dependencies> </manifestEntries> </archive> <modules> commit daa5fa241a1486066c740f23d5690d973cce5ab6 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Aug 21 15:05:12 2012 -0400 JNDI changes for AS7 diff --git a/modules/core/domain/src/main/resources/META-INF/persistence.xml b/modules/core/domain/src/main/resources/META-INF/persistence.xml index 451c82a..8e28c68 100644 --- a/modules/core/domain/src/main/resources/META-INF/persistence.xml +++ b/modules/core/domain/src/main/resources/META-INF/persistence.xml @@ -3,11 +3,11 @@ <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0"> <persistence-unit name="rhqpu"> - <jta-data-source>java:/RHQDS</jta-data-source> + <jta-data-source>java:jboss/datasources/RHQDS</jta-data-source> <properties> - <property name="jboss.entity.manager.jndi.name" value="java:/RHQEntityManager" /> - <property name="jboss.entity.manager.factory.jndi.name" value="java:/RHQEntityManagerFactory" /> + <property name="jboss.entity.manager.jndi.name" value="java:jboss/RHQEntityManager" /> + <property name="jboss.entity.manager.factory.jndi.name" value="java:jboss/RHQEntityManagerFactory" />  <tag> <name>booleandecorator</name> <tag-class>org.rhq.enterprise.gui.legacy.taglib.display.BooleanDecorator</tag-class> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/hq.tld b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/hq.tld index 8ba5afe..421f170 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/hq.tld +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/hq.tld @@ -443,6 +443,7 @@ </attribute> </tag> + <tag> <name>navMapSupported</name> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/struts-template.tld b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/struts-template.tld index f8fbe99..7b51490 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/struts-template.tld +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/struts-template.tld @@ -12,6 +12,7 @@ <jspversion>1.1</jspversion> <shortname>template</shortname> <uri>http://jakarta.apache.org/struts/tags-template</uri> + + + </taglib>

11 years, 9 months

1
0
0 / 0

[rhq] Branch 'release/jon3.1.x' - modules/enterprise

by Jay Shaughnessy

modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java | 25 ++++++++-- 1 file changed, 21 insertions(+), 4 deletions(-) New commits: commit 8e4ea191ddcb6e9b99fbc134ef5028071ebde3c3 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Aug 21 14:05:18 2012 -0400 Backport some changes to failover list generation validation to handle differences when using java6 vs java7. diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java index 29e9e58..77454de 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java @@ -225,11 +225,15 @@ public class FailoverListManagerBeanTest extends AbstractEJB3Test { validateBasic(result, numServers, numAgents); // validate balance level by level - for (int i = 0; (i < numServers); ++i) { + for (int level = 0; (level < numServers); ++level) { Map<String, Integer> distributionMap = new HashMap<String, Integer>(numServers); for (Agent agent : result.keySet()) { FailoverListComposite flc = result.get(agent); - FailoverListComposite.ServerEntry server = flc.get(i); + // for debugging + //if (i == 1) { + // System.out.println(agent + " : " + flc); + //} + FailoverListComposite.ServerEntry server = flc.get(level); Integer count = distributionMap.get(server.address); distributionMap.put(server.address, (null == count) ? 1 : ++count); } @@ -237,8 +241,21 @@ public class FailoverListManagerBeanTest extends AbstractEJB3Test { double div = (double) numAgents / (double) numServers; int ceil = (int) Math.ceil(div); int floor = (int) Math.floor(div); - assert agentsOnServer <= ceil; - assert agentsOnServer >= floor; + // as we get deeper be more lenient. We haven't come up with any sort of genius algorithm, it's + // just ok, if it balances well for the primary and secondary that's good. Allow a skew of 1 for + // level 3-5 and a skew of 2 for levels past that + if (level > 2) { + ++ceil; + --floor; + } + if (level > 5) { + ++ceil; + --floor; + } + assert agentsOnServer <= ceil : "AgentsOnServer [" + agentsOnServer + "] > ceiling [" + ceil + + "] (level " + level + ")"; + assert agentsOnServer >= floor : "AgentsOnServer [" + agentsOnServer + "] < floor [" + floor + + "] (level " + level + ")"; } }

11 years, 9 months

1
0
0 / 0

[rhq] modules/plugins

by John Sanda

modules/plugins/jboss-as-7/pom.xml | 1 + 1 file changed, 1 insertion(+) New commits: commit 1b9503fa343a8ae8add7a65757a7e21a96186a5b Author: John Sanda <jsanda(a)redhat.com> Date: Tue Aug 21 14:03:14 2012 -0400 Delete any old copy of AS 7 zip file to force download diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index a640c0541..ecd2295 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -303,6 +303,7 @@ </condition> <property name="as7.zipfile" location="${java.io.tmpdir}/jboss-${as7.product}-${as7.version}.zip"/> + <delete file="${as7.zipfile}"/> <get src="${as7.url}" dest="${as7.zipfile}" usetimestamp="true" verbose="true"/> <unzip src="${as7.zipfile}" dest="${java.io.tmpdir}"/> <delete dir="${jboss7.home}" verbose="true"/>

11 years, 9 months

1
0
0 / 0

[rhq] modules/enterprise

by mike thompson

modules/enterprise/gui/coregui/pom.xml | 4 +--- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 6 ------ 2 files changed, 1 insertion(+), 9 deletions(-) New commits: commit d5ddeaababea5b8ba7573d4dc752c1636ae52f65 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Aug 21 09:38:38 2012 -0700 Remove Opera browser support from GWT compile. Will speed up compile times from elimination of 7 language permutations. diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index a4b08b0..82292eb 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -43,17 +43,15 @@ ie9: IE9 (although for smartgwt we fallback to IE8) ie8: IE8 - gecko: FF1 (NOTE: Support for this was dropped in GWT 2.1.) gecko1_8: FF2 and later safari: Safari/Chrome - opera: Opera *NOTE*: Since we specify the meta "X-UA-Compatible: IE=IE8" HTTP header in CoreGUI.html, IE9 and later will emulate IE8. Multiple agents can be specified as a comma-delimited list, as demonstrated by the default value below. --> - <gwt.userAgent>ie8,ie9,gecko1_8,safari,opera</gwt.userAgent> + <gwt.userAgent>ie8,ie9,gecko1_8,safari</gwt.userAgent>  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 c5c4391..f797482 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 @@ -11,11 +11,6 @@ <inherits name='com.smartgwt.SmartGwt' /> <inherits name="com.smartgwt.tools.SmartGwtTools"/> -  -  -  - <inherits name='ca.nanometrics.gflot.GFlot'/> @@ -66,7 +61,6 @@ ie9: IE9 (new support for IE9 with GWT 2.3.0+) gecko1_8: FF2 and later safari: Safari/Chrome - opera: Opera *NOTE*: Since we specify the meta "X-UA-Compatible: IE=IE8" HTTP header in CoreGUI.html, IE9 and later will emulate IE8 (although the gwt IE9 js libs will still get loaded).

11 years, 9 months

1
0
0 / 0

[rhq] Branch 'rhq-on-as7' - modules/enterprise

by mazz

modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml | 53 ++++++---- 1 file changed, 33 insertions(+), 20 deletions(-) New commits: commit e0e91c0fc690deca344eb23b8b0ba4cea4fed66e Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Aug 21 11:21:58 2012 -0400 looks like AS7 now requires this <interceptors> section in ejb-jar.xml which we didn't have before diff --git a/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml b/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml index d6e666e..b3deb45 100644 --- a/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml +++ b/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml @@ -1,28 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> + <ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd" - version="3.1"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd" + version="3.1"> + + <description>RHQ</description> + <display-name>RHQ</display-name> - <description>RHQ</description> - <display-name>RHQ</display-name> + <interceptors> + <interceptor> + <interceptor-class>org.rhq.enterprise.server.authz.RequiredPermissionsInterceptor</interceptor-class> + </interceptor> + <interceptor> + <interceptor-class>org.rhq.enterprise.server.common.TransactionInterruptInterceptor</interceptor-class> + </interceptor> + <interceptor> + <interceptor-class>org.rhq.enterprise.server.common.PerformanceMonitorInterceptor</interceptor-class> + </interceptor> + </interceptors> - <assembly-descriptor> + <assembly-descriptor> -  - <interceptor-binding> - <ejb-name>*</ejb-name> - <interceptor-class>org.rhq.enterprise.server.authz.RequiredPermissionsInterceptor</interceptor-class> - </interceptor-binding> - <interceptor-binding> - <ejb-name>*</ejb-name> - <interceptor-class>org.rhq.enterprise.server.common.TransactionInterruptInterceptor</interceptor-class> - </interceptor-binding> - <interceptor-binding> - <ejb-name>*</ejb-name> - <interceptor-class>org.rhq.enterprise.server.common.PerformanceMonitorInterceptor</interceptor-class> - </interceptor-binding> +  + <interceptor-binding> + <ejb-name>*</ejb-name> + <interceptor-class>org.rhq.enterprise.server.authz.RequiredPermissionsInterceptor</interceptor-class> + </interceptor-binding> + <interceptor-binding> + <ejb-name>*</ejb-name> + <interceptor-class>org.rhq.enterprise.server.common.TransactionInterruptInterceptor</interceptor-class> + </interceptor-binding> + <interceptor-binding> + <ejb-name>*</ejb-name> + <interceptor-class>org.rhq.enterprise.server.common.PerformanceMonitorInterceptor</interceptor-class> + </interceptor-binding> - </assembly-descriptor> + </assembly-descriptor> </ejb-jar>

11 years, 9 months

1
0
0 / 0

[rhq] Branch 'release/jon3.1.x' - modules/enterprise

by John Sanda

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java | 21 +++++++--- 1 file changed, 15 insertions(+), 6 deletions(-) New commits: commit 1031361a379cfc4490da70063c1eb83516684603 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Aug 20 11:39:51 2012 -0400 [BZ 850229] Only hide empty groups for availability queries/searches This regression was introduced during the work for BZ 826493. While testing the changes for this commit, I came across another, related issue where an empty compatible group does not show up in the compatible groups view. It does however show up in the mixed groups view. An empty mixed group appears in the mixed group view. This issue is already logged under BZ 708929. Conflicts: modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java index 45c5103..b05643f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java @@ -26,7 +26,6 @@ import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGro import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.PLUGIN; import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.TYPE; -import java.util.ArrayList; import java.util.List; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -48,6 +47,7 @@ import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.ImageManager; +import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.util.Log; @@ -59,6 +59,8 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message; */ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGroupComposite, ResourceGroupCriteria> { + private static final Messages MSG = CoreGUI.getMessages(); + public static final String FILTER_GROUP_IDS = "resourceGroupIds"; ResourceGroupGWTServiceAsync groupService = GWTServiceLookup.getResourceGroupService(); @@ -114,7 +116,7 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou new AsyncCallback<PageList<ResourceGroupComposite>>() { public void onFailure(Throwable caught) { if (caught.getMessage().contains("SearchExpressionException")) { - Message message = new Message("Invalid search expression.", Message.Severity.Error); + Message message = new Message(MSG.search_invalid_search_expression(), Message.Severity.Error); CoreGUI.getMessageCenter().notify(message); } else { CoreGUI.getErrorHandler().handleError(MSG.view_inventory_groups_loadFailed(), caught); @@ -123,13 +125,16 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou processResponse(request.getRequestId(), response); } - private PageList<ResourceGroupComposite> filterEmptyMemberGroups(ResourceGroupCriteria groupCriteria, - PageList<ResourceGroupComposite> result){ + private PageList<ResourceGroupComposite> applyAvailabilitySearchFilter( + PageList<ResourceGroupComposite> result){ + if (!isAvailabilitySearch(criteria)) { + return result; + } PageList<ResourceGroupComposite> pageList = new PageList<ResourceGroupComposite>(result.getPageControl()); for (ResourceGroupComposite rgc : result) { - if (rgc.getExplicitCount() > 0 ){ + if (rgc.getExplicitCount() > 0) { pageList.add(rgc); } } @@ -138,7 +143,7 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou } public void onSuccess(PageList<ResourceGroupComposite> result) { - PageList<ResourceGroupComposite> filteredResult = filterEmptyMemberGroups(criteria,result); + PageList<ResourceGroupComposite> filteredResult = applyAvailabilitySearchFilter(result); response.setData(buildRecords(filteredResult)); response.setTotalRows(filteredResult.getTotalSize()); // for paging to work we have to specify size of full result set processResponse(request.getRequestId(), response); @@ -146,6 +151,10 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou }); } + private boolean isAvailabilitySearch(ResourceGroupCriteria criteria) { + return criteria.getSearchExpression() != null && criteria.getSearchExpression().startsWith("availability"); + } + @Override protected ResourceGroupCriteria getFetchCriteria(final DSRequest request) { ResourceGroupCriteria criteria = new ResourceGroupCriteria();

11 years, 9 months

1
0
0 / 0

[rhq] modules/enterprise

by Jiri Kremser

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java | 35 ++++------ 1 file changed, 14 insertions(+), 21 deletions(-) New commits: commit 963a082f73dd9cc4656998029bac99317b648424 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Tue Aug 21 15:21:55 2012 +0200 [BZ 818083 - [IE 8.0] GUI components not aligned properly on monitoring tab] Added invisible form item on the right side diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java index 8bad3dd..9b39faa 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java @@ -24,10 +24,12 @@ import java.util.Date; import java.util.LinkedHashMap; import java.util.List; +import com.smartgwt.client.types.Alignment; import com.smartgwt.client.widgets.form.fields.ButtonItem; import com.smartgwt.client.widgets.form.fields.CheckboxItem; import com.smartgwt.client.widgets.form.fields.DateTimeItem; import com.smartgwt.client.widgets.form.fields.SelectItem; +import com.smartgwt.client.widgets.form.fields.SpacerItem; import com.smartgwt.client.widgets.form.fields.events.ChangeEvent; import com.smartgwt.client.widgets.form.fields.events.ChangeHandler; import com.smartgwt.client.widgets.form.fields.events.ClickEvent; @@ -62,6 +64,7 @@ public abstract class AbstractMeasurementRangeEditor extends LocatableDynamicFor private boolean displayEnableButton = false; private boolean displayRangeItemGrouping = false; protected CheckboxItem enableRangeItem; + private SpacerItem space; private ButtonItem setButton; public static String ENABLE_RANGE_ITEM = "ENABLE_RANGE_ITEM"; @@ -83,8 +86,9 @@ public abstract class AbstractMeasurementRangeEditor extends LocatableDynamicFor public AbstractMeasurementRangeEditor(String locatorId) { super(locatorId); - setNumCols(12); + setNumCols(10); setWrapItemTitles(false); + setAlign(Alignment.LEFT); } /** @@ -106,7 +110,6 @@ public abstract class AbstractMeasurementRangeEditor extends LocatableDynamicFor setGroupTitle("Filter by: Time"); } enableRangeItem = new CheckboxItem(ENABLE_RANGE_ITEM, ""); - enableRangeItem.setStartRow(true); enableRangeItem.setShowTitle(false); enableRangeItem.setShowLabel(false); enableRangeItem.addChangeHandler(new ChangeHandler() { @@ -119,35 +122,24 @@ public abstract class AbstractMeasurementRangeEditor extends LocatableDynamicFor //combobox of last items simpleLastValuesItem = new SelectItem(SIMPLE_VALUE_ITEM, MSG.view_measureRange_last()); - simpleLastValuesItem.setStartRow(false); - simpleLastValuesItem.setEndRow(false); simpleLastValuesItem.setValueMap(lastValues); - simpleLastValuesItem.setWidth("*"); - simpleLastValuesItem.setRedrawOnChange(true); + simpleLastValuesItem.setTitleAlign(Alignment.LEFT); //combobox of units of time simpleLastUnitsItem = new SelectItem(SIMPLE_UNIT_ITEM); - simpleLastUnitsItem.setStartRow(false); - simpleLastUnitsItem.setEndRow(false); simpleLastUnitsItem.setValueMap(lastUnits); simpleLastUnitsItem.setShowTitle(false); - simpleLastUnitsItem.setWidth("*"); - simpleLastUnitsItem.setRedrawOnChange(true); //time range start from advancedStartItem = new DateTimeItem(ADVANCED_START_ITEM, MSG.view_measureRange_start()); - advancedStartItem.setStartRow(false); - advancedStartItem.setEndRow(false); + advancedStartItem.setTitleAlign(Alignment.LEFT); //time range end advancedEndItem = new DateTimeItem(ADVANCED_END_ITEM, MSG.common_title_end()); - advancedEndItem.setStartRow(false); - advancedEndItem.setEndRow(false); setButton = new ButtonItem(SET_ITEM, MSG.common_button_set()); setButton.setStartRow(false); setButton.setEndRow(false); - setButton.setShowTitle(false); setButton.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { @@ -167,30 +159,31 @@ public abstract class AbstractMeasurementRangeEditor extends LocatableDynamicFor advancedSimpleButton = new ButtonItem(ADVANCED_BUTTON_ITEM, MSG.common_button_advanced()); advancedSimpleButton.setStartRow(false); advancedSimpleButton.setEndRow(false); - advancedSimpleButton.setShowTitle(false); advancedSimpleButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { advanced = !advanced; update(); } }); + + space = new SpacerItem(); + space.setWidth(300); MetricRangePreferences metricRangePrefs = getMetricRangePreferences(); if (metricRangePrefs != null) { advanced = (metricRangePrefs.explicitBeginEnd); } - + if (displaySetButton) { setItems(simpleLastValuesItem, simpleLastUnitsItem, advancedStartItem, advancedEndItem, setButton, - advancedSimpleButton); + advancedSimpleButton, space); } else {//not displaying Set button if (displayEnableButton) { setItems(enableRangeItem, simpleLastValuesItem, simpleLastUnitsItem, advancedStartItem, - advancedEndItem, advancedSimpleButton); - setNumCols(9);//extend to encompass expanded + advancedEndItem, advancedSimpleButton, space); } else { setItems(simpleLastValuesItem, simpleLastUnitsItem, advancedStartItem, advancedEndItem, - advancedSimpleButton); + advancedSimpleButton, space); } } update();

11 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits August 2012