EMBJOPR SVN: r1047 - in trunk/core/src: main/java/org/jboss/on/embedded/manager/pc and 1 other directories.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2012-05-18 10:43:08 -0400 (Fri, 18 May 2012)
New Revision: 1047
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java
trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java
trunk/core/src/test/java/org/jboss/on/embedded/manager/pc/test/PluginContainerResourceManagerTest.java
Log:
get everything compiling w/ RHQ 4.4
Modified: trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java 2012-05-18 13:40:06 UTC (rev 1046)
+++ trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java 2012-05-18 14:43:08 UTC (rev 1047)
@@ -33,6 +33,7 @@
import org.rhq.core.domain.measurement.DataType;
import org.rhq.core.domain.measurement.DisplayType;
import org.rhq.core.domain.measurement.MeasurementData;
+import org.rhq.core.domain.measurement.MeasurementDataRequest;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.MeasurementUnits;
import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
@@ -123,9 +124,14 @@
int resourceId = this.resource.getResource().getId();
String[] measurementNamesArray = requestedMetricDefs.keySet().toArray(
new String[requestedMetricDefs.size()]);
- Set<MeasurementData> measurementDataSet = measurementAgentService
- .getRealTimeMeasurementValue(resourceId, dataType,
- measurementNamesArray);
+ List<org.rhq.core.domain.measurement.MeasurementDataRequest> metricDataRequests =
+ new ArrayList<MeasurementDataRequest>(requestedMetricDefs.size());
+ for (MeasurementDefinition metricDef : requestedMetricDefs.values()) {
+ MeasurementDataRequest metricDataRequest = new MeasurementDataRequest(metricDef);
+ metricDataRequests.add(metricDataRequest);
+ }
+ Set<MeasurementData> measurementDataSet = measurementAgentService
+ .getRealTimeMeasurementValue(resourceId, metricDataRequests);
// @TODO when displayOrder is implemented this should use displayOrder,
// but right now the displayOrder
// for all MeasurementData is set to "0" which will cause only the last
Modified: trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java 2012-05-18 13:40:06 UTC (rev 1046)
+++ trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java 2012-05-18 14:43:08 UTC (rev 1047)
@@ -1,6 +1,6 @@
/*
* Embedded Jopr Project
- * Copyright (C) 2006-2009 Red Hat, Inc.
+ * Copyright (C) 2006-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -129,7 +129,6 @@
// ResourceManager Implementation --------------------------------------------
// @TODO need to check this. In tests this causes NPE, something might have changed and we might need a different way to do this
-
public ResourceType getResourceType(String resourceTypeName)
{
ResourceType resourceType = null;
@@ -264,25 +263,30 @@
return response;
}
- public CreateResourceResponse createResource(String resourceName, ResourceType resourceType, Resource parentResource, Configuration pluginConfiguration, Configuration resourceConfiguration)
+ public CreateResourceResponse createResource(String resourceName, ResourceType resourceType, Resource parentResource,
+ Configuration pluginConfiguration, Configuration resourceConfiguration)
{
CreateResourceResponse response;
- CreateResourceRequest request = new CreateResourceRequest(1, parentResource.getId(), resourceName, resourceType.getName(), resourceType.getPlugin(), pluginConfiguration, resourceConfiguration);
+ CreateResourceRequest request = new CreateResourceRequest(1, parentResource.getId(), resourceName,
+ resourceType.getName(), resourceType.getPlugin(), pluginConfiguration, resourceConfiguration, null);
response = createResource(resourceType, parentResource, request);
return response;
}
- public CreateResourceResponse createResource(String resourceName, ResourceType resourceType, Resource parentResource, Configuration pluginConfiguration, ResourcePackageDetails packageDetails)
+ public CreateResourceResponse createResource(String resourceName, ResourceType resourceType, Resource parentResource,
+ Configuration pluginConfiguration, ResourcePackageDetails packageDetails)
{
CreateResourceResponse response;
- CreateResourceRequest request = new CreateResourceRequest(1, parentResource.getId(), resourceName, resourceType.getName(), resourceType.getPlugin(), pluginConfiguration, packageDetails);
+ CreateResourceRequest request = new CreateResourceRequest(1, parentResource.getId(), resourceName,
+ resourceType.getName(), resourceType.getPlugin(), pluginConfiguration, packageDetails, null);
response = createResource(resourceType, parentResource, request);
return response;
}
// tries to create a resource using the specified CreateResourceRequest
// if successful it will try to refresh the inventory by calling discoverServicesSync
- private CreateResourceResponse createResource(ResourceType resourceType, Resource parentResource, CreateResourceRequest request)
+ private CreateResourceResponse createResource(ResourceType resourceType, Resource parentResource,
+ CreateResourceRequest request)
{
CreateResourceResponse response;
try
Modified: trunk/core/src/test/java/org/jboss/on/embedded/manager/pc/test/PluginContainerResourceManagerTest.java
===================================================================
--- trunk/core/src/test/java/org/jboss/on/embedded/manager/pc/test/PluginContainerResourceManagerTest.java 2012-05-18 13:40:06 UTC (rev 1046)
+++ trunk/core/src/test/java/org/jboss/on/embedded/manager/pc/test/PluginContainerResourceManagerTest.java 2012-05-18 14:43:08 UTC (rev 1047)
@@ -21,6 +21,7 @@
import java.util.ArrayList;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import org.rhq.core.clientapi.agent.measurement.MeasurementAgentService;
@@ -29,6 +30,7 @@
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
import org.rhq.core.domain.measurement.MeasurementData;
+import org.rhq.core.domain.measurement.MeasurementDataRequest;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceCategory;
@@ -198,9 +200,14 @@
Set<String> measurementNames = new HashSet<String>();
Set<MeasurementDefinition> metricDefinitions = resourceType.getMetricDefinitions();
+
+ List<MeasurementDataRequest> metricDataRequests =
+ new ArrayList<MeasurementDataRequest>(metricDefinitions.size());
for (MeasurementDefinition md : metricDefinitions)
{
measurementNames.add(md.getName());
+ MeasurementDataRequest metricDataRequest = new MeasurementDataRequest(md);
+ metricDataRequests.add(metricDataRequest);
}
// get the actual measurement data for those measurement names
@@ -209,7 +216,7 @@
MeasurementAgentService measurementAgentService = PluginContainer.getInstance().getMeasurementAgentService();
ArrayList measurementDataList = new ArrayList<MeasurementData>(measurementAgentService.getRealTimeMeasurementValue(
- resourceId, null, measurementNamesArray));
+ resourceId, metricDataRequests));
assert measurementDataList.size() == 3 : "there should be 3 measurement data items for RHQDS";
}
12 years, 7 months
- 1
- 0
EMBJOPR SVN: r1046 - in trunk: jbas6 and 1 other directory.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2012-05-18 09:40:06 -0400 (Fri, 18 May 2012)
New Revision: 1046
Modified:
trunk/core/pom.xml
trunk/jbas6/pom.xml
Log:
change parent pom versions from 1.4.1-SNAPSHOT to 1.5.0-SNAPSHOT
Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml 2012-05-07 14:57:59 UTC (rev 1045)
+++ trunk/core/pom.xml 2012-05-18 13:40:06 UTC (rev 1046)
@@ -17,13 +17,16 @@
~ License along with this program; if not, write to the Free Software
~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.jopr</groupId>
<artifactId>jopr-embedded-parent</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.jopr</groupId>
@@ -437,3 +440,4 @@
</profiles>
</project>
+
Modified: trunk/jbas6/pom.xml
===================================================================
--- trunk/jbas6/pom.xml 2012-05-07 14:57:59 UTC (rev 1045)
+++ trunk/jbas6/pom.xml 2012-05-18 13:40:06 UTC (rev 1046)
@@ -1,11 +1,13 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.jopr</groupId>
<artifactId>jopr-embedded-parent</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.jopr</groupId>
12 years, 7 months
- 1
- 0
EMBJOPR SVN: r1045 - in trunk: core and 4 other directories.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2012-05-07 10:57:59 -0400 (Mon, 07 May 2012)
New Revision: 1045
Modified:
trunk/core/pom.xml
trunk/core/src/main/webapp/WEB-INF/facelets/header.xhtml
trunk/core/src/main/webapp/WEB-INF/web.xml
trunk/core/src/main/webapp/login.xhtml
trunk/jbas6/pom.xml
trunk/pom.xml
Log:
upgrade to RHQ 4.3 and to latest versions of the hornetq and infinispan plugins; remove the old JBoss repo from the pom
Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml 2012-04-10 01:08:56 UTC (rev 1044)
+++ trunk/core/pom.xml 2012-05-07 14:57:59 UTC (rev 1045)
@@ -1,6 +1,6 @@
<!--
~ Embedded Jopr Project
- ~ Copyright (C) 2006-2010 Red Hat, Inc.
+ ~ Copyright (C) 2006-2012 Red Hat, Inc.
~ All rights reserved.
~
~ This program is free software; you can redistribute it and/or modify
Modified: trunk/core/src/main/webapp/WEB-INF/facelets/header.xhtml
===================================================================
--- trunk/core/src/main/webapp/WEB-INF/facelets/header.xhtml 2012-04-10 01:08:56 UTC (rev 1044)
+++ trunk/core/src/main/webapp/WEB-INF/facelets/header.xhtml 2012-05-07 14:57:59 UTC (rev 1045)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
~ Embedded Jopr Project
- ~ Copyright (C) 2006-2010 Red Hat, Inc.
+ ~ Copyright (C) 2006-2012 Red Hat, Inc.
~ All rights reserved.
~
~ This program is free software; you can redistribute it and/or modify
@@ -71,4 +71,4 @@
</div>
</ui:composition>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/core/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/core/src/main/webapp/WEB-INF/web.xml 2012-04-10 01:08:56 UTC (rev 1044)
+++ trunk/core/src/main/webapp/WEB-INF/web.xml 2012-05-07 14:57:59 UTC (rev 1045)
@@ -2,7 +2,7 @@
<!--
~ Embedded Jopr Project
- ~ Copyright (C) 2006-2010 Red Hat, Inc.
+ ~ Copyright (C) 2006-2012 Red Hat, Inc.
~ All rights reserved.
~
~ This program is free software; you can redistribute it and/or modify
Modified: trunk/core/src/main/webapp/login.xhtml
===================================================================
--- trunk/core/src/main/webapp/login.xhtml 2012-04-10 01:08:56 UTC (rev 1044)
+++ trunk/core/src/main/webapp/login.xhtml 2012-05-07 14:57:59 UTC (rev 1045)
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
~ Embedded Jopr Project
- ~ Copyright (C) 2006-2010 Red Hat, Inc.
+ ~ Copyright (C) 2006-2012 Red Hat, Inc.
~ All rights reserved.
~
~ This program is free software; you can redistribute it and/or modify
Modified: trunk/jbas6/pom.xml
===================================================================
--- trunk/jbas6/pom.xml 2012-04-10 01:08:56 UTC (rev 1044)
+++ trunk/jbas6/pom.xml 2012-05-07 14:57:59 UTC (rev 1045)
@@ -77,13 +77,13 @@
<artifactItem>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-jopr-plugin</artifactId>
- <version>2.0.0.CR1</version>
+ <version>2.0.0.Final</version>
</artifactItem>
<artifactItem>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-jopr-plugin</artifactId>
- <version>4.2.0.CR4</version>
+ <version>4.2.1.FINAL</version>
</artifactItem>
</artifactItems>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-04-10 01:08:56 UTC (rev 1044)
+++ trunk/pom.xml 2012-05-07 14:57:59 UTC (rev 1045)
@@ -1,6 +1,6 @@
<!--
~ Embedded Jopr Project
- ~ Copyright (C) 2006-2010 Red Hat, Inc.
+ ~ Copyright (C) 2006-2012 Red Hat, Inc.
~ All rights reserved.
~
~ This program is free software; you can redistribute it and/or modify
@@ -26,12 +26,12 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0</version>
+ <version>4.3.0</version>
</parent>
<groupId>org.jboss.jopr</groupId>
<artifactId>jopr-embedded-parent</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Embedded Jopr</name>
<description>a web application that provides administration and monitoring of the app server instance to which it is deployed</description>
@@ -70,7 +70,7 @@
<jaxb.version>2.1.9</jaxb.version>
<jboss.web.version>3.0.0-beta-2</jboss.web.version>
<richfaces.version>3.3.3.Final</richfaces.version>
- <rhq.version>3.0.0</rhq.version>
+ <rhq.version>4.3.0</rhq.version>
<jopr.version>${rhq.version}</jopr.version>
<seam.version>2.1.0.SP1</seam.version>
<seam.embedded.version>beta3.SP3</seam.embedded.version>
@@ -142,23 +142,6 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>properties-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>read-build-properties</id>
- <phase>process-resources</phase>
- <goals>
- <goal>read-project-properties</goal>
- </goals>
- <configuration>
- <files />
- </configuration>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>
@@ -177,16 +160,6 @@
<repositories>
- <!-- TODO: Do we still need this? -->
- <repository>
- <id>jboss-old</id>
- <name>JBoss Old</name>
- <url>https://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
<!-- for the RHQ jars -->
<repository>
<id>jboss-releases</id>
12 years, 7 months
- 1
- 0
- ← Newer
- 1
- Older →