[teiid-commits] teiid SVN: r3947 - in trunk: jboss-integration/src/main/resources/org/teiid/jboss and 5 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Mon Mar 19 11:53:58 EDT 2012
Author: rareddy
Date: 2012-03-19 11:53:55 -0400 (Mon, 19 Mar 2012)
New Revision: 3947
Modified:
trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/JBossSessionService.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorAdd.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorDeployer.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDependencyDeployer.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBParserDeployer.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties
trunk/runtime/src/main/java/org/teiid/deployers/UDFMetaData.java
trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java
trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java
trunk/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java
trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java
trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties
Log:
TEIID-1975: fixing and removing the i18N messages
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java 2012-03-17 11:05:22 UTC (rev 3946)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java 2012-03-19 15:53:55 UTC (rev 3947)
@@ -108,10 +108,16 @@
TEIID50066,
TEIID50067,
TEIID50068,
-
+ TEIID50069,
+ TEIID50070,
+ TEIID50071,
+ TEIID50072,
+ TEIID50073,
+ TEIID50074,
+ TEIID50075,
+ TEIID50076,
+ TEIID50077,
-
-
TEIID50086,
TEIID50087,
TEIID50088
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/JBossSessionService.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/JBossSessionService.java 2012-03-17 11:05:22 UTC (rev 3946)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/JBossSessionService.java 2012-03-19 15:53:55 UTC (rev 3947)
@@ -68,7 +68,7 @@
return new TeiidLoginContext(getUserName(existing)+AT+domain, existing, domain, this.securityHelper.getSecurityContext(domain));
}
}
- throw new LoginException(RuntimePlugin.Util.getString("no_passthrough_identity_found")); //$NON-NLS-1$
+ throw new LoginException(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50073));
}
@@ -92,7 +92,7 @@
}
}
}
- throw new LoginException(RuntimePlugin.Util.getString("SessionServiceImpl.The_username_0_and/or_password_are_incorrect", username )); //$NON-NLS-1$
+ throw new LoginException(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50072, username ));
}
private String getUserName(Subject subject) {
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java 2012-03-17 11:05:22 UTC (rev 3946)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java 2012-03-19 15:53:55 UTC (rev 3947)
@@ -421,7 +421,7 @@
moduleId = ModuleIdentifier.create(moduleName);
module = Module.getCallerModuleLoader().loadModule(moduleId);
} catch (ModuleLoadException e) {
- throw new OperationFailedException(e, new ModelNode().set(IntegrationPlugin.Util.getString("failed_load_module", moduleName))); //$NON-NLS-1$
+ throw new OperationFailedException(e, new ModelNode().set(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50069, moduleName))); //$NON-NLS-1$
}
ServiceLoader<T> services = module.loadService(type);
return services.iterator().next();
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2012-03-17 11:05:22 UTC (rev 3946)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2012-03-19 15:53:55 UTC (rev 3947)
@@ -421,7 +421,7 @@
String cacheType = operation.get(OperationsConstants.CACHE_TYPE).asString();
if (cache == null) {
- throw new OperationFailedException(new ModelNode().set(IntegrationPlugin.Util.getString("cache_not_found", cacheType))); //$NON-NLS-1$
+ throw new OperationFailedException(new ModelNode().set(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50071, cacheType)));
}
if (operation.hasDefined(OperationsConstants.VDB_NAME) && operation.hasDefined(OperationsConstants.VDB_VERSION)) {
@@ -465,7 +465,7 @@
}
String cacheType = operation.get(OperationsConstants.CACHE_TYPE).asString();
if (cache == null) {
- throw new OperationFailedException(new ModelNode().set(IntegrationPlugin.Util.getString("cache_not_found", cacheType))); //$NON-NLS-1$
+ throw new OperationFailedException(new ModelNode().set(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50071, cacheType)));
}
ModelNode result = context.getResult();
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorAdd.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorAdd.java 2012-03-17 11:05:22 UTC (rev 3946)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorAdd.java 2012-03-19 15:53:55 UTC (rev 3947)
@@ -100,7 +100,7 @@
module = ml.loadModule(ModuleIdentifier.create(moduleName));
translatorLoader = module.getClassLoader();
} catch (ModuleLoadException e) {
- throw new OperationFailedException(e, new ModelNode().set(IntegrationPlugin.Util.getString("failed_load_translator_module", IntegrationPlugin.Event.TEIID50007, moduleName, translatorName))); //$NON-NLS-1$
+ throw new OperationFailedException(e, new ModelNode().set(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50007, moduleName, translatorName)));
}
}
@@ -110,7 +110,7 @@
for (ExecutionFactory ef:serviceLoader) {
VDBTranslatorMetaData metadata = TranslatorUtil.buildTranslatorMetadata(ef, moduleName);
if (metadata == null) {
- throw new OperationFailedException( new ModelNode().set(IntegrationPlugin.Util.getString("error_adding_translator", IntegrationPlugin.Event.TEIID50008, translatorName))); //$NON-NLS-1$
+ throw new OperationFailedException( new ModelNode().set(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50008, translatorName)));
}
metadata.addAttchment(ClassLoader.class, translatorLoader);
@@ -129,7 +129,7 @@
}
if (!added) {
- throw new OperationFailedException(new ModelNode().set(IntegrationPlugin.Util.getString("translator.failed-to-load", IntegrationPlugin.Event.TEIID50009, translatorName, moduleName))); //$NON-NLS-1$
+ throw new OperationFailedException(new ModelNode().set(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50009, translatorName, moduleName))); //$NON-NLS-1$
}
}
}
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorDeployer.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorDeployer.java 2012-03-17 11:05:22 UTC (rev 3946)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorDeployer.java 2012-03-19 15:53:55 UTC (rev 3947)
@@ -64,7 +64,7 @@
for (ExecutionFactory ef:serviceLoader) {
VDBTranslatorMetaData metadata = TranslatorUtil.buildTranslatorMetadata(ef, moduleName);
if (metadata == null) {
- throw new DeploymentUnitProcessingException(IntegrationPlugin.Util.getString("error_adding_translator_deployment", moduleName)); //$NON-NLS-1$
+ throw new DeploymentUnitProcessingException(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50070, moduleName));
}
metadata.addAttchment(ClassLoader.class, translatorLoader);
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDependencyDeployer.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDependencyDeployer.java 2012-03-17 11:05:22 UTC (rev 3946)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDependencyDeployer.java 2012-03-19 15:53:55 UTC (rev 3947)
@@ -88,7 +88,7 @@
ModuleRootMarker.mark(jarArchiveRoot);
deploymentUnit.addToAttachmentList(Attachments.RESOURCE_ROOTS, jarArchiveRoot);
} catch (IOException e) {
- throw new DeploymentUnitProcessingException(IntegrationPlugin.Event.TEIID50018.name()+IntegrationPlugin.Util.getString("failed_to_process_vdb_archive", archive), e); //$NON-NLS-1$
+ throw new DeploymentUnitProcessingException(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50018, archive), e);
}
}
}
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-17 11:05:22 UTC (rev 3946)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java 2012-03-19 15:53:55 UTC (rev 3947)
@@ -64,7 +64,6 @@
import org.teiid.query.ObjectReplicator;
import org.teiid.query.metadata.DDLMetadataRepository;
import org.teiid.query.metadata.NativeMetadataRepository;
-import org.teiid.runtime.RuntimePlugin;
import org.teiid.services.BufferServiceImpl;
@@ -99,7 +98,7 @@
if (!preview) {
List<String> errors = deployment.getValidityErrors();
if (errors != null && !errors.isEmpty()) {
- throw new DeploymentUnitProcessingException(RuntimePlugin.Util.getString("validity_errors_in_vdb", RuntimePlugin.Event.TEIID40004, deployment)); //$NON-NLS-1$
+ throw new DeploymentUnitProcessingException(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50074, deployment));
}
}
@@ -110,7 +109,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, type, deploymentName)); //$NON-NLS-1$
+ throw new DeploymentUnitProcessingException(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50077, type, deploymentName));
}
}
@@ -323,7 +322,7 @@
module = ml.loadModule(ModuleIdentifier.create(moduleName));
moduleLoader = module.getClassLoader();
} catch (ModuleLoadException e) {
- throw new DeploymentUnitProcessingException(IntegrationPlugin.Util.getString("failed_load_module", IntegrationPlugin.Event.TEIID50068, moduleName, modelName)); //$NON-NLS-1$
+ throw new DeploymentUnitProcessingException(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50068, moduleName, modelName));
}
}
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBParserDeployer.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBParserDeployer.java 2012-03-17 11:05:22 UTC (rev 3946)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBParserDeployer.java 2012-03-19 15:53:55 UTC (rev 3947)
@@ -151,7 +151,7 @@
if (model.getModelType().equals(Model.Type.FUNCTION)) {
String path = ((ModelMetaData)model).getPath();
if (path == null) {
- throw new DeploymentUnitProcessingException(RuntimePlugin.Util.getString("invalid_udf_file", model.getName())); //$NON-NLS-1$
+ throw new DeploymentUnitProcessingException(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50075, model.getName()));
}
udf.buildFunctionModelFile(model.getName(), path);
}
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-03-17 11:05:22 UTC (rev 3946)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-03-19 15:53:55 UTC (rev 3947)
@@ -205,7 +205,7 @@
for (Model model:deployment.getModels()) {
List<String> sourceNames = model.getSourceNames();
if (sourceNames.size() != new HashSet<String>(sourceNames).size()) {
- throw new StartException(IntegrationPlugin.Util.getString("duplicate_source_name", model.getName(), deployment.getName(), deployment.getVersion(), IntegrationPlugin.Event.TEIID50033)); //$NON-NLS-1$
+ throw new StartException(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50033, model.getName(), deployment.getName(), deployment.getVersion()));
}
for (String source:sourceNames) {
ConnectorManager cm = cmr.getConnectorManager(source);
@@ -214,7 +214,7 @@
if (cm != null) {
if (!cm.getTranslatorName().equals(name)
|| !cm.getConnectionName().equals(connection)) {
- throw new StartException(IntegrationPlugin.Util.getString("source_name_mismatch", source, deployment.getName(), deployment.getVersion(),IntegrationPlugin.Event.TEIID50034)); //$NON-NLS-1$
+ throw new StartException(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50034, source, deployment.getName(), deployment.getVersion()));
}
continue;
}
@@ -236,7 +236,7 @@
static ExecutionFactory<Object, Object> getExecutionFactory(String name, TranslatorRepository vdbRepo, TranslatorRepository repo, VDBMetaData deployment, IdentityHashMap<Translator, ExecutionFactory<Object, Object>> map, HashSet<String> building) throws TranslatorNotFoundException {
if (!building.add(name)) {
- throw new TranslatorNotFoundException(RuntimePlugin.Util.getString("recursive_delegation", deployment.getName(), deployment.getVersion(), building)); //$NON-NLS-1$
+ throw new TranslatorNotFoundException(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50076, deployment.getName(), deployment.getVersion(), building));
}
VDBTranslatorMetaData translator = vdbRepo.getTranslatorMetaData(name);
if (translator == null) {
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-17 11:05:22 UTC (rev 3946)
+++ trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2012-03-19 15:53:55 UTC (rev 3947)
@@ -28,15 +28,9 @@
TEIID50038=Teiid Embedded transport enabled. Bound to: {0}
TEIID50041=Teiid Embedded transport disabled. Local Connections will fail. UnBound : {0}
TEIID50002=Teiid Engine stopped {0}
-admin_connection_closed=Teiid admin connection is already closed.
-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 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.
-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}
TEIID50062=Model with name {0} not found in the VDB {1}.{2}
event_distributor_bound=org.teiid.events.EventDistributorFactory is bound to {0} for manual control of Teiid events.
@@ -48,35 +42,21 @@
TEIID50054=Model {0} not found in VDB {1}.{2}
TEIID50055=Source name {0} not found in Model {1} in VDB {1}.{2}
-no_operation=No operation found with given name = {0}
-failed_to_remove=Failed to remove the deployment
-deployment_start_failed={0} deployment start failed
-failed_to_convert=Failed to convert from String value to {0} type
-property_required_not_found="{0}" is required for the connector type "{1}", but was not supplied; There is no default value either.
-invalid_class={0} invalid type of class specified. Must be of type org.teiid.connector.api.ConnectorEnvironment
-class_not_found=Class {0} not found.
-datasource_exists=Data source with name {0} already exists!
-datasource_template_not_found=Template {0} for creating the data source is not found.
-jndi_failed=JNDI lookup failed {0}.
distributed_cache_not_enabled= Distributed caching NOT enabled. Missing "distributed-cache" property in the configuration or running in standalone mode.
TEIID50003=Distributed caching enabled.
-distribute_failed=Deploy of the archive failed {0}
-template_not_found=Template not found for {0}
-admin_executing=JOPR admin {0} is executing command {1}
-error_adding_translator=Error loading the Translator {0}. Execution Factory class is not valid class or not defined.
-TEIID50057={0} Failed to load module "{1}"
+admin_executing=CLI admin {0} is executing command {1}
+TEIID50008=Error loading the Translator {0}. Execution Factory class is not valid class or not defined.
+TEIID50057=Failed to load module "{0}"
+TEIID50068=Failed to load module "{0}"
translator.add=Add Translator
translator.remove=Remove Translator
-protocol_not_found=protocol is not defined for the transport configuration.
TEIID50011=Security enabled for transport "{1}" with security-domain set to {0}
-DQPCore.unable_to_process_event=Unable to process event.
TEIID50006 = Teiid translator "{0}" added.
TEIID50013=Wrong type of protocol supplied
socket_binding_not_defined=Socket binding not specified for transport {0}; only embedded access is granted.
-vdb-undeploy-failed=error during the undeploy of vdb {0}.{1}
-error_adding_translator_deployment=Error adding translator from deployment {0}
-cache_not_found=Cache Type {0} not found in the configuration
-failed_to_process_vdb_archive= failed to process VDB archive {0}
+TEIID50070=Error adding translator from deployment {0}
+TEIID50071=Cache Type {0} not found in the configuration
+TEIID50018= failed to process VDB archive {0}
TEIID50023=replication failed {0}
TEIID50024=Failed to load metadata for VDB {0}.{1}
TEIID50044=Failed to save metadata for VDB {0}.{1} for model {2}
@@ -88,12 +68,18 @@
TEIID50030=VDB {0}.{1} model "{2}" metadata loaded. End Time: {3}
TEIID50036=VDB {0}.{1} model "{2}" metadata failed to load. Reason:{3}
TEIID50042=error setting state {0}
-duplicate_source_name={3} Source names are not unique for model {0} in {1}.{2}
-source_name_mismatch={3} There are different sources with the name {0} in {1}.{2}
+TEIID50033=Source names are not unique for model {0} in {1}.{2}
+TEIID50034=There are different sources with the name {0} in {1}.{2}
TEIID50043=Invalid metadata file found at {0}; delete this file and restart server.
-failed_load_module= Failed to load module {0}
-failed_load_translator_module= {0} Failed to load module {1} for translator {2}
+TEIID50069=Failed to load module {0}
+TEIID50007=Failed to load module {1} for translator {2}
TEIID50088=Failed to load module {0} for UDF in VDB {1}.{2}:{3}
+TEIID50072=The username "{0}" and/or password and/or payload token could not be authenticated by any membership domain.
+TEIID50073 = Passthrough authentication failed. No authentication information found.
+TEIID50074=VDB has validity errors; failed to deploy - {0}
+TEIID50075=No "path" information found to load the FUNCTION model {0}; FUNCTION model must have path information.
+TEIID50076=For {0}.{1} VDB, recursive delegation {2} found.
+TEIID50077=The parent translator type "{0}" was not found in configuration "{1}"
# subsystem description
teiid.add = Add the Teiid Subsystem
@@ -202,7 +188,7 @@
engine_service_not_found= Query Engine Service with name {0} is not found
TEIID50010 = Translator "{0}" removed
-translator.failed-to-load = Translator "{0}" not found in the module "{1}"
+TEIID50009 = Translator "{0}" not found in the module "{1}"
cache-container-name-required=container-name required for the resultset cache configuration
enable.describe=enabled
Modified: trunk/runtime/src/main/java/org/teiid/deployers/UDFMetaData.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/UDFMetaData.java 2012-03-17 11:05:22 UTC (rev 3946)
+++ trunk/runtime/src/main/java/org/teiid/deployers/UDFMetaData.java 2012-03-19 15:53:55 UTC (rev 3947)
@@ -58,7 +58,7 @@
}
VirtualFile file =this.files.get(path);
if (file == null) {
- throw new IOException(RuntimePlugin.Util.getString("udf_model_not_found", name)); //$NON-NLS-1$
+ throw new IOException(RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40075, name));
}
List<FunctionMethod> udfMethods = FunctionMetadataReader.loadFunctionMethods(file.openStream());
ActivityReport<ReportItem> report = new ActivityReport<ReportItem>("UDF load"); //$NON-NLS-1$
Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2012-03-17 11:05:22 UTC (rev 3946)
+++ trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2012-03-19 15:53:55 UTC (rev 3947)
@@ -89,7 +89,7 @@
boolean dsReplaced = false;
if (!cm.getConnectionName().equals(dsName)){
vdb.setStatus(VDB.Status.INACTIVE);
- String msg = RuntimePlugin.Util.getString("datasource_replaced", vdb.getName(), vdb.getVersion(), model.getSourceTranslatorName(sourceName), dsName); //$NON-NLS-1$
+ String msg = RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40076, vdb.getName(), vdb.getVersion(), model.getSourceTranslatorName(sourceName), dsName); //$NON-NLS-1$
model.addError(ModelMetaData.ValidationError.Severity.ERROR.name(), msg);
cm = new ConnectorManager(translatorName, dsName);
cm.setExecutionFactory(ef);
Modified: trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2012-03-17 11:05:22 UTC (rev 3946)
+++ trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2012-03-19 15:53:55 UTC (rev 3947)
@@ -282,7 +282,7 @@
private void cursorFetch(String cursorName, int rows, final ResultsFuture<Integer> completion) throws SQLException {
Cursor cursor = this.cursorMap.get(cursorName);
if (cursor == null) {
- throw new SQLException(RuntimePlugin.Util.getString("not_bound", cursorName)); //$NON-NLS-1$
+ throw new SQLException(RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40078, cursorName));
}
cursor.fetchSize = rows;
ResultsFuture<Integer> result = new ResultsFuture<Integer>();
@@ -312,7 +312,7 @@
Cursor cursor = this.cursorMap.get(prepareName);
if (cursor == null) {
- throw new SQLException(RuntimePlugin.Util.getString("not_bound", prepareName)); //$NON-NLS-1$
+ throw new SQLException(RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40078, prepareName));
}
ResultsFuture<Integer> result = new ResultsFuture<Integer>();
this.client.sendMoveCursor(cursor.rs, rows, result);
@@ -415,7 +415,7 @@
Prepared previous = this.preparedMap.get(prepareName);
if (previous == null) {
- errorOccurred(RuntimePlugin.Util.getString("bad_binding", prepareName)); //$NON-NLS-1$
+ errorOccurred(RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40077, prepareName));
return;
}
@@ -459,7 +459,7 @@
final Portal query = this.portalMap.get(bindName);
if (query == null) {
- errorOccurred(RuntimePlugin.Util.getString("not_bound", bindName)); //$NON-NLS-1$
+ errorOccurred(RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40078, bindName));
return;
}
@@ -672,7 +672,7 @@
}
Prepared query = this.preparedMap.get(prepareName);
if (query == null) {
- errorOccurred(RuntimePlugin.Util.getString("no_stmt_found", prepareName)); //$NON-NLS-1$
+ errorOccurred(RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40079, prepareName));
}
else {
try {
@@ -712,7 +712,7 @@
}
Portal query = this.portalMap.get(bindName);
if (query == null) {
- errorOccurred(RuntimePlugin.Util.getString("not_bound", bindName)); //$NON-NLS-1$
+ errorOccurred(RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40078, bindName));
}
else {
try {
@@ -761,7 +761,7 @@
}
Portal query = this.portalMap.remove(bindName);
if (query == null) {
- errorOccurred(RuntimePlugin.Util.getString("not_bound", bindName)); //$NON-NLS-1$
+ errorOccurred(RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40078, bindName));
}
else {
try {
@@ -786,7 +786,7 @@
}
Prepared query = this.preparedMap.remove(preparedName);
if (query == null) {
- errorOccurred(RuntimePlugin.Util.getString("no_stmt_found", preparedName)); //$NON-NLS-1$
+ errorOccurred(RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40079, preparedName));
}
else {
// Close all the bound messages off of this prepared
@@ -797,7 +797,7 @@
query.stmt.close();
this.client.statementClosed();
} catch (SQLException e) {
- errorOccurred(RuntimePlugin.Util.getString("error_closing_stmt", preparedName)); //$NON-NLS-1$
+ errorOccurred(RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40080, preparedName));
}
}
}
@@ -841,7 +841,7 @@
@Override
public void functionCall(int oid) {
- errorOccurred(RuntimePlugin.Util.getString("lo_not_supported")); //$NON-NLS-1$
+ errorOccurred(RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40081));
}
@Override
Modified: trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java 2012-03-17 11:05:22 UTC (rev 3946)
+++ trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java 2012-03-19 15:53:55 UTC (rev 3947)
@@ -104,6 +104,15 @@
TEIID40070,
TEIID40071,
TEIID40072,
- TEIID40073
+ TEIID40073,
+ TEIID40074,
+ TEIID40075,
+ TEIID40076,
+ TEIID40077,
+ TEIID40078,
+ TEIID40079,
+ TEIID40080,
+ TEIID40081,
+ TEIID40082,
}
}
Modified: trunk/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java 2012-03-17 11:05:22 UTC (rev 3946)
+++ trunk/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java 2012-03-19 15:53:55 UTC (rev 3947)
@@ -96,7 +96,7 @@
public Object invoke(Object arg0, final Method arg1, final Object[] arg2) throws Throwable {
if (shutdown) {
- throw ExceptionUtil.convertException(arg1, new TeiidComponentException(RuntimePlugin.Util.getString("LocalTransportHandler.Transport_shutdown"))); //$NON-NLS-1$
+ throw ExceptionUtil.convertException(arg1, new TeiidComponentException(RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40074)));
}
try {
if (passthrough && !arg1.getDeclaringClass().equals(ILogon.class)) {
Modified: trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java 2012-03-17 11:05:22 UTC (rev 3946)
+++ trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java 2012-03-19 15:53:55 UTC (rev 3947)
@@ -86,7 +86,7 @@
result.setUseClientMode(false);
if (ANONYMOUS.equals(authenticationMode)) {
if (!(Arrays.asList(result.getSupportedCipherSuites()).contains(SocketUtil.ANON_CIPHER_SUITE))) {
- throw new GeneralSecurityException(RuntimePlugin.Util.getString("SSLConfiguration.no_anonymous")); //$NON-NLS-1$
+ throw new GeneralSecurityException(RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40082));
}
result.setEnabledCipherSuites(new String[] {SocketUtil.ANON_CIPHER_SUITE});
} else {
Modified: trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties
===================================================================
--- trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2012-03-17 11:05:22 UTC (rev 3946)
+++ trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2012-03-19 15:53:55 UTC (rev 3947)
@@ -20,11 +20,8 @@
# 02110-1301 USA.
#
-
-
TEIID40040=Failed initializing buffer manager.
TEIID40039=Failed initializing buffer manager.
-
TEIID40046=VDB \"{0}\" version \"{1}\" does not exist.
TEIID40047=VDB \"{0}\" version \"{1}\" is not in the "active" status.
TEIID40048=VDB \"{0}\" version \"{1}\" is not accepting connections.
@@ -35,66 +32,43 @@
TEIID40043=The server has reached the maximum number of sessions of {0} as defined by the property "session-max-limit". If more sessions are required, modify this property value in the "standalone-teiid.xml" file.
TEIID40008 = Expiring session {0}
TEIID40007 = Keepalive failed for session {0}
-SessionServiceImpl.The_username_0_and/or_password_are_incorrect=The username "{0}" and/or password and/or payload token could not be authenticated by any membership domain.
TEIID40009 = Admin [{0}] is terminating this session: {1}.
-
-no_passthrough_identity_found = Passthrough authentication failed. No authentication information found.
-
-
TEIID40017=Unexpected exception for session {0}
TEIID40011=Processing exception ''{0}'' for session {1}. Exception type {2} thrown from {3}. Enable more detailed logging to see the entire stacktrace.
TEIID40070=Only {0} connections are allowed on this port. Component not found: {1}
SocketTransport.1=Bound to address {0} listening on port {1}
-LocalTransportHandler.Transport_shutdown=Transport has been shutdown.
+TEIID40074=Transport has been shutdown.
TEIID40052=Invalid session key used during handshake
SSLAwareChannelHandler.channel_closed=Channel closed
TEIID40065=Failed to resolve the bind address
TEIID40066=Failed to resolve the bind address
-
TEIID40003=VDB {0}.{1} is set to "active"
TEIID40006=VDB {0}.{1} is set to "inactive"
-validity_errors_in_vdb={0} VDB has validity errors; failed to deploy - {1}
-
-vdb_delete_failed=Failed to delete the cached metadata files due to:
-
-
TEIID40036=System.vdb needs to be loaded before any other VDBs.
-fail_to_deploy="{0}" Can not be active because model "{1}" is not fully configured.
-
-
-udf_model_not_found=User Defined Function (UDF) model "{0}" not found in the VDB
+TEIID40075=User Defined Function (UDF) model "{0}" not found in the VDB
TEIID40035=VDB with given name and version already exists! {0}.{1}
TEIID40021=System.vdb not found in classpath
-invalid_udf_file=No "path" information found to load the FUNCTION model {0}; FUNCTION model must have path information.
TEIID40037=VDB {0}.{1} not found deployed.
TEIID40038=VDB {0}.{1} not found deployed.
TEIID40005=For {0}.{1} VDB, Translator "{2}" not found.
-recursive_delegation=For {0}.{1} VDB, recursive delegation {2} found.
TEIID40012=For {0}.{1} VDB, Data Source "{2}" not found.
-datasource_replaced=For {0}.{1} VDB, Data Source "{2}" replaced with "{3}"
-vdb_inactivated={0}.{1} status has been changed to inactive. Check the required translators and data sources!
-translator_added=Teiid translator "{0}" has been added.
+TEIID40076=For {0}.{1} VDB, Data Source "{2}" replaced with "{3}"
TEIID40024={0} invalid type of class specified. Must be of type org.teiid.connector.api.Connector
-class_not_found=Class {0} not found.
-translator_removed=Teiid translator "{0}" removed.
TEIID40028=No {0} method found for translator property {1}
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 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}
-no_stmt_found=No prepared statement found with name {0}
-error_closing_stmt=Error closing portal statement {0}
-model_metadata_loading=VDB {0}.{1} model {2} metadata is currently being loaded. Start Time: {3}
+TEIID40077=Binding on a statement, that has not been prepared:{0}
+TEIID40078=No bound statement found with name {0}
+TEIID40079=No prepared statement found with name {0}
+TEIID40080=Error closing portal statement {0}
TEIID40044=Ambiguous VDB name specified. Only single occurrence of the "." is allowed in the VDB name. Also, when version based vdb name is specified, then a separate "version" connection option is not allowed:{0}.{1}
-lo_not_supported=LO functions are not supported
-SSLConfiguration.no_anonymous=The anonymous cipher suite TLS_DH_anon_WITH_AES_128_CBC_SHA is not available. Please change the transport to be non-SSL or use non-anonymous SSL.
+TEIID40081=LO functions are not supported
+TEIID40082=The anonymous cipher suite TLS_DH_anon_WITH_AES_128_CBC_SHA is not available. Please change the transport to be non-SSL or use non-anonymous SSL.
TEIID40016=Could not initialize ODBC SSL. non-SSL connections will still be allowed.
@@ -106,7 +80,6 @@
TEIID40059=No security domain configured for Kerberos authentication. Can not authenticate.
TEIID40054=GSS authentication is in use, however authenticated user not found in the context to proceed.
auth_type=Authentication Type set to {0} for security-domains {1}
-replication_failed=replication failed to {0}
TEIID40014=Kerberos context login failed
TEIID40018=Exception terminitating session
TEIID40020=Error occurred
More information about the teiid-commits
mailing list