[teiid-commits] teiid SVN: r3583 - in branches/7.4.x/console/src/main: resources/META-INF and 1 other directory.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Tue Oct 25 14:25:46 EDT 2011
Author: tejones
Date: 2011-10-25 14:25:46 -0400 (Tue, 25 Oct 2011)
New Revision: 3583
Modified:
branches/7.4.x/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java
branches/7.4.x/console/src/main/resources/META-INF/rhq-plugin.xml
Log:
TEIID-1794: Corrected ClassCastException as well as corrected incorrect field names for operations (Requests, Long Running Requests). Also corrected parameter order for "Terminate Request" operation.
Modified: branches/7.4.x/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java
===================================================================
--- branches/7.4.x/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java 2011-10-25 18:22:50 UTC (rev 3582)
+++ branches/7.4.x/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java 2011-10-25 18:25:46 UTC (rev 3583)
@@ -211,8 +211,8 @@
getTransactionCollectionValue(transactionMetaValue,transactionsCollection);
operationResult.setContent(createReportResultList(fieldNameList, resultObject.iterator()));
} else if (operationName.equals(Platform.Operations.KILL_TRANSACTION)) {
- String sessionID = (String) valueMap.get(Operation.Value.TRANSACTION_ID);
- MetaValue[] args = new MetaValue[] { SimpleValueSupport.wrap(sessionID) };
+ String transactionID = (String) valueMap.get(Operation.Value.TRANSACTION_ID);
+ MetaValue[] args = new MetaValue[] { SimpleValueSupport.wrap(transactionID) };
try {
executeManagedOperation(connection, getRuntimeEngineDeployer(connection, mc), Platform.Operations.KILL_TRANSACTION, args);
} catch (Exception e) {
@@ -232,8 +232,8 @@
Long requestID = (Long) valueMap.get(Operation.Value.REQUEST_ID);
String sessionID = (String) valueMap.get(Operation.Value.SESSION_ID);
MetaValue[] args = new MetaValue[] {
- SimpleValueSupport.wrap(requestID),
- SimpleValueSupport.wrap(sessionID) };
+ SimpleValueSupport.wrap(sessionID),
+ SimpleValueSupport.wrap(requestID) };
try {
executeManagedOperation(connection, getRuntimeEngineDeployer(connection, mc), Platform.Operations.KILL_REQUEST, args);
} catch (Exception e) {
@@ -876,7 +876,7 @@
request.setSourceRequest((Boolean) ProfileServiceUtil.booleanValue(compositeValue.get(SOURCE_REQUEST)));
request.setNodeId((Integer) ProfileServiceUtil.integerValue(compositeValue.get(NODE_ID)));
request.setTransactionId((String) ProfileServiceUtil.stringValue(compositeValue.get(TRANSACTION_ID)));
- request.setState((ProcessingState) ProfileServiceUtil.getSimpleValue(compositeValue.get(STATE), ProcessingState.class));
+ request.setState((ProcessingState.valueOf(ProfileServiceUtil.getSimpleValue(compositeValue.get(STATE), String.class))));
return request;
}
throw new IllegalStateException("Unable to unwrap RequestMetadata " + metaValue); //$NON-NLS-1$
Modified: branches/7.4.x/console/src/main/resources/META-INF/rhq-plugin.xml
===================================================================
--- branches/7.4.x/console/src/main/resources/META-INF/rhq-plugin.xml 2011-10-25 18:22:50 UTC (rev 3582)
+++ branches/7.4.x/console/src/main/resources/META-INF/rhq-plugin.xml 2011-10-25 18:25:46 UTC (rev 3583)
@@ -93,23 +93,18 @@
<results>
<c:list-property name="list">
<c:map-property name="map">
+ <c:simple-property displayName="Request ID"
+ name="getExecutionId" type="string" description="The id for the request" />
<c:simple-property displayName="Session ID"
name="getSessionId" type="string"
- description="The name of the resource whose availability is being reported" />
- <c:simple-property displayName="Request ID"
- name="getRequestId" type="string" description="The id for the request" />
+ description="The session id the request is using" />
<c:simple-property displayName="SQL String"
name="getCommand" type="string" description="The SQL string for this query" />
<c:simple-property displayName="Source Request"
name="sourceRequest" type="string"
description="If false,this is the top level query. If true, this a physical source query." />
- <c:simple-property displayName="Execution ID"
- name="getExecutionId" type="string"
- description="The execution id for this request (if this is a physical source query)" />
<c:simple-property displayName="Start Time"
- name="getCreatedTime" type="string" description="The time this query began" />
- <c:simple-property displayName="Start Time"
- name="getProcessingTime" type="string" description="Processing time for this request" />
+ name="getStartTime" type="string" description="The time this query began" />
<c:simple-property displayName="Transaction ID"
name="getTransactionId" type="string"
description="The transaction XID if there is a transaction involved" />
@@ -187,15 +182,11 @@
required="false">
<c:map-property name="map">
<c:simple-property displayName="Request ID"
- name="getRequestId" type="string" description="The request identifier" />
+ name="getExecutionId" type="string" description="The request identifier" />
<c:simple-property displayName="Session ID"
name="getSessionId" type="string" description="Session identifier" />
- <c:simple-property displayName="Execution ID"
- name="getExecutionId" type="string" description="Unique Identifier for Request" />
- <c:simple-property displayName="Created Time"
- name="getCreatedTime" type="string" description="Time when request submitted" />
- <c:simple-property displayName="Processing Time"
- name="getProcessingTime" type="string" description="Processing time for the request" />
+ <c:simple-property displayName="Start Time"
+ name="getStartTime" type="string" description="Time when request submitted" />
<c:simple-property displayName="Last ping time"
name="getCommand" type="string" description="SQL Command" />
<c:simple-property displayName="Connector level request?"
@@ -203,7 +194,7 @@
description="True if this is a connector level request" />
<c:simple-property displayName="Node ID" name="getNodeId"
type="string" description="The node identifier" />
- <c:simple-property displayName="Tansaction identifier"
+ <c:simple-property displayName="Transaction identifier"
name="getTransactionId" type="string"
description="Transaction XID if a transaction is involved" />
</c:map-property>
@@ -484,8 +475,8 @@
name="getSessionId" type="string" description="Session identifier" />
<c:simple-property displayName="Execution ID"
name="getExecutionId" type="string" description="Unique Identifier for Request" />
- <c:simple-property displayName="Created Time"
- name="getCreatedTime" type="string" description="Time when request submitted" />
+ <c:simple-property displayName="Start Time"
+ name="getStartTime" type="string" description="Time when request submitted" />
<c:simple-property displayName="Processing Time"
name="getProcessingTime" type="string" description="Processing time for the request" />
<c:simple-property displayName="Last ping time"
@@ -495,7 +486,7 @@
description="True if this is a connector level request" />
<c:simple-property displayName="Node ID" name="getNodeId"
type="string" description="The node identifier" />
- <c:simple-property displayName="Tansaction identifier"
+ <c:simple-property displayName="Transaction identifier"
name="getTransactionId" type="string"
description="Transaction XID if a transaction is involved" />
</c:map-property>
More information about the teiid-commits
mailing list