[teiid-commits] teiid SVN: r1314 - in trunk/runtime/src/main: resources/com/metamatrix/dqp/embedded and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: rareddy
Date: 2009-09-10 10:03:21 -0400 (Thu, 10 Sep 2009)
New Revision: 1314

Modified:
   trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfigAdminImpl.java
   trunk/runtime/src/main/resources/com/metamatrix/dqp/embedded/i18n.properties
Log:
TEIID-824

Modified: trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfigAdminImpl.java
===================================================================
--- trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfigAdminImpl.java	2009-09-10 13:50:56 UTC (rev 1313)
+++ trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfigAdminImpl.java	2009-09-10 14:03:21 UTC (rev 1314)
@@ -203,7 +203,7 @@
             	checkDecryption(binding, ctype);
             } catch(CryptoException e) {
             	if (!options.containsOption(AdminOptions.BINDINGS_IGNORE_DECRYPT_ERROR)) {
-            		throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("AdminStatus.CODE_DECRYPTION_FAILED", binding.getFullName())); //$NON-NLS-1$		
+            		throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.CODE_DECRYPTION_FAILED", binding.getFullName())); //$NON-NLS-1$		
             	}
             }
             
@@ -280,7 +280,7 @@
             	checkDecryption(binding, type);
             } catch(CryptoException e) {
             	if (!options.containsOption(AdminOptions.BINDINGS_IGNORE_DECRYPT_ERROR)) {
-            		throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("AdminStatus.CODE_DECRYPTION_FAILED", binding.getFullName())); //$NON-NLS-1$		
+            		throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.CODE_DECRYPTION_FAILED", binding.getFullName())); //$NON-NLS-1$		
             	}
             }
 
@@ -457,7 +457,7 @@
             	checkDecryption(binding, type);
             } catch(CryptoException e) {
             	if (!options.containsOption(AdminOptions.BINDINGS_IGNORE_DECRYPT_ERROR)) {
-            		throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("AdminStatus.CODE_DECRYPTION_FAILED", binding.getFullName())); //$NON-NLS-1$		
+            		throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.CODE_DECRYPTION_FAILED", binding.getFullName())); //$NON-NLS-1$		
             	}
             }
         }
@@ -502,7 +502,7 @@
      * @return decrypted property.
      */
     String decryptProperty(String value) throws CryptoException{
-        if (value != null && value.length() > 0) {
+        if (value != null && value.length() > 0 && CryptoUtil.isValueEncrypted(value)) {
            return CryptoUtil.stringDecrypt(value);
         }
         return value;

Modified: trunk/runtime/src/main/resources/com/metamatrix/dqp/embedded/i18n.properties
===================================================================
--- trunk/runtime/src/main/resources/com/metamatrix/dqp/embedded/i18n.properties	2009-09-10 13:50:56 UTC (rev 1313)
+++ trunk/runtime/src/main/resources/com/metamatrix/dqp/embedded/i18n.properties	2009-09-10 14:03:21 UTC (rev 1314)
@@ -195,6 +195,7 @@
 Admin.bindings_exceeded_limit=You have reached the MetaMatrix license limit of connector bindings, Failed to add connector bindings.
 Admin.cb_doesnot_exist=The connector binding does not exist:{0}
 Admin.ct_doesnot_exist=The connector type does not exist:{0}
+Admin.CODE_DECRYPTION_FAILED=Decryption of the password property failed; Check to make sure encryption libraries are correctly installed or provide a plain text password.
 
 DQPEmbeddedManager.start_dqp=Teiid is started at time = {0}
 DQPEmbeddedManager.shutdown_dqp=Teiid is shutdown at time = {0}