[teiid-commits] teiid SVN: r611 - in trunk: embedded/src/main/java/com/metamatrix/dqp/embedded/services and 1 other directories.

[teiid-commits at lists.jboss.org]

Author: rareddy
Date: 2009-03-20 16:29:43 -0400 (Fri, 20 Mar 2009)
New Revision: 611

Modified:
   trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicComponentType.java
   trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java
   trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorService.java
Log:
TEIID-434: looking up properly for property definitions.

Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicComponentType.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicComponentType.java	2009-03-20 20:20:13 UTC (rev 610)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicComponentType.java	2009-03-20 20:29:43 UTC (rev 611)
@@ -293,7 +293,7 @@
 
 
 
-    void setComponentTypeDefinitions(Collection newDefinitions){
+    public void setComponentTypeDefinitions(Collection newDefinitions){
 
         if (newDefinitions == null) {
         	return;

Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java	2009-03-20 20:20:13 UTC (rev 610)
+++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java	2009-03-20 20:29:43 UTC (rev 611)
@@ -50,6 +50,7 @@
 import com.metamatrix.common.config.api.ConnectorBinding;
 import com.metamatrix.common.config.api.ConnectorBindingType;
 import com.metamatrix.common.config.api.ExtensionModule;
+import com.metamatrix.common.config.model.BasicComponentType;
 import com.metamatrix.common.config.model.BasicConnectorBinding;
 import com.metamatrix.common.log.LogManager;
 import com.metamatrix.common.protocol.URLHelper;
@@ -878,7 +879,7 @@
      * @since 4.3
      */
     public void saveConnectorType(ConnectorBindingType type) throws MetaMatrixComponentException {
-        loadedConnectorTypes.put(type.getName(), type);
+        loadedConnectorTypes.put(type.getName(), addFullPropertyDefns(type));
 
         // Also add binding type to the configuration and save.        
         DQPEmbeddedPlugin.logInfo("EmbeddedConfigurationService.connector_type_save", new Object[] {type.getName()}); //$NON-NLS-1$
@@ -1092,7 +1093,7 @@
             for (Iterator it = def.getConnectorTypes().values().iterator(); it.hasNext();) {
                 ConnectorBindingType type= (ConnectorBindingType)it.next();
                 if (!loadedConnectorTypes.containsKey(type.getName())) {
-                    loadedConnectorTypes.put(type.getName(), type);
+                    loadedConnectorTypes.put(type.getName(), addFullPropertyDefns(type));
                 }
             }                        
             
@@ -1110,7 +1111,13 @@
         }
     }
 
-    /** 
+    private ComponentType addFullPropertyDefns(ConnectorBindingType type) {
+    	BasicComponentType baseType = (BasicComponentType)type;
+    	baseType.setComponentTypeDefinitions(this.configurationModel.getAllComponentTypeDefinitions((ComponentTypeID)baseType.getID()));
+		return baseType;
+	}
+
+	/** 
      * Add the connnector binding with new deployment name
      * @param binding
      * @param deployedName

Modified: trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorService.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorService.java	2009-03-20 20:20:13 UTC (rev 610)
+++ trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorService.java	2009-03-20 20:29:43 UTC (rev 611)
@@ -59,6 +59,7 @@
 import com.metamatrix.common.config.CurrentConfiguration;
 import com.metamatrix.common.config.api.ComponentType;
 import com.metamatrix.common.config.api.ComponentTypeDefn;
+import com.metamatrix.common.config.api.ComponentTypeID;
 import com.metamatrix.common.config.api.Configuration;
 import com.metamatrix.common.config.api.ConfigurationModelContainer;
 import com.metamatrix.common.config.api.ConnectorBinding;
@@ -487,7 +488,7 @@
                 throw  new ApplicationInitializationException(msg);
             }
 
-            Collection compTypeDefns = componentType.getComponentTypeDefinitions();
+            Collection compTypeDefns = configModel.getAllComponentTypeDefinitions((ComponentTypeID)componentType.getID());
             String propValue;
             String propName;
             for ( Iterator compTypeDefnItr = compTypeDefns.iterator(); compTypeDefnItr.hasNext(); ) {