[teiid-commits] teiid SVN: r2169 - trunk/console/src/main/java/org/teiid/rhq/plugin.
Author: tejones
Date: 2010-05-28 10:18:02 -0400 (Fri, 28 May 2010)
New Revision: 2169
Modified:
trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorComponent.java
trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorDiscoveryComponent.java
Log:
Fix compiler errors due to a merge gone wild
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorComponent.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorComponent.java 2010-05-28
13:31:10 UTC (rev 2168)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorComponent.java 2010-05-28
14:18:02 UTC (rev 2169)
@@ -24,6 +24,8 @@
import java.util.Map;
import java.util.Set;
+import javax.naming.NamingException;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.deployers.spi.management.ManagementView;
Modified:
trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorDiscoveryComponent.java
===================================================================
---
trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorDiscoveryComponent.java 2010-05-28
13:31:10 UTC (rev 2168)
+++
trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorDiscoveryComponent.java 2010-05-28
14:18:02 UTC (rev 2169)
@@ -91,13 +91,15 @@
// Add to return values
// First get translator specific properties
ManagedProperty translatorProps = translator.getProperty("property");
+ PropertyList list = new PropertyList("translatorList");
+ PropertyMap propMap = null;
getTranslatorValues(translatorProps.getValue(), propMap, list);
// Now get common properties
- c.put(new PropertySimple("name", translatorName));
- c.put(new
PropertySimple("type",ProfileServiceUtil.getSimpleValue(translator,"type",
String.class)));
+ configuration.put(new PropertySimple("name", translatorName));
+ configuration.put(new
PropertySimple("type",ProfileServiceUtil.getSimpleValue(translator,"type",
String.class)));
- detail.setPluginConfiguration(c);
+ detail.setPluginConfiguration(configuration);
// Add to return values
discoveredResources.add(detail);
log.debug("Discovered Teiid Translator: " + translatorName);