[teiid-commits] teiid SVN: r2551 - in branches/7.1.x/client/src/main: resources/org/teiid/net and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: rareddy
Date: 2010-09-08 15:43:37 -0400 (Wed, 08 Sep 2010)
New Revision: 2551

Modified:
   branches/7.1.x/client/src/main/java/org/teiid/adminapi/AdminFactory.java
   branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties
Log:
TEIID-1027: verbose messages in the "i18N.properties" file. These are legacy messages did not get deleted when the code got refactored.

Modified: branches/7.1.x/client/src/main/java/org/teiid/adminapi/AdminFactory.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/adminapi/AdminFactory.java	2010-09-08 19:35:26 UTC (rev 2550)
+++ branches/7.1.x/client/src/main/java/org/teiid/adminapi/AdminFactory.java	2010-09-08 19:43:37 UTC (rev 2551)
@@ -64,7 +64,7 @@
     	
     	private synchronized Admin getTarget() throws AdminComponentException {
     		if (closed) {
-    			throw new AdminComponentException(NetPlugin.Util.getString("ERR.014.001.0001")); //$NON-NLS-1$
+    			throw new AdminComponentException(NetPlugin.Util.getString("admin_conn_closed")); //$NON-NLS-1$
     		}
     		return target;
     	}
@@ -186,7 +186,7 @@
                                    String applicationName) throws AdminException {
         
         if (userName == null || userName.trim().length() == 0) {
-            throw new IllegalArgumentException(NetPlugin.Util.getString("ERR.014.001.0099")); //$NON-NLS-1$
+            throw new IllegalArgumentException(NetPlugin.Util.getString("invalid_parameter")); //$NON-NLS-1$
         }
         
     	final Properties p = new Properties();

Modified: branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties
===================================================================
--- branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties	2010-09-08 19:35:26 UTC (rev 2550)
+++ branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties	2010-09-08 19:43:37 UTC (rev 2551)
@@ -21,61 +21,21 @@
 #
 
 StreamImpl.Unable_to_read_data_from_stream=Unable to read data from the stream: {0}
-
 RequestMessage.invalid_txnAutoWrap=''{0}'' is an invalid transaction autowrap mode.
-
 LocalTransportHandler.Transport_shutdown=Tranport has been shutdown.
-
-
-
 PlatformServerConnectionFactory.Unable_to_find_a_component_used_in_logging_on_to=Unable to find a component used authenticate on to Teiid
 
+admin_conn_closed = The Admin connection has been closed.
+invalid_parameter = The user parameter may not be null or empty.
 
-
-
-
-
-
-MSG.014.010.0010 = Usage: VMController <vm_name> <host_name> <startDeployServices> [<log_file>]
-MSG.014.010.0011 = If startDeployedServices = true, deployedServices will be started.
-
-ERR.014.001.0099 = The user parameter may not be null or empty.
-ERR.014.001.0100 = The user password may not be null or empty.
-ERR.014.001.0101 = NamingException while getting new initialcontext for LogonAPI.
-ERR.014.001.0102 = Error trying to connect to server: {0} at {1}
-ERR.014.001.0103 = CreateException while getting home interface for LogonAPI.
-ERR.014.001.0104 = RemoteException while getting home interface for LogonAPI.
-ERR.014.001.0105 = Unknown error while obtaining a reference to LogonAPI.
-ERR.014.001.0106 = NamingException while getting new initialcontext for AdminAPI.
-ERR.014.001.0107 = NamingException while getting home interface for AdminAPI.
-ERR.014.001.0108 = CreateException while getting home interface for AdminAPI.
-ERR.014.001.0109 = RemoteException while getting home interface for AdminAPI.
-ERR.014.001.0110 = Unknown error while obtaining a reference to AdminAPI for user <{0}>
-
-
-
 SocketServerInstance.Connection_Error.Unknown_Host = Error establishing socket. Unknown host: {0}
 SocketServerInstance.Connection_Error.Connect_Failed = Error establishing socket to host and port: {0}:{1}. Reason: {2}
-
-
-ERR.014.001.0001 = Lost communication with the AdminAPI - the connection has been closed.
-ERR.014.001.0002 = Lost communication with the AdminAPI.
-
-MSG.014.001.0001 = Starting AdminAPIConnection for session <{0}>
-
 SocketServerInstancePool.No_valid_host_available=No valid host available. Attempted connections to: {0}
-
-
-
-
-
 SocketServerInstanceImpl.handshake_error=Handshake error
 SocketClientInstance.invalid_sessionkey=Invalid session key used during handshake
 
 SSLAwareChannelHandler.channel_closed=Channel closed
-
 SocketServerConnection.closed=Server connection is closed
-
 SocketHelper.keystore_not_found=Key store ''{0}'' was not found.
 
 MMURL.INVALID_FORMAT=The required url format is {0}