[teiid-commits] teiid SVN: r3910 - in trunk: jboss-integration/src/main/resources/org/teiid/jboss and 1 other directories.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2012-03-03 06:48:18 -0500 (Sat, 03 Mar 2012)
New Revision: 3910

Modified:
   trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java
   trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties
   trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties
Log:
TEIID-1961 refining a couple of error messages

Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java	2012-03-03 02:23:45 UTC (rev 3909)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java	2012-03-03 11:48:18 UTC (rev 3910)
@@ -34,17 +34,17 @@
 import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
 import org.jboss.as.server.deployment.DeploymentUnitProcessor;
 import org.jboss.modules.Module;
+import org.jboss.msc.service.AbstractServiceListener;
 import org.jboss.msc.service.Service;
 import org.jboss.msc.service.ServiceBuilder;
-import org.jboss.msc.service.ServiceBuilder.DependencyType;
 import org.jboss.msc.service.ServiceController;
-import org.jboss.msc.service.ServiceController.Mode;
-import org.jboss.msc.service.ServiceController.State;
-import org.jboss.msc.service.AbstractServiceListener;
 import org.jboss.msc.service.ServiceName;
 import org.jboss.msc.service.StartContext;
 import org.jboss.msc.service.StartException;
 import org.jboss.msc.service.StopContext;
+import org.jboss.msc.service.ServiceBuilder.DependencyType;
+import org.jboss.msc.service.ServiceController.Mode;
+import org.jboss.msc.service.ServiceController.State;
 import org.teiid.adminapi.Model;
 import org.teiid.adminapi.Translator;
 import org.teiid.adminapi.impl.ModelMetaData;
@@ -104,7 +104,7 @@
 			String type = data.getType();
 			Translator parent = this.translatorRepository.getTranslatorMetaData(type);
 			if ( parent == null) {
-				throw new DeploymentUnitProcessingException(RuntimePlugin.Util.getString("translator_type_not_found", IntegrationPlugin.Event.TEIID50021, deploymentName)); //$NON-NLS-1$
+				throw new DeploymentUnitProcessingException(RuntimePlugin.Util.getString("translator_type_not_found", IntegrationPlugin.Event.TEIID50021, type, deploymentName)); //$NON-NLS-1$
 			}
 		}
 		

Modified: trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties
===================================================================
--- trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties	2012-03-03 02:23:45 UTC (rev 3909)
+++ trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties	2012-03-03 11:48:18 UTC (rev 3910)
@@ -32,10 +32,9 @@
 bad_vdb_extension=The extension of the file name must be either ".vdb" for designer vdb or "xxx-vdb.xml" for dynamic VDBs
 vdb_not_found=VDB with name "{0}" version "{1}" not found in configuration
 TEIID50062=Model name "{0}" not found in the VDB with name "{1}" version "{2}"
-TEIID50062=Source name "{0}" not found in model {1} in the VDB with name "{2}" version "{3}"
+TEIID50062=Source name "{0}" not found for model {1} in the VDB with name "{2}" version "{3}"
 TEIID50061=Policy name "{0}" not found in the VDB with name "{1}" version "{2}"
 datasource_not_found=Datasource {0} not found in the configuration.
-sourcename_not_found=No source name {0} found in the model: {1}.{2}.{3}
 vdb_file_not_found = VDB file {0} not found at the location specified.
 socket_not_enabled=Socket based remote JDBC protocol is not enabled.
 TEIID50063=Source with name {0} not found in the Model {1} in VDB {2}.{3}

Modified: trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties
===================================================================
--- trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties	2012-03-03 02:23:45 UTC (rev 3909)
+++ trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties	2012-03-03 11:48:18 UTC (rev 3910)
@@ -84,7 +84,7 @@
 TEIID40027=Required property "{0}" has no value. Deployment is incomplete.
 TEIID40001=The provided translator property values {0} were not used.  Please check the properties that are expected by translator {1}.
 name_not_found=Translator property "name" not defined for the deployment "{0}"
-translator_type_not_found=The parent translator defined not found in configuration "{0}"
+translator_type_not_found=The parent translator type "{0}" was not found in configuration "{1}"
 TEIID40002=Failed to load the ODBC metadata repository.
 bad_binding=Binding on a statement, that has not been prepared:{0}
 not_bound=No bound statement found with name {0}