[teiid-commits] teiid SVN: r2435 - in trunk/console/src/main: resources/META-INF and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: tejones
Date: 2010-08-10 15:58:37 -0400 (Tue, 10 Aug 2010)
New Revision: 2435

Modified:
   trunk/console/src/main/java/org/teiid/rhq/plugin/VDBDiscoveryComponent.java
   trunk/console/src/main/resources/META-INF/rhq-plugin.xml
Log:
TEIID-1189: Changed resource key to be unique to allow for multiple versions of a vdb

Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/VDBDiscoveryComponent.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/VDBDiscoveryComponent.java	2010-08-10 14:51:15 UTC (rev 2434)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/VDBDiscoveryComponent.java	2010-08-10 19:58:37 UTC (rev 2435)
@@ -61,9 +61,8 @@
 
 		for (ManagedComponent mcVdb : vdbs) {
 
-			String vdbKey = mcVdb.getDeployment().getName();
-			String vdbName = ProfileServiceUtil.getSimpleValue(mcVdb, "name",
-					String.class);
+			String vdbKey = (String)mcVdb.getName();
+			String vdbName = vdbKey;
 			String fullName = ProfileServiceUtil.getSimpleValue(mcVdb, "fullName",
 					String.class);
 			Integer vdbVersion = ProfileServiceUtil.getSimpleValue(mcVdb,

Modified: trunk/console/src/main/resources/META-INF/rhq-plugin.xml
===================================================================
--- trunk/console/src/main/resources/META-INF/rhq-plugin.xml	2010-08-10 14:51:15 UTC (rev 2434)
+++ trunk/console/src/main/resources/META-INF/rhq-plugin.xml	2010-08-10 19:58:37 UTC (rev 2435)
@@ -443,6 +443,8 @@
 					hiddenByDefault="false">
 					<c:simple-property name="name" type="string"
 						description="The Virtual Database Name" required="false" readOnly="true" />
+					<c:simple-property name="fullName" type="string"
+						description="The fully qualified Virtual Database Name" required="false" readOnly="true" />
 					<c:simple-property name="version" type="string"
 						description="The Virtual Database Version" required="false"
 						readOnly="true" />
@@ -458,7 +460,8 @@
 						</c:property-options>
 					</c:simple-property>
 					<c:simple-property name="connectionType" type="string"
-						description="Connections to allow to this Virtual Database" required="false">
+						description="Connections to allow to this Virtual Database"
+						required="false">
 						<c:property-options>
 							<c:option value="NONE" name="NONE" />
 							<c:option value="BY_VERSION" name="BY VERSION" default="true" />
@@ -484,7 +487,7 @@
 								required="false" readOnly="true" />
 							<c:simple-property name="propertyValue"
 								displayName="Property Value" description="Property Value"
-								required="false" readOnly="true"/>
+								required="false" readOnly="true" />
 						</c:map-property>
 					</c:list-property>
 				</c:group>