[teiid-commits] teiid SVN: r2834 - in branches/7.1.x/console/src/main: java/org/teiid/rhq/plugin and 1 other directories.

[teiid-commits at lists.jboss.org]

Author: tejones
Date: 2011-01-11 18:59:41 -0500 (Tue, 11 Jan 2011)
New Revision: 2834

Modified:
   branches/7.1.x/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java
   branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java
   branches/7.1.x/console/src/main/resources/META-INF/rhq-plugin.xml
Log:
TEIID-1427 - Removed version parameter from Deploy VDB via URL operation and clarified parameter description for VDB URL.

Modified: branches/7.1.x/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java
===================================================================
--- branches/7.1.x/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java	2011-01-11 22:54:45 UTC (rev 2833)
+++ branches/7.1.x/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java	2011-01-11 23:59:41 UTC (rev 2834)
@@ -244,15 +244,8 @@
 		} else if (operationName.equals(Platform.Operations.DEPLOY_VDB_BY_URL)) {
 			String vdbUrl = (String) valueMap.get(Operation.Value.VDB_URL);
 			String deployName = (String) valueMap.get(Operation.Value.VDB_DEPLOY_NAME);
-			Object vdbVersion = valueMap.get(Operation.Value.VDB_VERSION);
-			// strip off vdb extension if user added it
-			if (deployName.endsWith(VDB_EXT)) {
-				deployName = deployName.substring(0, deployName.lastIndexOf(VDB_EXT));
-			}
-			if (vdbVersion != null) {
-				deployName = deployName + "." + ((Integer) vdbVersion).toString() + VDB_EXT; //$NON-NLS-1$ 
-			}
-			// add vdb extension if there was no version
+		
+			// add vdb extension if missing
 			if (!deployName.endsWith(VDB_EXT)) {
 				deployName = deployName + VDB_EXT;
 			}

Modified: branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java
===================================================================
--- branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java	2011-01-11 22:54:45 UTC (rev 2833)
+++ branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java	2011-01-11 23:59:41 UTC (rev 2834)
@@ -104,7 +104,6 @@
 		} else if (name.equals(Platform.Operations.DEPLOY_VDB_BY_URL)) {
 			valueMap.put(Operation.Value.VDB_URL, configuration.getSimple(Operation.Value.VDB_URL).getStringValue());
 			valueMap.put(Operation.Value.VDB_DEPLOY_NAME, configuration.getSimple(Operation.Value.VDB_DEPLOY_NAME).getStringValue());
-			valueMap.put(Operation.Value.VDB_VERSION, configuration.getSimple(Operation.Value.VDB_VERSION).getIntegerValue());
 		}
 	}
 

Modified: branches/7.1.x/console/src/main/resources/META-INF/rhq-plugin.xml
===================================================================
--- branches/7.1.x/console/src/main/resources/META-INF/rhq-plugin.xml	2011-01-11 22:54:45 UTC (rev 2833)
+++ branches/7.1.x/console/src/main/resources/META-INF/rhq-plugin.xml	2011-01-11 23:59:41 UTC (rev 2834)
@@ -159,13 +159,10 @@
 			description="Deploy a VDB using a URL">
 			<parameters>
 				<c:simple-property displayName="VDB URL" name="vdbUrl"
-					type="file" required="true" description="The URL of the VDB to deploy" />
+					type="file" required="true" description="The URL of the VDB's source file" />
 				<c:simple-property displayName="VDB Deploy File Name"
 					name="vdbDeployName" type="string" required="true"
 					description="The deployment file name to use. Must match the VDB Name you are deploying." />
-				<c:simple-property displayName="VDB Version" name="vdbVersion"
-					type="integer" required="false"
-					description="The version to use for the deployed VDB (leave blank for overwrite of version one)" />
 			</parameters>
 		</operation>