[embjopr-commits] EMBJOPR SVN: r938 - in trunk: core/src/main/java/org/jboss/on/embedded/bean and 4 other directories.
embjopr-commits at lists.jboss.org
embjopr-commits at lists.jboss.org
Fri May 14 08:36:27 EDT 2010
Author: ips
Date: 2010-05-14 08:36:26 -0400 (Fri, 14 May 2010)
New Revision: 938
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementIntegerValueAndUnits.java
trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java
trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentHistoryManagerBean.java
trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentServerServiceImpl.java
trunk/core/src/main/java/org/jboss/on/embedded/manager/history/content/ContentHistoryManager.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java
trunk/pom.xml
Log:
upgrade RHQ dep from 3.0.0.B04 to 3.0.0.B05
Modified: trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementIntegerValueAndUnits.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementIntegerValueAndUnits.java 2010-05-13 22:17:04 UTC (rev 937)
+++ trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementIntegerValueAndUnits.java 2010-05-14 12:36:26 UTC (rev 938)
@@ -21,7 +21,7 @@
import org.rhq.core.domain.measurement.MeasurementUnits;
import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
-import org.rhq.core.domain.measurement.util.MeasurementConverter;
+import org.rhq.core.server.MeasurementConverter;
/**
* A subclass of {@link MeasurementNumericValueAndUnits) that overrides toString() to display the value as an integer
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 2010-05-13 22:17:04 UTC (rev 937)
+++ trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java 2010-05-14 12:36:26 UTC (rev 938)
@@ -37,7 +37,7 @@
import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
import org.rhq.core.domain.measurement.composite.MeasurementStringValueAndUnits;
import org.rhq.core.domain.measurement.util.MeasurementConversionException;
-import org.rhq.core.domain.measurement.util.MeasurementConverter;
+import org.rhq.core.server.MeasurementConverter;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.pc.PluginContainer;
Modified: trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentHistoryManagerBean.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentHistoryManagerBean.java 2010-05-13 22:17:04 UTC (rev 937)
+++ trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentHistoryManagerBean.java 2010-05-14 12:36:26 UTC (rev 938)
@@ -22,7 +22,7 @@
import java.util.Collection;
-import org.rhq.core.domain.content.transfer.ContentDiscoveryReport;
+import org.rhq.core.clientapi.server.content.ContentDiscoveryReport;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
Modified: trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentServerServiceImpl.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentServerServiceImpl.java 2010-05-13 22:17:04 UTC (rev 937)
+++ trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentServerServiceImpl.java 2010-05-14 12:36:26 UTC (rev 938)
@@ -34,7 +34,7 @@
import org.rhq.core.clientapi.server.content.ContentServiceResponse;
import org.rhq.core.domain.content.PackageDetailsKey;
import org.rhq.core.domain.content.composite.PackageVersionMetadataComposite;
-import org.rhq.core.domain.content.transfer.ContentDiscoveryReport;
+import org.rhq.core.clientapi.server.content.ContentDiscoveryReport;
import org.rhq.core.domain.content.transfer.DeployPackagesResponse;
import org.rhq.core.domain.content.transfer.RemovePackagesResponse;
import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
Modified: trunk/core/src/main/java/org/jboss/on/embedded/manager/history/content/ContentHistoryManager.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/manager/history/content/ContentHistoryManager.java 2010-05-13 22:17:04 UTC (rev 937)
+++ trunk/core/src/main/java/org/jboss/on/embedded/manager/history/content/ContentHistoryManager.java 2010-05-14 12:36:26 UTC (rev 938)
@@ -19,7 +19,7 @@
*/
package org.jboss.on.embedded.manager.history.content;
-import org.rhq.core.domain.content.transfer.ContentDiscoveryReport;
+import org.rhq.core.clientapi.server.content.ContentDiscoveryReport;
import org.jboss.on.embedded.manager.history.HistoryManager;
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java 2010-05-13 22:17:04 UTC (rev 937)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java 2010-05-14 12:36:26 UTC (rev 938)
@@ -25,7 +25,7 @@
import java.util.List;
import java.util.Set;
-import org.rhq.core.domain.content.transfer.ContentDiscoveryReport;
+import org.rhq.core.clientapi.server.content.ContentDiscoveryReport;
import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
import org.rhq.core.domain.resource.Resource;
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java 2010-05-13 22:17:04 UTC (rev 937)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java 2010-05-14 12:36:26 UTC (rev 938)
@@ -136,7 +136,7 @@
catch (RuntimeException e)
{
newOperationHistory.setStatus(OperationRequestStatus.FAILURE);
- newOperationHistory.setErrorMessageFromThrowable(e);
+ newOperationHistory.setErrorMessage(e.toString());
this.facesMessages.add(FacesMessage.SEVERITY_FATAL, "Failed to invoke operation: #0", e);
}
initHistories();
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java 2010-05-13 22:17:04 UTC (rev 937)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java 2010-05-14 12:36:26 UTC (rev 938)
@@ -32,9 +32,9 @@
import org.rhq.core.clientapi.agent.PluginContainerException;
import org.rhq.core.domain.content.PackageDetailsKey;
import org.rhq.core.domain.content.PackageType;
-import org.rhq.core.domain.content.transfer.ContentDiscoveryReport;
+import org.rhq.core.clientapi.server.content.ContentDiscoveryReport;
import org.rhq.core.domain.content.transfer.DeployIndividualPackageResponse;
-import org.rhq.core.domain.content.transfer.DeployPackagesRequest;
+import org.rhq.core.clientapi.server.content.DeployPackagesRequest;
import org.rhq.core.domain.content.transfer.DeployPackagesResponse;
import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
import org.rhq.core.domain.resource.Resource;
@@ -202,4 +202,4 @@
log.debug("Backing package for " + this.resource + " is " + packageDetails + ".");
return packageDetails;
}
-}
\ No newline at end of file
+}
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-05-13 22:17:04 UTC (rev 937)
+++ trunk/pom.xml 2010-05-14 12:36:26 UTC (rev 938)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.B04</version>
+ <version>3.0.0.B05</version>
</parent>
<groupId>org.jboss.jopr</groupId>
@@ -72,7 +72,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.B04</rhq.version>
+ <rhq.version>3.0.0.B05</rhq.version>
<jopr.version>${rhq.version}</jopr.version>
<seam.version>2.1.0.SP1</seam.version>
<seam.embedded.version>beta3.SP3</seam.embedded.version>
More information about the embjopr-commits
mailing list