[teiid-commits] teiid SVN: r2160 - in trunk: jboss-integration/src/main/java/org/teiid/adminapi/jboss and 1 other directory.

Author: rareddy Date: 2010-05-27 18:45:29 -0400 (Thu, 27 May 2010) New Revision: 2160 Modified: trunk/client/src/main/java/org/teiid/adminapi/impl/PropertyDefinitionMetadata.java trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java Log: TEIID-1079 Modified: trunk/client/src/main/java/org/teiid/adminapi/impl/PropertyDefinitionMetadata.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/impl/PropertyDefinitionMetadata.java 2010-05-27 19:20:36 UTC (rev 2159) +++ trunk/client/src/main/java/org/teiid/adminapi/impl/PropertyDefinitionMetadata.java 2010-05-27 22:45:29 UTC (rev 2160) @@ -50,16 +50,16 @@ public String toString() { StringBuffer result = new StringBuffer(); result.append("Display Name:").append(getDisplayName()); //$NON-NLS-1$ - result.append("Description:").append(getDescription()); //$NON-NLS-1$ - result.append("Property Type Classname:").append(getPropertyTypeClassName()); //$NON-NLS-1$ - result.append("Default Value:").append(getDefaultValue()); //$NON-NLS-1$ - result.append("Constrained To Allow Values:").append(isConstrainedToAllowedValues()); //$NON-NLS-1$ - result.append("Allowed Values:").append(getAllowedValues()); //$NON-NLS-1$ - result.append("Required:").append(isRequired()); //$NON-NLS-1$ - result.append("Expert:").append(isAdvanced()); //$NON-NLS-1$ - result.append("Masked:").append(isMasked()); //$NON-NLS-1$ - result.append("Modifiable:").append(isModifiable()); //$NON-NLS-1$ - result.append("RequiresRestart:").append(getRequiresRestart()); //$NON-NLS-1$ + result.append(" Description:").append(getDescription()); //$NON-NLS-1$ + result.append(" Property Type Classname:").append(getPropertyTypeClassName()); //$NON-NLS-1$ + result.append(" Default Value:").append(getDefaultValue()); //$NON-NLS-1$ + result.append(" Constrained To Allow Values:").append(isConstrainedToAllowedValues()); //$NON-NLS-1$ + result.append(" Allowed Values:").append(getAllowedValues()); //$NON-NLS-1$ + result.append(" Required:").append(isRequired()); //$NON-NLS-1$ + result.append(" Expert:").append(isAdvanced()); //$NON-NLS-1$ + result.append(" Masked:").append(isMasked()); //$NON-NLS-1$ + result.append(" Modifiable:").append(isModifiable()); //$NON-NLS-1$ + result.append(" RequiresRestart:").append(getRequiresRestart()); //$NON-NLS-1$ return result.toString(); } 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 2010-05-27 19:20:36 UTC (rev 2159) +++ trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java 2010-05-27 22:45:29 UTC (rev 2160) @@ -390,13 +390,15 @@ public Collection<PropertyDefinition> getTemplatePropertyDefinitions(String templateName) throws AdminException { DeploymentTemplateInfo info = null; - try { - info = getView().getTemplate(templateName); - } catch (NoSuchDeploymentException e) { - // ignore.. - } try { + + try { + info = getView().getTemplate(templateName); + } catch (Exception e) { + // ignore.. + } + if (info == null && !templateName.startsWith(TranslatorMetaData.TRANSLATOR_PREFIX)) { info = getView().getTemplate(TranslatorMetaData.TRANSLATOR_PREFIX+templateName); }