[teiid-commits] teiid SVN: r2941 - in trunk: client/src/main/java/org/teiid/adminapi and 2 other directories.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2011-02-25 00:34:22 -0500 (Fri, 25 Feb 2011)
New Revision: 2941

Modified:
   trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml
   trunk/client/src/main/java/org/teiid/adminapi/Admin.java
   trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java
   trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/AdminProvider.java
   trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java
Log:
TEIID-1329 adding the markDataSourceAvailable method to force the load of dynamic vdb metadata

Modified: trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml
===================================================================
--- trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml	2011-02-25 00:38:40 UTC (rev 2940)
+++ trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml	2011-02-25 05:34:22 UTC (rev 2941)
@@ -83,6 +83,7 @@
         <property name="bufferService"><inject bean="BufferService"/></property>
         <property name="securityHelper"><inject bean="SecurityHelper"/></property>
         <property name="VDBRepository"><inject bean="VDBRepository"/></property>
+        <property name="VDBStatusChecker"><inject bean="VDBStatusChecker"/></property>
         <property name="cacheFactory"><inject bean="CacheFactory"/></property>
         <property name="resultsetCacheConfig"><inject bean="ResultsetCacheConfig"/></property>
         

Modified: trunk/client/src/main/java/org/teiid/adminapi/Admin.java
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/Admin.java	2011-02-25 00:38:40 UTC (rev 2940)
+++ trunk/client/src/main/java/org/teiid/adminapi/Admin.java	2011-02-25 05:34:22 UTC (rev 2941)
@@ -288,4 +288,11 @@
      * @throws AdminException 
      */
     Set<String> getDataSourceTemplateNames() throws AdminException;
+    
+    /**
+     * Let 
+     * @param name
+     * @throws AdminException
+     */
+    void markDataSourceAvailable(String name) throws AdminException;
 }

Modified: trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java	2011-02-25 00:38:40 UTC (rev 2940)
+++ trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java	2011-02-25 05:34:22 UTC (rev 2941)
@@ -73,6 +73,7 @@
 import org.teiid.adminapi.impl.TranslatorMetaData;
 import org.teiid.adminapi.impl.VDBMetaData;
 import org.teiid.adminapi.impl.WorkerPoolStatisticsMetadata;
+import org.teiid.deployers.VDBStatusChecker;
 import org.teiid.jboss.IntegrationPlugin;
 
 public class Admin implements org.teiid.adminapi.Admin, Serializable {	
@@ -91,13 +92,15 @@
 	private ManagementView view;
 	private DeploymentManager deploymentMgr;
 	
+	final private VDBStatusChecker statusChecker;
 	
 	static {
 		VFS.init();
 	}
 	
-	public Admin(ManagementView view, DeploymentManager deployMgr) {
+	public Admin(ManagementView view, DeploymentManager deployMgr, VDBStatusChecker statusChecker) {
 		this.view = view;
+		this.statusChecker = statusChecker;
 		this.view.load();
 				
 		this.deploymentMgr =  deployMgr;
@@ -734,4 +737,9 @@
 			throw new AdminComponentException(e.getMessage(), e);
 		}
 	}
+	
+	@Override
+	public void markDataSourceAvailable(String name) throws AdminException {
+		statusChecker.dataSourceAdded(name);
+	}
 }

Modified: trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/AdminProvider.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/AdminProvider.java	2011-02-25 00:38:40 UTC (rev 2940)
+++ trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/AdminProvider.java	2011-02-25 05:34:22 UTC (rev 2941)
@@ -43,22 +43,23 @@
 import org.jboss.deployers.spi.management.deploy.DeploymentManager;
 import org.jboss.profileservice.spi.ProfileService;
 import org.teiid.adminapi.AdminComponentException;
+import org.teiid.deployers.VDBStatusChecker;
 
 public class AdminProvider {
 	
-	public static Admin getLocal(final ProfileService profileService) {
+	public static Admin getLocal(final ProfileService profileService, VDBStatusChecker vdbStatusChecker) {
 		ProfileConnection pc = new ProfileConnection(profileService);
-		return new Admin(pc.getManagementView(), pc.getDeploymentManager());
+		return new Admin(pc.getManagementView(), pc.getDeploymentManager(), vdbStatusChecker);
 	}
 
-	public static Admin getLocal() throws AdminComponentException {
+	public static Admin getLocal(VDBStatusChecker vdbStatusChecker) throws AdminComponentException {
 		ProfileConnection pc = new ProfileConnection();
-		return new Admin(pc.getManagementView(), pc.getDeploymentManager());
+		return new Admin(pc.getManagementView(), pc.getDeploymentManager(), vdbStatusChecker);
 	}
 	
-	public static Admin getRemote(String provideURL, String userid, String password) throws AdminComponentException {
+	public static Admin getRemote(String provideURL, String userid, String password, VDBStatusChecker vdbStatusChecker) throws AdminComponentException {
 		ProfileConnection pc = new ProfileConnection(provideURL, userid, password);
-		return new Admin(pc.getManagementView(), pc.getDeploymentManager());		
+		return new Admin(pc.getManagementView(), pc.getDeploymentManager(), vdbStatusChecker);		
 	}
 	
 	/**

Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java	2011-02-25 00:38:40 UTC (rev 2940)
+++ trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java	2011-02-25 05:34:22 UTC (rev 2941)
@@ -82,20 +82,21 @@
 					}
 	
 					String sourceName = getSourceName(resourceName, model, translator);
-					if (sourceName != null) {
-						ConnectorManager cm = cmr.getConnectorManager(sourceName);
-						String status = cm.getStausMessage();
-						if (status != null && status.length() > 0) {
-							model.addError(ModelMetaData.ValidationError.Severity.ERROR.name(), status);
-							LogManager.logInfo(LogConstants.CTX_RUNTIME, status);					
+					if (sourceName == null) {
+						continue;
+					}
+					ConnectorManager cm = cmr.getConnectorManager(sourceName);
+					String status = cm.getStausMessage();
+					if (status != null && status.length() > 0) {
+						model.addError(ModelMetaData.ValidationError.Severity.ERROR.name(), status);
+						LogManager.logInfo(LogConstants.CTX_RUNTIME, status);					
+					} else {
+						//get the pending metadata load
+						Runnable r = model.removeAttachment(Runnable.class);
+						if (r != null) {
+							runnables.add(r);
 						} else {
-							//get the pending metadata load
-							Runnable r = model.removeAttachment(Runnable.class);
-							if (r != null) {
-								runnables.add(r);
-							} else {
-								model.clearErrors();
-							}
+							model.clearErrors();
 						}
 					}
 				}