[teiid-commits] teiid SVN: r1852 - trunk/console/src/main/java/org/teiid/rhq/plugin/util.

[teiid-commits at lists.jboss.org]

Author: tejones
Date: 2010-02-19 11:49:31 -0500 (Fri, 19 Feb 2010)
New Revision: 1852

Modified:
   trunk/console/src/main/java/org/teiid/rhq/plugin/util/DeploymentUtils.java
   trunk/console/src/main/java/org/teiid/rhq/plugin/util/PluginConstants.java
   trunk/console/src/main/java/org/teiid/rhq/plugin/util/ProfileServiceUtil.java
Log:
TEIID-807: Cleaned up legacy code and added VDB deployment/un-deployment. Also added operation execution framework.

Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/util/DeploymentUtils.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/util/DeploymentUtils.java	2010-02-19 16:49:13 UTC (rev 1851)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/util/DeploymentUtils.java	2010-02-19 16:49:31 UTC (rev 1852)
@@ -76,7 +76,7 @@
         DeploymentStatus distributeStatus;
         Exception distributeFailure = null;
         try {
-            progress = deploymentManager.distribute(archiveFileName, contentURL, false);
+            progress = deploymentManager.distribute(archiveFileName, contentURL, true);
             distributeStatus = run(progress);
             if (distributeStatus.isFailed()) {
                 distributeFailure = (distributeStatus.getFailure() != null) ? distributeStatus.getFailure() :

Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/util/PluginConstants.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/util/PluginConstants.java	2010-02-19 16:49:13 UTC (rev 1851)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/util/PluginConstants.java	2010-02-19 16:49:31 UTC (rev 1852)
@@ -57,8 +57,9 @@
 	 */
 	public interface ComponentType {
 		
-		public interface Runtime {
+		public interface Platform {
 
+			public final static String NAME = "Platform"; //$NON-NLS-1$
 			public final static String TYPE = "ConnectionFactory"; //$NON-NLS-1$
 			public final static String SUBTYPE = "NoTx"; //$NON-NLS-1$
 			public final static String TEIID_RUNTIME_ENGINE = "teiid/runtime-engine"; //$NON-NLS-1$
@@ -68,9 +69,13 @@
 
 			public static interface Operations {
 
-				public final static String BOUNCE_SYSTEM = "bounceSystem"; //$NON-NLS-1$					
+				public final static String GET_QUERIES = "listQueries"; //$NON-NLS-1$					
 				public final static String GET_LONGRUNNINGQUERIES = "listLongRunningQueries"; //$NON-NLS-1$
-
+				public final static String KILL_REQUEST = "killRequest"; //$NON-NLS-1$
+				public final static String GET_PROPERTIES = "getProperties"; //$NON-NLS-1$
+				public final static String GET_REQUESTS = "getRequests"; //$NON-NLS-1$
+				public final static String GET_SESSIONS = "getActiveSessions"; //$NON-NLS-1$
+				
 			}
 
 			public static interface Metrics {
@@ -154,10 +159,6 @@
 
 	}
 
-	public interface Security {
-
-	}
-
 	/**
 	 * Use these metric names when calling getValues() on the connection
 	 * interface.
@@ -178,9 +179,10 @@
 	public static interface Operation {
 		public final static String KILL_REQUEST = "killRequest"; //$NON-NLS-1$
 		public final static String GET_VDBS = "listVDBs"; //$NON-NLS-1$
-
 		public final static String GET_PROPERTIES = "getProperties"; //$NON-NLS-1$
-
+		public final static String GET_REQUESTS = "getRequests"; //$NON-NLS-1$
+		public final static String GET_SESSIONS = "getActiveSessions"; //$NON-NLS-1$
+		
 		/**
 		 * Use these value names when calling executeOperation() on the
 		 * connection interface. These will correlate with parameters used in

Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/util/ProfileServiceUtil.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/util/ProfileServiceUtil.java	2010-02-19 16:49:13 UTC (rev 1851)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/util/ProfileServiceUtil.java	2010-02-19 16:49:31 UTC (rev 1852)
@@ -21,7 +21,10 @@
 public class ProfileServiceUtil {
 
 	protected final Log LOG = LogFactory.getLog(ProfileServiceUtil.class);
+	private static ComponentType DQPTYPE = new ComponentType("teiid", "dqp");
+	private static String DQPNAME = "org.teiid.dqp.internal.process.DQPManagementView";
 
+
 	/**
 	 * Get the passed in {@link ManagedComponent}
 	 * 
@@ -131,5 +134,10 @@
 		File deployDir = warFile.getParentFile();
 		return deployDir;
 	}
+	
+	public static ManagedComponent getDQPManagementView() throws NamingException, Exception {
+		
+		return getManagedComponent(DQPTYPE, DQPNAME);
+	}
 
 }