teiid SVN: r2537 - in branches/7.1.x: client/src/main/resources/org/teiid/jdbc and 12 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-09-07 18:20:04 -0400 (Tue, 07 Sep 2010)
New Revision: 2537
Modified:
branches/7.1.x/api/src/main/resources/org/teiid/connector/i18n.properties
branches/7.1.x/client/src/main/resources/org/teiid/jdbc/i18n.properties
branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties
branches/7.1.x/common-core/src/main/resources/org/teiid/core/i18n.properties
branches/7.1.x/connectors/connector-ldap/src/main/resources/org/teiid/resource/adapter/ldap/i18n.properties
branches/7.1.x/connectors/sandbox/translator-yahoo/src/main/resources/org/teiid/translator/yahoo/i18n.properties
branches/7.1.x/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties
branches/7.1.x/connectors/translator-ldap/src/main/resources/org/teiid/translator/ldap/i18n.properties
branches/7.1.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/QueryExecutionImpl.java
branches/7.1.x/connectors/translator-salesforce/src/main/resources/org/teiid/translator/salesforce/i18n.properties
branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties
branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties
branches/7.1.x/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties
branches/7.1.x/runtime/src/main/resources/org/teiid/runtime/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/api/src/main/resources/org/teiid/connector/i18n.properties
===================================================================
--- branches/7.1.x/api/src/main/resources/org/teiid/connector/i18n.properties 2010-09-07 19:22:48 UTC (rev 2536)
+++ branches/7.1.x/api/src/main/resources/org/teiid/connector/i18n.properties 2010-09-07 22:20:04 UTC (rev 2537)
@@ -20,52 +20,15 @@
# 02110-1301 USA.
#
-ConnectionPool.The_value__6=The value "{0}" is illegal for property "{1}".
-ConnectionPool.The_conn_value=The max connections property value must be greater than 0; {0} is invalid value.
-ConnectionPool.No_connection_pool_available._8=No connection pool is available.
-ConnectionPool.Timeout_while_waiting_to_obtain_connection_for__9=The connection pool for identity "{0}" is at the maximum connection count "{1}" and no connection became available in the timeout period. Consider increasing the number of connections allowed per identity or the wait time.
-ConnectionPool.Connection_pool_created_1=Connection pool created successfully
-ConnectionPool.Failed_close_a_connection__2=Failed to close a connection for {0}.
-ConnectionPool.Max_conn_reached=Connection pool reached maximum connection limit.
-ConnectionPool.Max_conn_per_id_reached=Connection pool reached maximum connection limit for an identifier pool.
-ConnectionPool.Shut_down=Shutting down connection pool: closing all connections.
-ConnectionPool.Removed_conn=Connection pool closed a connection for {0}.
-ConnectionPool.New_conn=Connection pool created a connection for {0}.
-ConnectionPool.ExceededConnections=The connection pool for identity "{0}" is at the maximum connection count "{1}" and no connection became available in the timeout period. Consider increasing the number of connections allowed per identity or the wait time.
-ConnectionPool.ExceededWait=The connection pool for identity "{0}" exceeded wait time for connection, "{1}" ms, and no connection became available in the timeout period. Consider increasing the number of connections allowed per identity or the wait time.
-ConnectionPool.Closed_conn=Connection pool closed a connection.
-ConnectionPool.Failed_close_conn=Failed to close a connection.
-ConnectionPool.Timeout_while_waiting_to_obtain_connection=Timeout while waiting to obtain a connection.
-CollectionVisitor.The_visitor_collection_must_contain_at_least_one_visitor._1=The visitor collection must contain at least one visitor.
-CollectionVisitor.All_the_objects_in_the_collection_must_be_LanguageObjectVisitors._2=All the objects in the collection must be LanguageObjectVisitors.
DelegatingHierarchyVisitor.The_pre-_and_post-processing_visitors_cannot_both_be_null._1=The pre- and post-processing visitors cannot both be null.
-CredentialMap.Null_input=Null credentials input string.
-CredentialMap.Empty_input=Empty credentials input string. Expected "(".
-CredentialMap.Missing_parens=Credentials input string must be enclosed in ()''s
-CredentialMap.Missing_system_prop=Credentials string must contain "system" property.
-BasicValueReference_error=Error occurred during creating the value chunk for the value reference object.
-BasicValueReference_walkbackerror=Walking the results backwards is not supported in this implementation of Value reference, Please provide a custom value reference implementation.
-JDBCTranslator.Retrieved_Blob_is_too_large_13=Retrieved Blob is too large, Blobs have a max size of {0} bytes.
-JDBCTranslator.Error_determining_blob_length___15=Error determining blob length: {0}
-JDBCTranslator.Retrieved_Clob_is_too_large__18=Retrieved Clob is too large, Clobs have a max size of {0}
-JDBCTranslator.Error_determining_clob_length___20=Error determining clob length: {0}
-ClobToStringTranslator.0=Unexpected value type in Clob to String translator: {0}
-JDBCTranslator.Unable_to_translate_data_value__11=Unable to translate data value from {0} to expected type {1}
-ValueTranslator.no_tranfrom_found=To Suitable transform found to convert {0} type value to {1}
-unknown_object_type_to_tranfrom_xml=Unknown object type supplied to transform into SQLXML.
-UserIdentityFactory.single_identity_not_supported=Single identity is not supported by the UserIdentityFactory. A context is required.
-UserIdentityFactory.extraction_error=Unable to extract credentials from command payload or trusted session payload for per-user connection.
-UserIdentityFactory.missing_credentials=Payload missing credentials for {0}
MetadataFactory.unknown_datatype=Unknown datatype {0}
MetadataFactory.no_column_found=No column found with name {0}
-MetadataFactory.duplicate_name="Non-uniquely named record detected ''{0}''
MetadataFactory.invalid_name=Invalid column name ''{0}'', cannot contain the . character.
-WrappedConnection.no_metadata=Connector is not capable of providing metadata. Extend connector with MetadataProvider interface
\ No newline at end of file
Modified: branches/7.1.x/client/src/main/resources/org/teiid/jdbc/i18n.properties
===================================================================
--- branches/7.1.x/client/src/main/resources/org/teiid/jdbc/i18n.properties 2010-09-07 19:22:48 UTC (rev 2536)
+++ branches/7.1.x/client/src/main/resources/org/teiid/jdbc/i18n.properties 2010-09-07 22:20:04 UTC (rev 2537)
@@ -1,4 +1,3 @@
-#
# JBoss, Home of Professional Open Source.
# See the COPYRIGHT.txt file distributed with this work for information
# regarding copyright ownership. Some portions may be licensed
@@ -18,70 +17,38 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301 USA.
-#
# ==========================================
# Error Messages for the JDBC Package
# ==========================================
DataTypeTransformer.Err_converting=Unable to transform the column value {0} to a {1}.
-DataTypeTransformer.Runtime_err_converting=Unable to transform {0} to a {1} value: {2}.
-DataTypeTransformer.Err_converting_boolean=Unable to transform the column value {0} to Boolean. Expected 0 or 1.
-DataTypeTransformer.Err_converting_date=Failed to transform String to Date. Expected format = yyyy-mm-dd for {0}.
-DataTypeTransformer.Err_converting_time=Failed to transform String to Time. Expected format = hh:mm:ss for {0}.
-DataTypeTransformer.Err_converting_timestamp=Failed to transform String to Timestamp. Expected format = yyyy-mm-dd hh:mm:ss.fffffffff for {0}.
JDBC.Method_not_supported=This method is not supported.
-MMCallableStatement.Unable_to_transform=The parameter value {0} could not be transformed into a {1} value.
-MMCallableStatement.SQL3_types_not_supported=SQL3 data types are not supported.
MMPreparedStatement.Err_transform_obj=Unable to transform the object into the target JDBC type.
MMCallableStatement.Param_not_found=Parameter is not found at index {0}.
-MMCallableStatement.parse_error=Parsing error: The required escape syntax is {[?=]call procedure_name[(?,?,...)]}
-MMConnection.Err_closing_conn=Error trying to close connection.
MMConnection.Err_closing_stmts=Error trying to close statements on this connection.
-MMConnection.Err_committing=Unable to commit the current transaction: {0}.
-MMConnection.Err_rollingback=Error while trying to roll back the transaction: {0}.
MMConnection.Cant_use_closed_connection=Cannot perform operations on a closed connection.
MMConnection.Scrollable_type_not_supported=Scrollable type {0} is not supported.
MMConnection.Concurrency_type_not_supported=Concurrency type {0} is not supported.
MMConnection.SQL_cannot_be_null=SQL cannot be null for CallableStatement or PreparedStatement.
MMDatabaseMetadata.Err_getting_primary_keys=Error trying to get metadata information about primary/foreign keys.
-MMDataSource.Cant_load_driver=Unable to load JDBC driver - check class path for jar files.
MMDataSource.Err_connecting=Error while connecting: {0}.
-MMDataSource.Err_creating_XAConn=JDBC XADataSource failed to create XAConnection: {0}
-MMDriver.Invalid_log_name=Invalid file name for the log file : {0}
MMPreparedStatement.Err_prep_sql=Error preparing sql for MMPreparedStatement as the sql is null.
MMPreparedStatement.Invalid_param_index=The index of a parameter must be a positive integer.
-MMPreparedStatement.No_param_value=No value is set for parameter {0}.
MMResultSet.Cant_call_closed_resultset=Error trying to operate on a closed ResultSet object.
-MMResultSet.cannot_convert_to_character_stream=Cannot convert to character stream
MMResultSet.cannot_convert_to_binary_stream=Cannot convert to binary stream
-MMStatement.Err_getting_update_row=Unable to get the current row in this ResultSet.
MMStatement.Error_executing_stmt=Error trying to execute a statement {0}.
-ResultsImpl.Metadata_null=ResultSetMetadata shouldn''t be null.
-MMStatement.Timeout_before_execute=Request timed out before it could execute, change the timeout value and re-execute the request.
MMStatement.Cancel_before_execute=Request was canceled before it could finish executing.
MMStatement.Invalid_fetch_size=Fetch size should always be a value of 0 <= fetch size <= max rows.
-MMStatement.Invalid_feild_size=Field size should be >= 0.
-MMStatement.Err_start_auto_txn=Failed automatically creating a transaction for request {0}.
-MMStatement.Err_end_auto_txn=Failed ending automatically started transaction.
-MMStatement.Cancel_before_complete=Statement was canceled before operation completed.
MMStatement.Timeout_before_complete=Operation timed out before completion.
-MMStatement.Stmt_closed_before_complete=Statement was closed before operation completed.
-ResultsImpl.Fwd_only=This method cannot be called on a TYPE_FORWARD_ONLY resultSet.
-CursorResultsImpl.Moving_back_on_fwd_only=Unable to move back on a TYPE_FORWARD_ONLY resultSet.
MMResultsImpl.Col_doesnt_exist=Column name "{0}" does not exist.
ResultsImpl.Op_invalid_fwd_only=This operation cannot be executed on TYPE_FORWARD_ONLY ResultSets.
-ResultsImpl.Null_results=Unable to execute this operation because the results are null.
ResultsImpl.Invalid_col_index=Column index {0} is invalid. Index must be >= 0 and <= column count.
-ResultsImpl.Cant_check_method=Cannot check {0} - no results are available.
-CursorResultsImpl.Exception_during_processing=Exception occured during results processing. Use getException() for a more detailed exception and information.
MMConnection.Session_success=Successfully obtained a session.
MMConnection.Connection_close_success=Connection successfully closed.
MMConnection.Err_connection_close=Error trying to close driver connection: {0}
MMConnection.Commit_success=Successfully committed transactions on all open statements on this connection.
-MMConnection.Commit_failed=Unable to commit the present transaction: {0}.
MMConnection.Rollback_success=Successfully rolled back transactions on all open statements on this connection.
-MMConnection.Rollback_failed=Unable to rollback the present transaction: {0}.
MMDatabaseMetadata.Best_row_sucess=Successfully obtained best row identifier information for the table {0}.
MMDatabaseMetadata.Catalog_success=Catalog metadata info successfully obtained for this connection.
MMDatabaseMetadata.getCols_error=Error trying to get metadata info for the columns that match {0} present in the tables that match {1} - {2}.
@@ -105,66 +72,27 @@
MMDatabaseMetadata.getTable_error=Error trying to obtain metadata information for the tables that match {0}: {1}.
MMDatabaseMetadata.getTable_success=Successfully obtained metadata information for the table names that match {0}.
MMDatabaseMetadata.getTableType_success=Successfully obtained metadata information for the table types.
-MMDatabaseMetadata.getTypes_error=Error trying to obtain metadata information for supported data types {0}.
MMDatabaseMetadata.getTypes_success=Successfully obtained metadata info for supported data types.
-MMDatabaseMetadata.getUserDefTypes_error=Error trying to obtain metadata information for supported user defined data types: {0}.
-MMDatabaseMetadata.getUserDefTypes_success=Successfully obtained metadata info for supported user defined data types.
MMDatabaseMetadata.getVersionCols_success=Successfully obtained version column information for this connection.
MMDatabaseMetadata.getIndex_error=Error trying to get metadata information for indexes present on the table {0} - {1}.
-MMDatabaseMetadata.getModels_error=Error trying to get metadata information for models that match {0} - {1}.
MMDriver.Err_registering=JDBC driver could not be registered with the DriverManager: {0}.
MMDriver.urlFormat=The required url format is jdbc:teiid:VDBName@mm[s]://server1:port1[,server2:port2][;optional properties]
JDBCDriver.Connection_sucess=The JDBC Driver successfully obtained a connection.
-MMDriver.Err_init_appinfo=Could not initialize ApplicationInfo (Version number): {0}.
MMStatement.Close_stmt_success=Statement closed successfully.
MMStatement.Stmt_closed=Unable to perform operations on an already closed statement.
-MMStatement.Invalid_query_type= Invalid query type, the query {0} cannot be executed.
-MMStatement.Err_query=Error trying to execute a query statement {0}: {1}
MMStatement.Success_query=Successfully executed a query {0} and obtained results
-MMStatement.Err_update=Error trying to execute an Update statement {0}: {1}
-MMStatement.Success_update= Successfully executed an update {0}.
MMStatement.Invalid_field_size=Invalid MaxFieldSize {0}
-MMBlob.Unable_to_get_bytes_from_pos_to_length._{0}_1=Unable to get bytes from pos to length. {0}
-MMBlob.Unable_to_get_the_position_for_the_byte_array._{0}_2=Unable to get the position for the byte array. {0}
-MMClob.Unable_to_get_chars_from_pos_to_length._{0}_1=Unable to get chars from pos to length. {0}
-MMClob.Unable_to_get_the_position_of___{0}__._{1}_2=Unable to get the position of ''{0}''. {1}
-MMDataSource.Credentials_string_must_begin_with_(=Credentials string must begin with ''('' and end with '')''
MMDataSource.Port_number_must_be_positive=The port number must be a positive number
MMDataSource.serverPort_must_be_a_number=The serverPort property must be a number.
MMDataSource.Server_name_required=The server name must be specified
MMDataSource.Invalid_trans_auto_wrap_mode=The transaction auto-wrap setting must be one of \"{0}\", \"{1}\", or \"{2}\".
-MMDataSource.Name_value_pair_missing_name=The name-value pair \"{0}\" is missing a name
-MMDataSource.Name_value_pair_missing_value=The name-value pair \"{0}\" is missing a value
-MMDataSource.Name_value_pair_used=There name-value pair \"{0}\" has the same name as a previous pair in the same credential specification
-MMDataSource.Missing_system_property=Missing ''system'' property in credential specification "{0}"
MMDataSource.Sockets_per_vm_invalid=The property socketsPerVM must be a positive number.
MMDataSource.Sticky_connections_invalid=The property stickyConnections must be boolean.
MMDataSource.Alternate_Servers_format=The format for the alternateServers property is <server2>[:<port2>][,<server3>[:<port3>],...].
MMDataSource.alternateServer_is_invalid=The alternateServers property contains the following {0} error(s): {1}
-MMStatement.Unable_to_communicate_with_server_13=Unable to communicate with server
-MMStatement.Unable_to_communicate_with_server_16=Unable to communicate with server
-StreamImpl._Unable_to_initialize_the_stream_implementation_and_get_the_first_chunk_of_stream.__{0}_1=\ Unable to initialize the stream implementation and get the first chunk of stream. {0}
-StreamImpl._Unable_to_operate_on_already_closed_stream._2=\ Unable to operate on already closed stream.
StreamImpl.Unable_to_read_data_from_stream=Unable to read data from the stream: {0}
-StreamImpl.Unable_to_get_stream_length=Unable to get value chunk for valueID: {0}
-StoredProcedureCall.whitespace_in_name=The procedure name contains whitespace
-LocalTransportHandler.Failed_to_initialize_factory_1=Failed to initialize factory
-LocalTransportHandler.Invalid_config_file_extension=Invalid configuration file extension: {0}.
-LocalTransportHandler.No_configuration_file_set_in_property=No configuration file set in property: \"{0}\"
LocalTransportHandler.Transport_shutdown=Tranport has been shutdown.
-LocalTransportHandler.session_inactive=execution denied; The session is in-active.
-MultiTransportFactory.Invalid_transport__{0}_1=Invalid transport: {0}
-MultiTransportFactory.Unable_to_find_transport_handler_class__{0}_2=Unable to find transport handler class: {0}
-MultiTransportFactory.Unable_to_instantiate_transport_handler_class,_likely_because_the_class_is_an_interface_or_abstract_class__{0}_3=Unable to instantiate transport handler class, likely because the class is an interface or abstract class: {0}
-MultiTransportFactory.Not_able_to_construct_transport_handler_class_due_to_security_restrictions__{0}_4=Not able to construct transport handler class due to security restrictions: {0}
-MultiTransportFactory.Transport_handler_class_does_not_implement_TransportHandler_interface__{0}_5=Transport handler class does not implement TransportHandler interface: {0}
-MMStatement.Time_out_for_current_request_with_ID___1=Time out for current request with ID:
-MMStatement.Request_is_cancelled_for___3=Request is cancelled for:
-MMStatement.Time_out_happened__n_1=Time out happened:
-MMStatement.Statement_is_cancelled__n_2=Statement is cancelled:
-MMStatement.Operation_Not_Supported=Update/Insert/Delete operation is not supported on read only connection state.(SQL: {0}).
MMStatement.Invalid_During_Transaction=Call to method {0} not valid during a transaction.
-MMStatement.Starting_transaction=Starting a transaction for this connection: {0}
StoredProcedureResultsImpl.ResultSet_cursor_is_after_the_last_row._1=ResultSet cursor is after the last row.
StoredProcedureResultsImpl.Invalid_parameter_index__{0}_2=Invalid parameter index: {0}
ResultsImpl.The_cursor_is_not_on_a_valid_row._1=The cursor is not on a valid row.
@@ -175,81 +103,28 @@
MMXAResource.FailedForgetTXN=Failed forgetting back transaction for xid "{0}".
MMXAResource.FailedEndTXN=Failed ending transaction for xid "{0}" with flag "{1}".
MMXAResource.FailedCommitTXN=Failed comitting transaction for xid "{0}" with flag "{1}".
-MMXAResource.FailedSetTXNTimeout=Failed setting timeout to "{0}". Default timeout will be used.
MMXAResource.FailedISSameRM=Failed determining isSameRM
MMXAConnection.connection_is_closed=Connection is closed and can not be reused.
-StaticMetadataProvider.No_metadata=No metadata is defined
StaticMetadataProvider.Invalid_column=Invalid column index: {0}
-StoredProcedureCall.unnecessary_paren=Unnecessary '')'' after procedure name
-StoredProcedureCall.unexpected_tokens=Unexpected token(s) between '')'' and ''}''
-ResultsMetadataWithProvider.No_provider=Unable to retrieve metadata as no metadata provider has been set.
DeferredMetadataProvider.Invalid_data=Invalid data for DeferredMetadataProvider: {0}, {1}
-MMStatement.Automatic_transaction_wrapping_failed._1=Automatic transaction wrapping failed.
FilteredResultsMetadata.Invalid_index=Invalid column index: {0}
-UserTransactionProxy.Received_exception_when_begining_transaction=Received exception when begining transaction.
-UserTransactionProxy.Received_exception_when_committing_transaction=Received exception when committing transaction.
-UserTransactionProxy.Received_exception_when_rolling_back_transaction=Received exception when rolling back transaction.
-UserTransactionProxy.Received_exception_when_setting_transaction_to_rollback_only=Received exception when setting transaction to rollback only.
-UserTransactionProxy.Received_exception_when_getting_transaction_status=Received exception when getting transaction status.
-UserTransactionProxy.Not_involved_in_transaction=Not involved in transaction.
-UserTransactionProxy.Unknown_msg_type=Unable to determine returned message type {0}
-TransactionHelper.Unable_to_check_for_required_transaction=Unable to check for required transaction.
-MMStatement.Autowrapping_request_in_transaction=Autowrapping request in transaction.
MMStatement.Timeout_ocurred_in_Statement.=Timeout ocurred in Statement.
MMStatement.Error_timing_out.=Error timing out.
MMStatement.Bad_timeout_value=Invalid timeout value supplied. Valid range is greater than or equal to zero.
-MMStatement.no_result_set=Statement does not return a result set.
-MMCallableStatement.Timeout_ocurred_in_CallableStatement.=Timeout ocurred in CallableStatement.
-MMPreparedStatement.Timeout_ocurred_in_PreparedStatement.=Timeout ocurred in PreparedStatement.
WarningUtil.Failures_occurred=Partial results failures occurred
-DQPAdminImpl.DQP_restarted=DQP already restarted.
-DataTypeTransformer.char_transform_failed=Unable to transform the parameter value {0} to a Character: {1}
DataTypeTransformer.blob_too_big=The blob value is too large for the max supported length of 2147483647 bytes
DataTypeTransformer.cannot_get_bytes=Cannot convert this value to a byte array.
-EmbeddedConnectionFactory.NoClassDefFoundError=Unable to find the following class definition: {0}
-EmbeddedConnectionFactoryImpl.connection_limit=Reached license limit of {0} connections.
-EmbeddedConnectionFactoryImpl.no_product_license=Could not find a license for the embedded query product.
-EmbeddedConnectionFactory.vdb_notactive=Failed to create connection to VDB \"{0}\" with version \"{1}\", because this VDB status is not \"active\"
-EmbeddedConnectionFactory.vdb_notavailable=Failed to create connection to newest version of VDB \"{0}\". The VDB is not active or does not exist.
-EmbeddedConnection.DQP_shutDown=Embedded service has been shutdown, restart by connecting again.
-EmbeddedConnection.txn_notsupported=Transaction support is currently not available in the EmbeddedDriver
-MMDriver.Log_level_invalid=Invalid logging level, valid logging levels are {0}, {1}, {2}, {3}.
-BatchResults.Invalid_Batch=Invalid batch: begin row "{0}", end row "{1}"
-StoredProcedureCall.curlies=The escape syntax must start with ''{'' and end with ''}''
-StoredProcedureCall.equals=Expected ''='' after ''?''
-StoredProcedureCall.call=Could not find the CALL keyword
-StoredProcedureCall.no_whitespace=Expected whitespace after the CALL keyword
-StoredProcedureCall.procname=Expected a procedure name
WrapperImpl.wrong_class=Wrapped object is not an instance of {0}
-MMSQLXML.unsupported_source=Unsupported source class {0}
MMXAConnection.rolling_back=rolling back transaction.
MMXAConnection.rolling_back_error=Error while rolling back transaction.
MMDataSource.Virtual_database_name_must_be_specified=The virtual database name must be specified.
-MMDataSource.Log_level_invalid=Invalid logging level, valid logging levels are {0}, {1}, {2}, {3}.
MMDataSource.The_partial_mode_must_be_boolean._47=The partial mode must be boolean.
MMDataSource.The_fetch_size_must_be_greater_than_zero=The fetch size must be greater than zero.
-EmbeddedDataSource.Application_name_must_be_specified=The property ''applicationName'' must be specified.
-EmbeddedDataSource.Configuration_file_must_be_specified=The Embedded Service Bootstrap file must be specified.
EmbeddedDriver.URL_must_be_specified=The JDBC URL must be specified.
-EmbeddedDriver.Invalid_URL_format=The URL is invalid. Example: jdbc:teiid:<VDB Name>@<Path to embedded service configuration File>;key=value
-EmbeddedDriver.DQP_Application_Name_Undefined=This Application Name {0} does not exist. Please use a valid Application Name.
-EmbeddedDriver.DQP_ConfigFile_Name_Already_In_Use=This Embedded Service Bootstrap File {0} is already being used in conjunction with another Application Name. Application Names and Embedded Service Boostrap Files have a one to one relationship.
-EmbeddedDriver.MMDQP_DRIVER_could_not_be_registered=Embedded driver could not be registered with the DriverManager: {0}.
-EmbeddedDriver.use_existing_transport=Embedded driver is using the existing embedded service instance to create connection.
-EmbeddedDriver.use_new_transport=Embedded driver is creating a new embedded service instance for create connection.
-EmbeddedDriver.use_classpath=Embedded driver is using the following classpath to load the embedded service.
-EmbeddedDriver.use_properties=Embedded driver is using the following properties to load the embedded service.
-EmbeddedDriver.shutdown_sucessful=Shutdown request successful.
-EmbeddedDriver.shutdown_failure=Shutdown request failed.
-EmbeddedDataSource.Unable_to_load_MMDQP_Driver=Unable to load JDBC driver - check class path for jar files.
-EmbeddedDataSource.The_configFile_property_is_null=The configFile property is null.
-EmbeddedDataSource.The_configFile_does_not_exist_or_cant_be_read=The configFile does not exist or cannot be read.
-EmbeddedTransport.no_classpath=The Embedded Service Bootstrap does not contain a dqp.classpath property. Add the dqp.classpath property or specify unifiedClassLoader=true on the DQP JDBC URL.
-EmbeddedTransport.invalid_dqpproperties_path=The path {0} is invalid. Please check your file system and correct your JDBC URL.
StatementImpl.show_update_count=SHOW does not return an update count
-StatementImpl.set_result_set=SET does not return a result set.
\ No newline at end of file
+StatementImpl.set_result_set=SET does not return a result set.
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-07 19:22:48 UTC (rev 2536)
+++ branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties 2010-09-07 22:20:04 UTC (rev 2537)
@@ -20,9 +20,6 @@
# 02110-1301 USA.
#
-LocalClientConnection.No_listener_found_1=No listener found
-LocalServerConnection.client_shutdown=Client connection has been terminated by the server
-SessionToken.sessionid_null=The session ID may not be null
SessionToken.session_compare_null = Attempt to compare null to SessionToken.
TrustedSessionToken.token_null = The trusted token for a session token may not be null.
StreamImpl.Unable_to_read_data_from_stream=Unable to read data from the stream: {0}
@@ -31,39 +28,13 @@
LocalTransportHandler.Transport_shutdown=Tranport has been shutdown.
-AbstractServerConnection.Created=AbstractServerConnection created - session ID: {0}
-AbstractServerConnection.Shutdown=AbstractServerConnection shutdown - session ID: {0}
-AbstractServerConnection.Unable_to_find_resources_with_ResourceFinder_1=Unable to find resources to load Server Instances
-AbstractServerConnection.Lost_communication_with_server_-_shutting_down.=Lost communication with server - shutting down.
-AbstractServerConnection.Error_attempting_server_connection_shutdown.=Error attempting server connection shutdown.
-PlatformServerConnection.Unable_to_create_new_PlatformMessageReceiver_2=Unable to create new PlatformMessageReceiver
-PlatformServerConnection.Error_attempting_server_connection_shutdown.=Error attempting server connection shutdown.
-PlatformServerConnection.Cant_get_resource=Unable to obtain a remote resource of type {0}
-PlatformServerConnectionFactory.Missing_required_property=Missing required property:
-PlatformServerConnectionFactory.Error_encrypting_user_password=Error encrypting user password
-PlatformServerConnectionFactory.Error_communicating_with_app_server=Error communicating with app server
-PlatformServerConnectionFactory.Error_logging_on_to_MetaMatrix=Error logging on to Teiid: {0}
PlatformServerConnectionFactory.Unable_to_find_a_component_used_in_logging_on_to=Unable to find a component used authenticate on to Teiid
-PlatformServerConnectionFactory.Unable_to_get_a_PlatformServerConnection=Unable to get a PlatformServerConnection
-PlatformServerConnectionFactory.Error_comunicating_with_LogonAPI=Error communicating with LogonAPI
-PlatformServerConnectionFactory.JNDI_library_mismatch_plugin=Client library may not match server vendor or version for server {1}. Client code loaded from plugin: {2}, initial context factory: {0}.
-PlatformServerConnectionFactory.JNDI_library_mismatch=Client library may not match server vendor or version for server {1}. Client code loaded from: bootstrap class loader, initial context factory: {0}.
-RemoteResourceFinder.Invalid_user_session=Unable to find resources: invalid user session.
-RemoteResourceFinder.Unable_to_find_component=Unable to find resources: Unable to find component.
-RemoteResourceFinder.Error_communicating=Unable to find resources: Error communicating.
-ClientHeartbeat.Pinging_server_failed_after_{0}_retries.__Notifying_connection.=Pinging server failed after {0} retries. Notifying connection.
-PlatformMessageReceiver.Unable_to_receive_message_[{0}],_no_listeners_for_topic_[{1}]=Unable to receive message [{0}], no listeners for topic [{1}].
-ObjectSocket.write_on_closed_socket=Attempting to write to a closed socket.
-ObjectSocket.read_on_closed_socket=Attempting to read from a closed socket.
-ObjectSocket.eof=Reached end of input stream.
-ObjectSocket.peek_failed=Exception ''{0}'' while peeking a byte. Assuming end-of-stream.
-ConsoleConnectionFactory.established_connection=ConsoleConnectionFactory established a connection.
@@ -84,7 +55,6 @@
ERR.014.001.0110 = Unknown error while obtaining a reference to AdminAPI for user <{0}>
-SocketServerConnection.0=Connection refused: {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}
@@ -102,24 +72,11 @@
SocketServerInstancePool.No_valid_host_available=No valid host available. Attempted connections to: {0}
-AdminAuthorizationInterceptor.Admin_Session_not_valid=Unable to perform the action [{0}]. Unable to validate session.
-AdminAuthorizationInterceptor.Admin_Audit_request=Administrator [{0}], session [{1}] requesting access which requires role {2} to method [{3}].
-AdminAuthorizationInterceptor.Admin_not_authorized=Administrator [{0}], session [{1}] does not have any required role {2} so is not authorized to perform the action [{3}].
-AdminAuthorizationInterceptor.Admin_granted=Administrator [{0}], session [{1}] granted access to method [{3}].
-ClientConnectionImpl.ConnectionID=ClientConnectionImpl - connectionID: {0} message receiver: {1} properties: {2}
-ClientConnectionImpl.Send=ClientConnectionImpl.send - connectionID: {0} message key: {1} message {2}
-RemoteResourceImpl.Send_asynch=RemoteResourceImpl.send (asynch) - ClientID: {0} Message {1}
-RemoteResourceImpl.Send_synch=RemoteResourceImpl.send (synch) - ClientID: {0} Message {1}
-RemoteResourceImpl.Set_message_receiver=RemoteResourceImpl.setMessageReceiver - ClientID: {0} Message Receiver {1} Properties {2}
-SocketServerInstanceImpl.version_mismatch=Handshake failed due to version mismatch -- Client Version: {0}, Server Version: {1}
SocketServerInstanceImpl.handshake_error=Handshake error
-SocketServerInstanceImpl.handshake_timeout=Handshake timeout
-SocketServerInstanceImpl.secure_error_during_handshake=Unable to complete handshake with the server. Ensure that the server is using secure sockets.
-SocketServerInstanceImpl.error_during_handshake=Unable to complete handshake with the server. Ensure that the server is not using secure sockets.
SocketClientInstance.invalid_sessionkey=Invalid session key used during handshake
SSLAwareChannelHandler.channel_closed=Channel closed
Modified: branches/7.1.x/common-core/src/main/resources/org/teiid/core/i18n.properties
===================================================================
--- branches/7.1.x/common-core/src/main/resources/org/teiid/core/i18n.properties 2010-09-07 19:22:48 UTC (rev 2536)
+++ branches/7.1.x/common-core/src/main/resources/org/teiid/core/i18n.properties 2010-09-07 22:20:04 UTC (rev 2537)
@@ -20,39 +20,9 @@
# 02110-1301 USA.
#
-PluginUtilities.-consoleLog_11=-consoleLog
-PluginUtilities.Could_not_find___12=Could not find "
-PluginUtilities.__folder._13=" folder.
-PluginUtilities.Make_sure_the_executable_extension_class_contains_a_public_constructor_14=Make sure the executable extension class contains a public constructor
-PluginUtilities._with_no_arguments._15=\ with no arguments.
-PluginUtilities.One_of_the_other_PluginUtilities.getApplication_methods_must_first_be_called._16=One of the other PluginUtilities.getApplication methods must first be called.
-PluginUtilities.One_of_the_other_PluginUtilities.getApplication_methods_must_first_be_called._17=One of the other PluginUtilities.getApplication methods must first be called.
-PluginUtilities.The_installation_path_must_not_be_empty._18=The installation path must not be empty.
-Argument._must_not_be_empty._1=\ must not be empty.
-Argument._must_not_be_empty._2=\ must not be empty.
-Argument._must_not_be_empty._3=\ must not be empty.
-Argument._must_not_be_null._5=\ must not be null.
-RunnableState.Unknown_state_value___7=Unknown state value:
-RunnableState.Unable_to_change_the_state_to__8=Unable to change the state to
-RunnableState.Unable_to_change_the_state_from__9=Unable to change the state from
-RunnableState._to__10=\ to
-RunnableState.Unable_to_change_the_state_from__11=Unable to change the state from
-RunnableState._to__12=\ to
-RunnableState.Unable_to_change_the_state_from__13=Unable to change the state from
-RunnableState._to__14=\ to
-RunnableState.Unable_to_change_the_state_from__15=Unable to change the state from
-RunnableState._to__16=\ to
-RunnableState.Unable_to_change_the_state_from__17=Unable to change the state from
-RunnableState._to__18=\ to
-RunnableState.Unknown_state_value___19=Unknown state value:
-StreamPipe.The_output_stream_has_been_closed._1=The output stream has been closed.
-StreamPipe.The_input_stream_has_been_closed._2=The input stream has been closed.
PlatformLogger._NullLogEntry_exception = A null log entry was logged
SystemLogger._NullLogEntry_exception = A null log entry was logged
-PluginUtilImpl.Error_while_running=Error while executing runnable from plugin {0}
-Stopwatch.seconds=\ seconds
-Stopwatch.milliseconds=\ milliseconds
Stopwatch.Stopwatch_Statistics =Stopwatch Statistics:
Stopwatch.Statistics_Total =\ \ Total = {0}
Stopwatch.Statistics_Previous =\ \ Previous = {0}
@@ -78,43 +48,13 @@
ArgCheck.containsKey=Expected map to contain key, but it did not
ReflectionHelper.errorConstructing=Unable to create a ReflectionHelper instance with a null target class.
-ReflectionHelper.nullPointer=Unable to create class instance, the object class must be specified.
-ReflectionHelper.classNotFound=Unable to create class instance, {0} class not found
-ReflectionHelper.linkageError=Unable to link the object subclass {0}
-ReflectionHelper.instantiationError=Unable to instantiate the object subclass {0}
-ReflectionHelper.illegalAccess=Unable to access the the object subclass {0} or instance
-ReflectionHelper.exception=Unable to create subclass {0}
Assertion.Assertion_failed=Assertion failed.
Assertion.invalidClassMessage={0} must be an instance of {1}, but was an instance of {2}
-Assertion.isEqual=ASSERTION FAILED: expected values to be equal but they were different ({0} and {1})
-Assertion.isNotEqual=ASSERTION FAILED: expected values to be different but they were the same ({0} and {1})
-Assertion.isNonNegative=ASSERTION FAILED: expected value to be non-negative but value={0}
-Assertion.isNonPositive=ASSERTION FAILED: expected value to be non-positive but value={0}
-Assertion.isNegative=ASSERTION FAILED: expected value to be negative but value={0}
-Assertion.isPositive=ASSERTION FAILED: expected value to be positive but value={0}
-Assertion.isNotZeroLength=ASSERTION FAILED: expected string to have at least one character
Assertion.isNull=ASSERTION FAILED: expected reference to be null
Assertion.isNotNull=ASSERTION FAILED: expected reference to be not null
-Assertion.isIdentical=ASSERTION FAILED: expected objects to be identical ({0} and {1})
-Assertion.isEqual=ASSERTION FAILED: Objects are not equal: {0} and {1}
Assertion.invalidClassMessage=ASSERTION FAILED: The object {0} was expected to be an instance of {1} but was instance of {2}
-Assertion.isNotEmpty_Collection=ASSERTION FAILED: expected collection to not be empty, but it was
-Assertion.isNotEmpty_Map=ASSERTION FAILED: expected map to not be empty, but it was
-Assertion.contains_Collection=ASSERTION FAILED: expected collection to contain value, but it did not
-Assertion.contains_Map=ASSERTION FAILED: expected map to contain key, but it did not
-IDGenerator.The_preferred_factory_reference_may_not_be_null_1=The preferred factory reference may not be null
-IDGenerator.The_protocol_reference_may_not_be_null_2=The protocol reference may not be null
-IDGenerator.No_factory_for_the_specified_protocol_3=No factory for the specified protocol "{0}"
-IDGenerator.The_factory_reference_may_not_be_null_5=The factory reference may not be null
-IDGenerator.The_protocol_reference_may_not_be_null_6=The protocol reference may not be null
-IDGenerator.The_ObjectID_protocol_reference_may_not_be_null_7=The ObjectID protocol reference may not be null
IDGenerator.The_specified_ObjectID_protocol___8=The specified ObjectID protocol "{0}" is unknown
-IDGenerator.The_ObjectID_protocol_reference_may_not_be_null_10=The ObjectID protocol reference may not be null
-IDGenerator.The_specified_ObjectID_protocol___11=The specified ObjectID protocol "{0}" is unknown
-IDGenerator.The_ObjectID_reference_may_not_be_null_13=The ObjectID reference may not be null
-IDGenerator.The_stringified_ObjectID_may_not_be_null_14=The stringified ObjectID may not be null
-IDGenerator.The_stringified_ObjectID_does_not_have_a_protocol_15=The stringified ObjectID does not have a protocol
IDGenerator.The_stringified_ObjectID_has_an_unknown_protocol___16=The stringified ObjectID has an unknown protocol:
InvalidIDException.Invalid_ID_1=Invalid ID
IntegerIDFactory.The_specified_ID_value_is_invalid=The specified ID value "{0}" is invalid for the "{1}" protocol
@@ -122,20 +62,7 @@
UUID.ID_must_be_of_type_UUID_1=ID must be of type UUID
UUID.ID_must_be_of_type_UUID_to_parse_2=ID must be of type UUID to parse
-UUID.InvalidLengthForProtocol=The length of the specified ID value "{0}" is invalid for the "{1}" protocol
UUID.InvalidFormatForProtocol=The specified ID value "{0}" is invalid for the "{1}" protocol
-AbstractEventSource.The_event_listener_may_not_be_null=The event listener may not be null
-AbstractEventSource.The_event_class_may_not_be_null=The event class may not be null
-AsynchEventBroker.DefaultName=AsynchEventBroker
-SynchEventBroker.DefaultName=SynchEventBroker
-AbstractEventBroker.CannotAddSelfAsListener=An EventBroker cannot add itself to its list of listeners
-AbstractEventBroker.The_name_of_the_event_broker_may_not_be_null=The name of the event broker may not be null
-AbstractEventBroker.The_name_of_the_event_broker_may_not_be_zero-length=The name of the event broker may not be zero-length
-AbstractEventBroker.eventFloorExceeded=\ttime={0}\thandler={1}\n
-AbstractEventBroker.Error_during_event_processing=Error during processing of event in EventBroker \"{0}"
-AbstractEventBroker.basePerformanceMessage=\tTOTAL TIME={0}, TOTAL HANDLERS={1}, EVENT={2}, SOURCE={3}
-AbstractEventBroker.targetedPerformanceMessage=, TARGET={0}
-AbstractEventBroker.No_events_can_be_processed_EventBroker_is_shutdown=No events can be processed - EventBroker \"{0}\" is shutdown
IDGenerator.No_default_id_factory_has_been_defined=No default id factory has been defined
IntegerIDFactory.Description=An identifier that is composed of an integer value
LongIDFactory.Description=An identifier that is composed of an integer value
@@ -143,68 +70,16 @@
UUIDFactory.Description=An universally unique identifier that is composed of a 36-character formatted string.
ParsedObjectID.The_stringified_ObjectID_does_not_have_a_protocol=The stringified ObjectID does not have a protocol
ParsedObjectID.The_stringified_ObjectID_does_not_have_the_required_protocol_{0}=The stringified ObjectID does not have the required protocol {0}
-UUIDFactory.UUID_Initializer_thread_running=UUID Initializer thread running
-UUIDFactory.Instantiating_the_UUID_embedded_factory=Instantiating the UUID embedded factory
-UUIDFactory.UUID_Initializer_thread_notifying_all=UUID Initializer thread notifying all
-UUIDFactory.Attempting_to_create_UUID=Attempting to create UUID ...
-ClassLoaderUtil.Error_trying_to_load_file=Error trying to load file {0}
-ClassLoaderUtil.Error_trying_to_load_class_from_file=Error trying to load class {0} from {1}
-InterceptorStackImpl.New_Interceptor_may_not_be_null._1=New Interceptor may not be null.
-InterceptorStackImpl.Existing_Interceptor_may_not_be_null._2=Existing Interceptor may not be null.
-InterceptorStackImpl.not_same_interceptor=The interceptor does not match an interceptor already in the interceptor stack
-InterceptorStackImpl.Existing_firstInterceptor_must_already_exist_in_firstInterceptor_stack._7=Existing firstInterceptor must already exist in firstInterceptor stack.
-InterceptorStackImpl.Existing_interceptor_was_not_found_in_interceptor_stack._13=Existing interceptor was not found in interceptor stack.
-InterceptorStackImpl.Interceptor_stack_may_not_be_empty_14=Interceptor stack may not be empty
-InvocationImpl.Invocation_[__1=Invocation ["
-InvocationImpl.void_7=void
-DateUtil.The_string_is_not_of_the_expected_format_1=The string \" {0} \" is not of the expected format (\"{1}\")
-DateUtil.The_string_is_not_of_the_expected_format_2=The string \" {0} \" is not of the expected format (\"{1}\")
DebuggerImpl.conflictWarning = Debug context "{0}" is defined in both plugins "{1}" and "{2}"; context from plugin "{1}" will be ignored.
-DebuggerImpl.timerStart=TIMER STARTED | |ID = {0} | {1}
DebuggerImpl.timerStop =TIMER STOPPED | TIME={1} ms |ID = {0} | {2}
-DebuggerImpl.timerNotFound=***Timer not found***
ObjectConverterUtil.Error_translating_results_from_data_type_to_a_byte[]._1=Error translating results from data type {0} to a byte[].
ObjectConverterUtil.Error_translating_results_from_data_type_to_a_byte[]._2=Error translating results from data type {0} to a byte[].
ObjectConverterUtil.Object_type_not_supported_for_object_conversion._3=Object type {0} not supported for object conversion.
-ObjectConverterUtil.File_is_not_found_4=File {0} is not found
-ObjectConverterUtil.DEBUG.Converting_Blob_to_byte[];_size_is_1=Converting Blob to byte[]; size is {0}
FileUtils.File_does_not_exist._1=File {0} does not exist.
FileUtils.Not_a_directory=\"{0}\" is not a directory.
-SqlResourceBundle.unable_to_find_bundle=Unable to find SQL bundle with name {0} and language {1}
MetaMatrixRuntimeException.Caused_by=Caused by:
-InterceptorStackImpl.Interceptor_array_cannot_be_empty_1=Interceptor array cannot be empty.
-ServiceInvocation.Method_not_found_{0}.{1}=Method not found {0}.{1}
-Command.Could_not_find_method=Could not find method ''{0}.{1}''.
-Command.Argument_count_mis-match,_expected_{0}_but_received_{1}=Argument count mis-match, expected {0} but received {1}.
-Command.Error_processing_file=Error processing file: ''{0}''.
-Command.Cannot_convert_to=Cannot convert to {0}
-CommandShell.Started=Started
-CommandShell.Finished=Finished
-CommandShell.Executing=Executing: {0}
-ScriptReader.Call_goto_first=Must call gotoTest() first.
-ScriptReader.Could_not_find_test_{0}=Could not find test: ''{0}''.
-ReflectionWrapper.Could_not_find_field_{0}.{1}=Could not find field ''{0}.{1}''.
-ComponentLoader.Resource_not_found__{0}_1=Resource not found: {0}.
-SqlResourceBundle.The_name_of_the_DBMS_language_may_not_be_null=The name of the DBMS language may not be null
-SqlResourceBundle.The_class_loader_may_not_be_null=The class loader may not be null
-SqlResourceBundle.The_name_of_the_SQL_resource_bundle_may_not_be_null=The name of the SQL resource bundle may not be null
-SqlResourceBundle.The_resource_bundle_reference_may_not_be_null=The resource bundle reference may not be null
IDGenerator.The_protocol_may_not_be_null=The protocol may not be null
IDGenerator.The_stringified_ID_may_not_be_null=The stringified ID may not be null
-InterceptorImpl.The_invocation_object_may_not_be_null=The invocation object may not be null
-InterceptorImpl.The_reference_to_the_next_interceptor_may_not_be_null=The reference to the next interceptor may not be null
-InterceptorStackImpl.The_reference_to_the_first_interceptor_may_not_be_null=The reference to the first interceptor may not be null
-FileLogWriter.The_File_reference_may_not_be_null=The File reference may not be null
-ServiceInvocation.The_Method_reference_may_not_be_null=The Method reference may not be null
-ServiceInvocation.The_arguments_array_may_not_be_null=The arguments array may not be null
-ServiceInvocation.The_stack_may_not_be_null=The stack may not be null
-ClassLoaderUtil.The_Class[]_of_types_may_not_be_null=The Class[] of types may not be null
-ClassLoaderUtil.The_Class[]_of_types_may_not_contain_null_references=The Class[] of types may not contain null references
-ClassLoaderUtil.The_name_of_the_class_may_not_be_null=The name of the class may not be null
-ClassUtil.The_Class_reference_may_not_be_null=The Class reference may not be null
-ClassUtil.The_instance_may_not_be_null=The instance may not be null
-DebuggerImpl.The_name_may_not_be_null=The name may not be null
-DebuggerImpl.The_value_may_not_be_null=The value may not be null
FileUtils.The_name_of_the_file_may_not_be_null=The name of the file may not be null
FileUtils.The_file_extension_may_not_be_null=The file extension may not be null
FileUtils.Unable_to_create_file_in=Unable to create file in \"{0}\"
@@ -213,70 +88,33 @@
FileUtils.Unable_to_rename_file_in=Unable to create file in \"{0}\"
FileUtils.Unable_to_delete_file_in=Unable to create file in \"{0}\"
FileUtils.File_already_exists=File "\{0}\" already exists
-FileUtils.Unable_to_rename=Unable to rename file "\{0}\" to "\{1}\"
-I18nUtil.The_object_reference_may_not_be_null=The object reference may not be null
-UserCancelledException.User_cancelled_operation_msg=User cancelled operation
#=================================================================================================================================
# PluginUtilImpl
-PluginUtilImpl.invalidJavaVersionMessage = \
- {0} requires Java version {1} or higher. Currently executing Java version {2}.
-ConfigContext.Argument_must_not_be_null_1=Argument must not be null
-PlatformPluginRegistry.Plugin_resource_not_found_{0}_1=Plugin resource not found {0}
-ScriptCommandTarget.Tests_run__{0}_test_failures__{1}_1=Tests run: {0} test failures: {1}
-ScriptCommandTarget.Test_{0}.{1}_failed.{2}_2=Test {0}.{1} failed. {2}
+PluginUtilImpl.invalidJavaVersionMessage = {0} requires Java version {1} or higher. Currently executing Java version {2}.
#=================================================================================================================================
# AspectJ
-AspectPreferencePage.description=Settings used while running with aspect-enabled code.
-PreferenceTimingFloor=Timing Floor (ms)
-FileLimitSizeLogWriter.Maximum_Log_Size___8=Monitoring is done every {0} mins for maximum log size {1} kbs
-FileLimitSizeLogWriter.Error_Checking_logwriter_rollover__10=Error Checking logwriter rollover <msg>:
-AbstractMetaMatrixAspect.0=Unexpected exception trying to resolve method for declarative txn processing
-AbstractMetaMatrixAspect.1=Unexpected Exception processing invocation
-EmbeddedUUIDFactory.10=\n There were ID''s that did not match...
-EmbeddedUUIDFactory.11=\ \ \ \
-EmbeddedUUIDFactory.12=\n The string conversions of all ID''s matched\!
-EmbeddedUUIDFactory.13=\n There were ID''s that were duplicated...
-EmbeddedUUIDFactory.14=\ \ \ \
-EmbeddedUUIDFactory.15=\n All ID''s generated were unique\!
-EmbeddedUUIDFactory.16=\nCompleted
-EmbeddedUUIDFactory.17=false
-URLClassLoaderRegistry.UnableToCreateClassLoaderForUrl_FileDoesNotExist=Unable to create class loader for the url {0}: file does not exist
StringIDFactory.The_specified_ID_value_is_invalid=The specified ID value \"{0}\" is invalid for the protocol \"{1}\".
-ResourceNameUtil.invalidFileExtensionError=The file name "{0}" is invalid. It must have a "{1}" file extension.
-MetaMatrixException.deserialization_exception=Could not deserialize the exception hierarchy.
stream_closed=The stream already closed
-lob.invaliddata=Invalid type of data has been retrieved from server.
-remote_lob_access=Lob object accessed is from a remote connector; Can not stream data from remote objects;
failed_convert=Failed to convert {0} into {1}
invalid_string=Value is not valid XML
-ClobImpl.Failed_copy_clob=Failed creating a new clob from the given clob: {0}.
-ClobImpl.Invalid_substring_position=The substring position "{0}" is not valid.
-ClobImpl.Invalid_substring_length=The substring length "{0}" is not valid.
-ClobImpl.Invalid_start_position=The position to begin searching, "{0}", is not valid.
-BlobImpl.Invalid_byte_position=The first byte position "{0}" is not valid.
-BlobImpl.Invalid_bytes_length=The length of the bytes, "{0}", is not valid.
-BlobImpl.Invalid_start_position=The position to begin searching, "{0}", is not valid.
Streamable.isNUll=Streamable object argument can not be null
-Streamable.InvalidReference=Streamable contents are not available, use the Streaming interface to get the contents.
-FloatToBooleanTransform.Failed_transform=Failed to transform Float to Boolean. Expected 0 or 1 for {0}
-NullToAnyTransform.Invalid_value=Invalid value for type {0}: {1} of type {2}
ObjectToAnyTransform.Invalid_value=Invalid conversion from type {0} with value ''{2}'' to type {1}
InvalidPropertyException.message=Property ''{0}'' with value ''{1}'' is not a valid {2}.
Modified: branches/7.1.x/connectors/connector-ldap/src/main/resources/org/teiid/resource/adapter/ldap/i18n.properties
===================================================================
--- branches/7.1.x/connectors/connector-ldap/src/main/resources/org/teiid/resource/adapter/ldap/i18n.properties 2010-09-07 19:22:48 UTC (rev 2536)
+++ branches/7.1.x/connectors/connector-ldap/src/main/resources/org/teiid/resource/adapter/ldap/i18n.properties 2010-09-07 22:20:04 UTC (rev 2537)
@@ -20,19 +20,11 @@
# 02110-1301 USA.
#
-LDAPConnector.loggerNotFound=Logger not found in current environment.
-LDAPConnector.getConnectionFailed=Connection pool is not initialized properly. Cannot create a new connection.
#
LDAPConnection.urlPropNotFound=Ldap URL property not found.
LDAPConnection.adminUserDNPropNotFound=Ldap Admin User DN property not found.
LDAPConnection.adminUserPassPropNotFound=Ldap Admin password property not found.
-LDAPConnection.maxCriteriaParseError=Ldap Max Criteria property has an invalid format.
-LDAPConnection.maxCriteriaPropNotFound=Ldap Max Criteria property not found.
-LDAPConnection.contextInitFailed=LDAP context initialization failed. Please check connector properties, and verify against LDAP server.
-LDAPConnection.propertyFileParseFailed=The Properties file could not be parsed.
LDAPConnection.directoryNamingError=Initializing LDAP directory context failed. Please check LDAP connection properties, including username and password: {0}
-LDAPConnection.directoryInitError=Initializing LDAP directory context failed.
-LDAPConnection.unsupportedExecMode=LDAPConnector does not support requested execution mode.
LDAPConnection.contextCloseError=The Connection failed to close LDAP context: {0}
#
IQueryToLdapSearchParser.noTablesInFromError=Cannot parse query - no tables defined in FROM clause.
@@ -46,18 +38,14 @@
IQueryToLdapSearchParser.criteriaNotSupportedError=Encountered a criteria that is not supported.
IQueryToLdapSearchParser.searchDetailsLoggingError=Error writing LDAP search details to log
#
-LDAPSyncQueryExecution.execModeError=Synchronous query was called by connector, but request does not match. Cannot execute request.
LDAPSyncQueryExecution.setControlsError=Failed to set standard sort controls. Please verify that the server supports sorting, and that the bind user has permission to use sort controls.
LDAPSyncQueryExecution.createContextError=Failed to create LDAP search context from the specified context name. Check the table/group name in source to ensure the context exists.
-LDAPSyncQueryExecution.configAttrsError=Failed to configure attributes properly.
LDAPSyncQueryExecution.execSearchError=Execute search failed. Please check logs for search details.
-LDAPSyncQueryExecution.nullBatchError=A null Batch was encountered.
LDAPSyncQueryExecution.nullAttrError=Encountered null attribute name for a select symbol. Please check name in source for each column.
LDAPSyncQueryExecution.attrValueFetchError=Failed to fetch attribute value for attribute {0}. Rowset cannot be constructed from incomplete LDAP results.
LDAPSyncQueryExecution.supportedClassNotFoundError=Supported class not found.
LDAPSyncQueryExecution.closeContextError=LDAP error occurred during attempt to close context : {0}
#
-LDAPUpdateExecution.execModeError=Update was called by connector, but request does not match. Cannot execute request.
LDAPUpdateExecution.createContextError=Failed to create copy of the initial LDAP context: {0}
LDAPUpdateExecution.incorrectCommandError=Incorrect command type. Expecting INSERT, UPDATE, or DELETE.
LDAPUpdateExecution.columnSourceNameDNNullError=value for column with source name DN is null - must be set to distinguishedName for new record
@@ -79,5 +67,4 @@
LDAPUpdateExecution.criteriaRHSNotStringError=right side of equals comparison against DN is not a string - must be a string literal
LDAPUpdateExecution.closeContextError=LDAP error occurred during attempt to close context : {0}
#
-LDAPSourceConnectionFactory.creatingConnection=LDAPSourceConnectionFactory is creating a new connection.
Modified: branches/7.1.x/connectors/sandbox/translator-yahoo/src/main/resources/org/teiid/translator/yahoo/i18n.properties
===================================================================
--- branches/7.1.x/connectors/sandbox/translator-yahoo/src/main/resources/org/teiid/translator/yahoo/i18n.properties 2010-09-07 19:22:48 UTC (rev 2536)
+++ branches/7.1.x/connectors/sandbox/translator-yahoo/src/main/resources/org/teiid/translator/yahoo/i18n.properties 2010-09-07 22:20:04 UTC (rev 2537)
@@ -30,4 +30,3 @@
YahooExecution.Parse_date_error=Unable to parse date value: {0}, got: {1}
YahooExecution.Parse_time_value=Unable to parse time value: {0}, got: {1}
YahooExecution.Invalid_select_symbol=Yahoo connector can''t handle {0} in SELECT
-YahooConnector.proxyPortNotSet=HTTP proxy port is not set. The default port number 80 will be used.
Modified: branches/7.1.x/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties
===================================================================
--- branches/7.1.x/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties 2010-09-07 19:22:48 UTC (rev 2536)
+++ branches/7.1.x/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties 2010-09-07 22:20:04 UTC (rev 2537)
@@ -20,57 +20,18 @@
# 02110-1301 USA.
#
-JDBCSourceConnectionFactory.Missing_JDBC_jndi_1=Missing JDBC Source JNDI Name
-JDBCSourceConnectionFactory.Missing_JDBC_protocol_name_2=Missing JDBC protocol name
-JDBCSourceConnectionFactory.Missing_JDBC_database_name_3=Missing JDBC database name
-JDBCSourceConnectionFactory.Unable_to_load_the_JDBC_driver_class_6=Unable to load the JDBC driver class "{0}".
-JDBCSourceConnectionFactory.Driver__7=Driver "{0}" can not load "{1}".
-JDBCUpdateExecution.batch_prep_stmt=Executing batched prepared statements is not supported: {0}
-JDBCUpdateExecution.batch_stored_proc=Executing batched stored procedures is not supported: {0}
-JDBCSourceConnectionFactory.til=Unsupported transaction isolation level "{0}".
-JDBCSourceConnectionFactory.MissingProp=Missing required property: {0}
-JDBCSourceXAConnecton.Connection_still_leased=Connection is still leased to connector worker. However, transaction ended, so terminating the lease.
-JDBCSourceConnectionFactory.Unable_to_find_jndi_ds=Failed to locate data source named {0} through JNDI lookup.
JDBCTranslator.Unexpected_exception_translating_results___8=Unexpected exception while translating results: {0}
-JDBCTranslator.Unknown_error_translating_results___9=Unknown error translating results: {0}
-JDBCTranslator._Unable_to_get_Blob_and_set_parameter._{0}=\ Unable to get Blob and set parameter. {0}
-JDBCTranslator._Unable_to_get_Clob_and_set_parameter._{0}=\ Unable to get Clob and set parameter. {0}
-JDBCTranslator.Unable_to_set_appropriate_output_parameter_type_of_class({0})=Unable to set the appropriate output parameter type of class({0}) to JDBC Driver
-JDBCConnector.No_license_found_for_{0}=No license found for {0}
-JDBCConnector.JDBCConnector_initialized._1=JDBCConnector initialized.
-JDBCConnector.JDBCConnector_stopped._3=JDBCConnector stopped.
-JDBCConnector.JDBCConnector_started._4=JDBCConnector started.
-JDBCConnector.JDBCConnector_is_not_started._5=JDBCConnector is not started.
-JDBCConnector.unsupported_identity_type=Unsupported identity type.
-JDBCConnector.non_xa_connection_source=Connection source does not support XA.
-JDBCConnector.invalid_source=Specified connection source {0} is not a XADataSource, DataSource, or Driver
-BlobValueReference.Unable_to_read_BLOB_data=Unable to read BLOB data from InputStream.
-ClobValueReference.Unable_to_read_CLOB_data=Unable to read CLOB data from character stream.
-BasicSQLTranslator.The_format_of_set_criteria_batch_size_is_incorrect._1=The format of set criteria batch size is incorrect.
-JDBCSynchExecution.Statement_type_not_support_for_command_1=Statement type {0} not support for command {1}
-JDBCSourceConnection.Property_{0}_is_required,_but_not_defined_1=Property {0} is required, but not defined
-DropFunctionModifier.DropFunctionModifier_can_only_be_used_on_functions_with___1=DropFunctionModifier can only be used on functions with minimum or more number of arguments:
-JDBCSourceConnection.Execution_mode_not_supported__{0}_1=Execution mode not supported: {0}
-JDBCProcedureExecution.The_parameter_direction_must_be_out_or_inout_1=The parameter direction must be out or inout
-JDBCProcedureExecution.Unexpected_exception_1=Unexpected exception
JDBCQueryExecution.Error_executing_query__1 = {0}\n\nExecuting statement:\n\n {1}
JDBCQueryExecution.Error_executing_query__2 = {0}\n\nAfter executing batch statements:\n
JDBCQueryExecution.Error_executing_query__3 = {0}\n\nWhile executing batch statements:\n
-JDBCSingleIdentityDSConnectionFactory.Unable_to_set_DataSource_property=Unable to set DataSource property name \"{0}\" to value \"{1}"
-JDBCXAConnector.Connector_use_exclusive_mode_1=Connector uses exclusive connections for transactions.
ConnectionListener.failed_to_report_jdbc_connection_details=Failed to report the JDBC driver and connection information
-ConnectionListener.failed_to_report_oracle_connection_details=Failed to report Oracle driver and connection information, consider making the V$ tables public for providing useful information for tuning purposes
-StringToTimestampWithTimeZoneTransform=Unable to parse timestamp string: {0}
-JDBCUserIdentityConnectionFactory.Unable_to_get_credentials=Unable to extract credentials from command payload or trusted session payload for per-user connection.
-JDBCUserIdentityConnectionFactory.Connection_property_missing=Required connection property "{0}" missing for system "{1}".
-BasicResultsTranslator.Couldn__t_parse_property=Could not parse property: {0}
JDBCMetadataProcessor.cannot_find_primary=Cannot find primary key table {0}
Modified: branches/7.1.x/connectors/translator-ldap/src/main/resources/org/teiid/translator/ldap/i18n.properties
===================================================================
--- branches/7.1.x/connectors/translator-ldap/src/main/resources/org/teiid/translator/ldap/i18n.properties 2010-09-07 19:22:48 UTC (rev 2536)
+++ branches/7.1.x/connectors/translator-ldap/src/main/resources/org/teiid/translator/ldap/i18n.properties 2010-09-07 22:20:04 UTC (rev 2537)
@@ -33,5 +33,4 @@
LDAPConnection.unsupportedExecMode=LDAPConnector does not support requested execution mode.
LDAPConnection.contextCloseError=The Connection failed to close LDAP context: {0}
#
-ILDAPSourceConnectionFactory.creatingConnection=LDAPSourceConnectionFactory is creating a new connection.
Modified: branches/7.1.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/QueryExecutionImpl.java
===================================================================
--- branches/7.1.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/QueryExecutionImpl.java 2010-09-07 19:22:48 UTC (rev 2536)
+++ branches/7.1.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/QueryExecutionImpl.java 2010-09-07 22:20:04 UTC (rev 2537)
@@ -248,7 +248,7 @@
if (element.getNameInSource().equalsIgnoreCase("id")) { //$NON-NLS-1$
setValueInColumn(j, sObject.getId(), result);
} else {
- throw new TranslatorException("SalesforceQueryExecutionImpl.missing.field"+ element.getNameInSource()); //$NON-NLS-1$
+ throw new TranslatorException(Messages.getString("SalesforceQueryExecutionImpl.missing.field")+ element.getNameInSource()); //$NON-NLS-1$
}
} else {
Object cell;
@@ -305,7 +305,7 @@
@SuppressWarnings("unchecked")
private Object getCellDatum(Column element, Element elem) throws TranslatorException {
if(!element.getNameInSource().equals(elem.getLocalName())) {
- throw new TranslatorException("SalesforceQueryExecutionImpl.column.mismatch1" + element.getNameInSource() + "SalesforceQueryExecutionImpl.column.mismatch2" + elem.getLocalName()); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new TranslatorException(Messages.getString("SalesforceQueryExecutionImpl.column.mismatch1") + element.getNameInSource() + Messages.getString("SalesforceQueryExecutionImpl.column.mismatch2") + elem.getLocalName()); //$NON-NLS-1$ //$NON-NLS-2$
}
String value = elem.getTextContent();
Object result = null;
@@ -348,7 +348,7 @@
Date date = Util.getSalesforceDateTimeFormat().parse(value);
result = new Timestamp(date.getTime());
} catch (ParseException e) {
- throw new TranslatorException(e, "SalesforceQueryExecutionImpl.datatime.parse" + value); //$NON-NLS-1$
+ throw new TranslatorException(e, Messages.getString("SalesforceQueryExecutionImpl.datatime.parse") + value); //$NON-NLS-1$
}
}
} else {
Modified: branches/7.1.x/connectors/translator-salesforce/src/main/resources/org/teiid/translator/salesforce/i18n.properties
===================================================================
--- branches/7.1.x/connectors/translator-salesforce/src/main/resources/org/teiid/translator/salesforce/i18n.properties 2010-09-07 19:22:48 UTC (rev 2536)
+++ branches/7.1.x/connectors/translator-salesforce/src/main/resources/org/teiid/translator/salesforce/i18n.properties 2010-09-07 22:20:04 UTC (rev 2537)
@@ -19,13 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301 USA.
#
-SalesforceConnection.update.not.supported=Update Execution is not supported.
-SalesforceConnection.procedures.not.supported=Procedure Execution is not supported.
-SalesforceConnection.invalid.execution.mode=Execution mode not supported.
-SalesforceConnection.bad.IN.value=Exception parsing the IN Criteria Limit value.
-SalesforceConnection.bad.ping.value=Exception parsing the Data Source Test Connect Interval value.
-SalesforceSourceConnectionFactory.Invalid.username.password.pair=Invalid credential configuration. The Username and Password binding properties must both be empty or both have values.
SalesforceQueryExecutionImpl.cancel=SynchQueryExecution.cancel() called
SalesforceQueryExecutionImpl.close=SynchQueryExecution.close() called
@@ -33,7 +27,6 @@
SalesforceQueryExecutionImpl.column.mismatch1=Error: Column mismatch, expected
SalesforceQueryExecutionImpl.column.mismatch2= received
SalesforceQueryExecutionImpl.datatime.parse=Error parsing date_time: Value =
-SalesforceQueryExecutionImpl.reduced.batch.size=Reduced batch size to 2000
SelectVisitor.distinct.not.supported=Distinct is not supported by the connector.
@@ -41,8 +34,7 @@
CriteriaVisitor.invalid.arg.count=The includes and excludes functions require two parameters.
CriteriaVisitor.function.not.column.arg=The first parameter of the includes and excludes functions must be a column name.
CriteriaVisitor.function.not.literal.arg=The second parameter of the includes and excludes functions must be a literal value.
-CriteriaVisitor.IN.not.supported.on.col=The IN criteria is not supported on multi-select columns:
CriteriaVisitor.LIKE.not.supported.on.Id=LIKE criteria are not allowed on columns of native type Id
CriteriaVisitor.LIKE.not.supported.on.multiselect=LIKE criteria are not allowed on columns of native type Multi-Select Picklist
-Util.query.exceeds.max.length=Queries cannot exceed 10,000 characters
\ No newline at end of file
+Util.query.exceeds.max.length=Queries cannot exceed 10,000 characters
Modified: branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties
===================================================================
--- branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties 2010-09-07 19:22:48 UTC (rev 2536)
+++ branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties 2010-09-07 22:20:04 UTC (rev 2537)
@@ -21,143 +21,37 @@
#
BasicInterceptor.ProcessTree_for__4=ProcessTree for
-Connector.Loaded_capabilities_class__none_1=Loaded capabilities class: none
-Connector.Loaded_capabilities_class___2=Loaded capabilities class: {0}
-Connector.Failed_to_load_capabilities_class._3=Failed to load capabilities class. {0}
-ConnectorProcessor.Cache_statistics_5=Cache statistics: {0}
-ConnectorStateManager.invalid_state_1=Request {0} should have been in IDLE state but was PROCESSING.
-ConnectorStateManager.invalid_state_2=Request {0} should have been in an IDLE state but was in UNKNOWN.
-ConnectorStateManager.invalid_state_3=Could not find the state of request {0}
-ConnectorStateManager.invalid_state_4=Request {0} should have been in PROCESSING state but was IDLE
-ConnectorStateManager.invalid_state_5=Request {0} should have been in PROCESSING state but was UNKNOWN
-AtomicRequestID.Unable_to_create_ID_for_null_AtomicRequestMessage=Unable to create an ID for a null AtomicRequestMessage.
-AtomicRequestID.Unable_to_create_ID_for_AtomicRequestMessage_with_null_RequestID=Unable to create an ID for an AtomicRequestMessage with null RequestID.
-ConnectorManager.failed_to_lookup_connector=Failed to look up Connector instance {0}
-ConnectorManager.xa_capbility_not_supported=XA support by the Connector {0} is not possible when "SyncWorkers" is set to false
ConnectorManager.not_in_valid_state=Connector is not in OPEN state
ConnectorManagerImpl.Initializing_connector=Initializing connector {0}
-ConnectorManagerImpl.Couldn__t_parse_property=Could not parse property: {0}
-Error_closing_client_connection=Error closing client connection in ConnectorManager
-failed_legacy=The specified connector class {0} is not an instance of a Teiid connector. This may be due to an inappropriate classpath entry. An attempt was also made to treat the class as a legacy MetaMatrix connector, however this was not successful either.
-failed_instantiate_Connector_class=Could not instantiate Connector class {0}
-failed_start_Connector=Could not start Connector {0}. {1}
-ConnectorManagerImpl.request_inactive_for_cancel=RequestID {0} is not active and the cancel request will not be processed.
-failed_access_Connector_class=Could not access Connector class {0}
-failed_to_initialize=Could not initialize Connector class {0}
-Failed_to_find_service=Can not not find instance of service \"{0}\" in ConnectorManager: {1}
-received_null_message=ConnectorManager \"{0}\" received null message.
-Unknown_incoming_request_type=Unknown incoming request type \"{0}\" for request \"{1}\" in ConnectorManager {2}
-Unable_to_parse_required_property=Unable to parse \"{0}\" to use for required property {1} in ConnectorManager {2}
-using_default_value=Missing property: \"{0}\". Using default of: {1} in ConnectorManager {2}
-Unable_to_notify_client_of_failure=Unable to notify client \"{0}\" of failure: {1}
-wrong_message_type=ConnectorManager {0} recieved message {1} of unexpected type
-Connector_Shutting_down=Unable to service request {0} in connector {1} - Shutting down.
Cancel_request_failed=AtomicRequest {0} failed to cancel.
-RequestMessage_failed_Cause=RequestMessage {0} failed. Cause: {1}
-ConnectorManagerImpl.Err_get_conn=Error getting connection for cancellation: {0}
-ConnectorManager.cannot_restart=Cannot restart ConnectorManager
-ConnectorManager.cannot_add_to_recovery=Connector ''{0}'' does not support single identity connections, it cannot participate in recovery
-ConnectorManager.asynch_worker_warning=Setting ''{0}'' to false with pooling enabled is not recommended. If connector threads become exhausted normal execution closure will not be possible.
-ConnectorManager.useClassloader=Connector ''{0}'' using post delegation = {1} and classpath {2}
-non_xa_connector=Connector \"{0}\" was configured to support XA transactions, but the connector is not an XAConnector
-no_txn_manager=No Transaction Manger found in the configuration, Failed to start connector \"{0}\"
-Connector_State_not_active=Connector request state is not active for request {0} in Connector {1}
-Missing_required_property=Connector is missing required property {0} or wrong value supplied {1}
-Cancel_failed=Request {0} failed to cancel.
-ConnectorWorker.Can__t_communicate_error_to_client=Can not not communicate error to client
-ConnectorWorker.Command_null=Command is null.
-ConnectorWorker.Unable_to_open_connector_execution=Unable to open connector execution
-ConnectorWorker.ConnectorWorker_expecting_an_Execution_of_type_SynchExecution,_got=ConnectorWorker expecting an Execution of type SynchExecution, got {0}
-ConnectorWorker.Error_communicating_results_to_client=Error communicating results to client: {0}
-ConnectorWorker.transactionNotSupported=Transaction is not supported by the connector.
-ConnectorWorker.canNotRollBack=Faild to roll back transaction for "{0}".
ConnectorWorker.MaxResultRowsExceed=The number of result rows has exceeded the maximum result rows "{0}"
-ConnectorWorker.invalidAtomicType=Invalid atomic request message type: {0}.
ConnectorWorker.zero_size_non_last_batch=Connector returned a 0 row non-last batch: {0}.
-ConnectorWorker.requestID_does_not_exist=RequestID {0} does not exist or has been canceled. The request will not be processed.
-ConnectorWorker.could_not_retrieve_execution=Could not retrieve the execution for atomic requestID {0}. The request may have been canceled.
ConnectorWorker.process_failed=Connector worker process failed for atomic-request={0}
ConnectorWorker.ConnectorWorker_result_set_unexpected_columns=Could not process stored procedure results for {0}. Expected {1} result set columns, but was {2}. Please update your models to allow for stored procedure results batching.
-ConnectorWorker.error_occurred=Error occurred on connector {0} - {1}
-ConnectorRequestState.invalidConnectionType=Connection must be of type XAConnection.
-ConnectorRequestState.invalidConnectorType=Connector must be of type XAConnector.
-ConnectorStateManager.Unable_to_create_connection_for_request=Unable to create a connection for request {0}
-ConnectorStateManager.Can__t_create_request_state_with_null_RequestMessage=Can not create request state with null RequestMessage.
-ConnectorStateManager.The_request_has_been_cancelled.=The request {0} has been canceled.
-ConnectorStateManager.The_request_has_been_closed.=The request {0} has been closed.
-DataTierManager.Could_not_register_the_request_for_{0}_as_request_has_been_removed_from_QueryService.=Could not register the request for {0} as request has been removed from QueryService.
-DataTierManager.Could_not_deliver_response_for_{0}_as_request_has_been_removed_from_QueryService.=Could not deliver response for {0} as request has been removed from QueryService.
-DataTierManager.Could_not_deliver_partial_results_for_{0}_as_the_atomic_query_request_could_not_be_obtained_for_nodeID_{1}=Could not deliver partial results for {0} as the atomic query request could not be obtained for nodeID {1}
-DataTierManager.Unable_to_load_code_table_for_requestID_{0}_of_and_nodeID_of_{1}_because_result_sizes_exceeds_the_allowed_parameter_-_MaxCodeTableRecords.=Unable to load code table for requestID {0} of and nodeID of {1} because result sizes exceeds the allowed parameter - MaxCodeTableRecords.
-DataTierManager.Failed_to_register_request.=Failed to register request.
-DataTierManager.could_not_obtain_connector_id=Could not obtain a connection factory ID or a connector ID from the atomic request.
-DataTierManager.Could_not_deliver_response_for_{0}_as_a_matching_atomic_request_could_not_be_found.=Could not deliver response for {0} as a matching atomic request could not be found.
-DataTierManager.Could_not_deliver_response_for_{0}_as_the_QueryProcessor_could_not_be_obtained.=Could not deliver response for {0} as the QueryProcessor could not be obtained.
-DataTierManager.Unable_to_load_code_table_because_code_table_entries_exceeds_the_allowed_parameter_-_MaxCodeTables.=Unable to load code table because code table entries exceeds the allowed parameter - MaxCodeTables.
-DataTierManager.Unable_to_get_metadata.=Unable to get metadata.
-DataTierManager.cannot_register_request=Could not register a request on connector "{0}" with connector ID "{1}". Please ensure that the connector is running. Cause: {2}
-DataTierManager.Unable_to_resolve_query.=Unable to resolve query.
-DataTierManager.Unable_to_add_txn_result_for_request_{0}=Unable to add txn result for request {0}.
DataTierManager.could_not_obtain_connector_binding=Could not obtain connection factory for model {0} in VDB name= {1}, version {2}
-DataTierManager.Error_lob=Error during fetching the chunks of data for lob with value id {0}
-DQPBufferService.Error_initializing_buffer_manager__missing_required_property_7=Error initializing buffer manager: missing required property {0}
-DQPBufferService.Failed_initializing_buffer_manager._8=Failed initializing buffer manager.
-DQPCore.Exception_trying_to_determine_processor_timeslice_from_{0}=Exception trying to determine processor timeslice from {0}
-DQPCore.Unable_to_retrieve_metadata=Unable to retrieve metadata
-DQPCore.Unable_to_parse_command=Unable to parse command: {0}
DQPCore.Unable_to_load_metadata_for_VDB_name__{0},_version__{1}=Unable to load metadata for VDB name= {0}, version= {1}
-DQPCore.Unable_to_resolve_command.=Unable to resolve command.
-DQPCore.Unable_to_rewrite_command.=Unable to rewrite command.
DQPCore.Unknown_query_metadata_exception_while_registering_query__{0}.=Unknown query metadata exception while registering query: {0}.
-DQPCore.Exception_trying_to_determine_min_fetch_size.=Exception trying to determine min fetch size.
-DQPCore.Exception_trying_to_determine_max_fetch_size.=Exception trying to determine max fetch size.
-DQPCore.Exception_trying_to_determine_maximum_number_of_code_tables.=Exception trying to determine maximum number of code tables.
-DQPCore.Exception_trying_to_determine_maximum_record_size_of_a_code_table.=Exception trying to determine maximum record size of a code table.
-DQPCore.wrong_number_of_values=The number of bound values ''{0}'' does not match the number of parameters ''{1}'' in the prepared statement.
-DQPCore.Error_executing_conversion_function_to_convert_value.=Error converting parameter number {0} with value "{1}" to expected type {2}.
-DQPCore.Can__t_communicate_error_to_client=Cannot communicate error to client.
DQPCore.Clearing_prepared_plan_cache=Clearing prepared plan cache
-DQPCore.Clearing_code_table_cache=Clearing code table cache
-DQPCore.Unable_to_check_license_for_update_capability._Updates_will_not_be_allowed_3=Unable to check license for update capability. Updates will not be allowed
DQPCore.The_request_has_been_closed.=The request {0} has been closed.
DQPCore.The_atomic_request_has_been_cancelled=The atomic request {0} has been canceled.
-DQPCore.The_atomic_request_cancelled_not_closed=The atomic request {0}.{1} has been canceled, but closed yet.
-DQPCore.The_atomic_request_closed_queued=The atomic request {0} has queued to close, another request in progress.
DQPCore.failed_to_cancel=Failed to Cancel request, as request already finished processing
-DQPComponent.DQPComponent.receive__Unable_to_deliver_message_to_client_[{0}].=DQPComponent.receive: Unable to deliver message to client [{0}].
-DQPComponent.DQPComponent.receive__Unable_to_deliver_message_to_client_[{0}]._Original_exception_was__{1}=DQPComponent.receive: Unable to deliver message to client [{0}]. Original exception was: {1}
-DQPComponent.DQPComponent.processInternal__Received_exception_processing_request=Received exception processing request:
-IndexMetadataService.VDB_Service_is_not_available._1=VDB Service is not available.
-QueryMetadataCache.Failed_creating_Runtime_Index_Selector._4=Failed creating Runtime Index Selector for {0}.
-IndexMetadataService.Invalid_System_VDB_URL=System VDB URL is not valid: {0}.
-LanguageBridgeFactory.Unable_to_set_the_metadata_ID_for_element_{0}._10=Unable to set the metadata ID for element {0}.
-LanguageBridgeFactory.Unable_to_set_the_metadata_ID_for_group_{0}._11=Unable to set the metadata ID for group {0}.
-LanguageBridgeFactory.cant_translate_union=Unable to translate union where first branch is a union
-ProcessWorker.request_was_null=request was null
-ProcessWorker.Could_not_deliver_response_as_request_has_been_removed.=Could not deliver response as request has been removed.
-ProcessWorker.Failed_getting_first_batch_for_{0}.=Failed getting first batch for {0}.
-ProcessWorker.send_error=Sending error from process worker for request {0}.
-ProcessWorker.Failed_to_deliver_response_for_{0}=Failed to deliver response for {0}. Client connection may have been closed.
-ProcessWorker.ProcessWorker.Failed_starting_processing._1=ProcessWorker.Failed_starting_processing.
ProcessWorker.failed_rollback=Failed to properly rollback autowrap transaction properly
ProcessWorker.error=Unexpected exception for request {0}
ProcessWorker.processing_error=Processing exception ''{0}'' for request {1}. Exception type {2} thrown from {3}. Enable more detailed logging to see the entire stacktrace.
-SharedCacheFinder.Didnt_find_caps=Unable to find capabilities for {0}
-MessageHandler.Transactions_not_allowed=Transactions are not allowed due non-availablity of the transaction service.
# ==========================================
# Error Messages for the dqp Package
# ==========================================
@@ -365,67 +259,11 @@
# services (003)
ERR.022.003.0001=
-CodeTableCache.No_code_table=Failed to find code table {0} with key={1} and value={2}
-CodeTableCache.Cleared_code_tables=Cleared {0} cached code tables containing {1} records
-Request.Updates_not_allowed_due_to_license_restriction._1=Updates not allowed due to license restriction.
-Request.txn.err.resume=Unable to resume transaction for request "{0}".
-Request.txn.err.export=Unable to export transaction for request "{0}".
-Request.xml_restricted=Executing XML or XQuery commands is not allowed due to license restriction.
-Request.txn.err.suspend=Unable to suspend transaction for request "{0}".
-Request.txn.info.resume=Resumed transaction "{0}".
-Request.txn.info.export=Exported transaction "{0}".
-Request.txn.info.suspend=Suspended transaction "{0}".
-Request.transaction_not_supported=Autowrap transaction required, but transaction support is disabled
-Request.potentially_unsafe=The request is modifying more than 1 model without any containing transaction (autoCommitTxn = OFF). This is potentially unsafe as the updates cannot be rolled back as a single unit.
-Request.no_result_set=Statement does not return a result set.
-Request.result_set=Statement returns a result set, not an update count.
-Request.wsdl_user_not_authorized=The anonymous user is not authorized for this action.
-ParameterImpl.Invalid_direction=Invalid parameter direction: {0}
-DQPCORE.6=Unable to create ResulSet cache.
-ResultSetCache.1=Result batches are not contiguous in cache.
-DQPLauncher.InstallService_ServiceIsNull=Service "{0}" is null. Can not install it in DQP.
-DQPLauncher.InstallService_ServiceInstalled=Service "{0}" is installed in DQP.
-DQPLauncher.LicenseFailed=License file not found or failed to load in DQP.
-Request.MetadataServiceIsNull=Can not get metadata service.
-ResultBatch.invalid_paramtype=Invalid parameter type: {0}
-Request.Cant_query_staging_table=XML staging table {0} cannot be queried directly.
-DQPCore.Processor_debug_allowed_{0}=Processor debug allowed: {0}
Request.Invalid_character_in_query=Bind variables (represented as "?") were found but are allowed only in prepared or callable statements.
-RequestManager.Invalid_starting_position=The starting position of the document chunk, {0}, is not valid.
-RequestContext.invalid_context=Invalid portable context string. Unable to reinstantiate a request context from the string :{0}
-RequestContext.null_context=The portable request context should not be null.
-Request.virtual_restricted=Executing commands with virtual groups or virtual procedures is not allowed due to license restriction.
-ResultBatch.no_rows=The row count for this batch is 0 and it contains no values.
-ResultBatch.invalid_row=Invalid row {0}: begin row <= row value <= end row.
-ResultBatch.invalid_column=Invalid column {0}: 1 <= column <= column count
-ResultBatch.null_result=Unexpected null result from the server when requesting a LOB chunk.
-ResultBatch.no_params=This result batch contains no parameters.
-ResultBatch.invalid_paramindex=Invalid parameter index {0}: 1 <= parameter index <= parameter count.
-ResultBatch.not_update=This result batch does not represent an update result.
-ResultBatch.exception_exists=The update count is invalid: this result contains an exception.
-ResultBatch.update_count_unavailable=Unable to retrieve an update count from this batch.
-ServerConnectionInfo.invalid_context=Invalid portable context string. Unable to reinstantiate a ServerConnectionInfo from the string :{0}
-ServerConnectionInfo.invalid_url=The url "{0}" is invalid and could not be parsed. The url should be of the form mm[s]://host[,host2,host3...]:port[,port2,port3...]
-ServerSessionContext.invalid_context=Invalid portable context string. Unable to reinstantiate a server session context from the string :{0}
-ServerSessionContext.null_context=The portable session context should not be null.
-ServerConnectionInfo.invalid_encoding=Invalid encoded object within the portable string. Unable to reinstantiate an object from the encoded string :{0}
-ResultBatch.not_last_batch=This method can only be called on the last batch of results.
-ResultBatch.not_out_param=The parameter at index {0} must be of type RETURN, OUT, or INOUT
-CacheResults.Trying_to_cache_unexpected_results=Trying to cache unexpected results. Expected request ID "{0}"; Got request ID "{1}"
-QueryMetadataCache.cache_not_valid=The query metadata cache may have been cleared and is no longer valid, create a new cache.
-DQPCore.virtual_allowed=License allows virtual layer: {0}
-DQPCore.xml_allowed=License allows XML queries and XQuery: {0}
-CustomizableTrackingService.not_started=The custom tracking service has not been started, so command logging is inactive, and messages will be ignored.
-CustomizableTrackingService.unknown_message=Unknown custom tracking message type
-Request.failed_deliver_message=Error delivering results to client for request {0}
-LobStream.noreference=LOB can not be reached; reference is null for streaming.
ProcessWorker.wrongdata=Wrong type of data found or no data found; expecting streamable object from the buffer manager.
ProcessWorker.LobError=An error occurred during streaming of Lob Chunks to Client.
-Unable_to_read_data_from_stream=Unable to read data from the stream: {0}
-no_response_server=No response received from server.
-Request.query_plan_not_allowed=Query Plan not allowed in this context. Please remove the SHOWPLAN or PLANONLY option.
TransactionServer.existing_transaction=Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.
TransactionServer.no_transaction=No transaction found for client {0}.
@@ -437,92 +275,34 @@
TransactionServer.resume_failed=Cannot resume, transaction {0} was not suspended by client {1}.
TransactionServer.existing_global_transaction=Global transaction {0} already exists.
TransactionServer.suspended_exist=Suspended work still exists on transaction {0}.
-TransactionServer.failed_to_enlist=Failed to enlist the XAResource in Transaction.
-TransactionServer.failed_to_delist=Failed to delist the XAResource from Transaction.
-TransactionServer.rollback_set=Rollback Only has been set on transaction {0}. This may be result of a cancel request.
-TransactionContextImpl.remote_not_supported=Remote connector calls under a transaction are not supported
-CodeTableCache.duplicate_key=Duplicate code table ''{0}'' key ''{1}'' value ''{2}''
-connector_cache_closed=Connector cache has been already closed.
-ConnectorEnvironmentImpl.request_scope_error=CacheScope.REQUEST not support on this interface. Use methods on ExecutionContext for REQUEST scoped cache.
-ConnectorEnvironmentImpl.session_scope_error=Session information is not available; SESSION scoped cache can not be accessed.
-ConnectorEnvironmentImpl.vdb_scope_error=VDB information is not available; VDB scoped cache can not be accessed.
-BufferManagerLobChunkStream.no_tuple_source=Lob chunk is not found in the Buffer Manager with tuple id {0}
-BufferManagerLobChunkStream.error_processing=Error occurred during the fetching of the lob chunk from buffer manager with tuple id {0}
TransformationMetadata.does_not_exist._1=does not exist.
TransformationMetadata.0={0} ambiguous, more than one entity matching the same name
-TransformationMetadata.Group(0}_does_not_have_elements=Group ''{0}'' does not have any elements.
TransformationMetadata.Error_trying_to_read_virtual_document_{0},_with_body__n{1}_1=Error trying to read virtual document {0}, with body \n{1}
TransformationMetadata.Unknown_support_constant___12=Unknown support constant:
-TransformationMetadata.error_intialize_selector=Error trying to initialize the index selector.
-TransformationMetadata.Error_trying_to_obtain_index_file_using_IndexSelector_1=Error trying to obtain index file using IndexSelector {0}
-TransformationMetadata.Model_name_ambiguous,more_than_one_model_exist_with_the_name__2=Model name ambiguous, more than one model exists with the name
-TransformationMetadata.The_metadataID_passed_does_not_match_a_index_record._1=The metadataID passed does not match an index record
-TransformationMetadata.Expected_id_of_the_type_key_record_as_the_argument_2=Expected ID of the type key record as the argument
-TransformationMetadata.Expected_id_of_the_type_accesspattern_record_as_the_argument_3=Expected ID of the type accesspattern record as the argument
-TransformationMetadata.No_known_index_file_type_associated_with_the_recordType_1=No known index file type associated with the recordType
-TransformationMetadata.GroupID_ambiguous_there_are_multiple_virtual_plans_available_for_this_groupID__1=GroupID ambiguous, there are multiple virtual plans available for this groupID
-TransformationMetadata.GroupID_ambiguous_there_are_multiple_insert_plans_available_for_this_groupID__2=GroupID ambiguous, there are multiple insert plans available for this groupID
-TransformationMetadata.GroupID_ambiguous_there_are_multiple_update_plans_available_for_this_groupID__3=GroupID ambiguous, there are multiple update plans available for this groupID
-TransformationMetadata.GroupID_ambiguous_there_are_multiple_delete_plans_available_for_this_groupID__4=GroupID ambiguous, there are multiple delete plans available for this groupID
-TransformationMetadata.Failed_to_create_index_files_for_non-indexed_model_resources__1=Failed to create index files for non-indexed model resources :
-TransformationMetadata.Procedure_ambiguous_there_are_multiple_procedure_plans_available_for_this_name___4=Procedure ambiguous, there are multiple procedure plans available for this name:
-TransformationMetadata.Could_not_find_query_plan_for_the_group__5=Could not find query plan for the group
TransformationMetadata.QueryPlan_could_not_be_found_for_physical_group__6=QueryPlan could not be found for physical group
TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__8=InsertPlan could not be found for physical group
TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__10=InsertPlan could not be found for physical group
TransformationMetadata.DeletePlan_could_not_be_found_for_physical_group__12=DeletePlan could not be found for physical group
-TransformationMetadata.Could_not_find_transformation_record_for_the_group__1=Could not find transformation record for the group
TransformationMetadata.Error_trying_to_read_schemas_for_the_document/table____1=Error trying to read schemas for the document/table :
-TransformationMetadata.Multiple_transformation_records_found_for_the_group___1=Multiple transformation records found for the group:
-TransformationMetadata.Multiple_annotation_records_found_for_the_entity_{0}_1=Multiple annotation records found for the entity {0}
-TransformationMetadata.No_metadata_info_available_for_the_index_with_UUID_{0}._1=No metadata info available for the index with UUID {0}.
-TransformationMetadata.Ambiguous_index_with_UUID_{0},_found_multiple_indexes_with_the_given_UUID._2=Ambiguous index with UUID {0}, found multiple indexes with the given UUID.
TransformationMetadata.Invalid_type=Invalid type: {0}.
-TransformationMetadata.Unable_to_determine_fullname_for_element__1=Unable to determine fullname for element
TransformationMetadata.does_not_exist._1=does not exist.
TransformationMetadata.0={0} ambiguous, more than one entity matching the same name
-TransformationMetadata.Group(0}_does_not_have_elements=Group ''{0}'' does not have any elements.
TransformationMetadata.Error_trying_to_read_virtual_document_{0},_with_body__n{1}_1=Error trying to read virtual document {0}, with body \n{1}
TransformationMetadata.Unknown_support_constant___12=Unknown support constant:
-TransformationMetadata.error_intialize_selector=Error trying to initialize the index selector.
-TransformationMetadata.Error_trying_to_obtain_index_file_using_IndexSelector_1=Error trying to obtain index file using IndexSelector {0}
-TransformationMetadata.Model_name_ambiguous,more_than_one_model_exist_with_the_name__2=Model name ambiguous, more than one model exists with the name
-TransformationMetadata.The_metadataID_passed_does_not_match_a_index_record._1=The metadataID passed does not match an index record
-TransformationMetadata.Expected_id_of_the_type_key_record_as_the_argument_2=Expected ID of the type key record as the argument
-TransformationMetadata.Expected_id_of_the_type_accesspattern_record_as_the_argument_3=Expected ID of the type accesspattern record as the argument
-TransformationMetadata.No_known_index_file_type_associated_with_the_recordType_1=No known index file type associated with the recordType
-TransformationMetadata.GroupID_ambiguous_there_are_multiple_virtual_plans_available_for_this_groupID__1=GroupID ambiguous, there are multiple virtual plans available for this groupID
-TransformationMetadata.GroupID_ambiguous_there_are_multiple_insert_plans_available_for_this_groupID__2=GroupID ambiguous, there are multiple insert plans available for this groupID
-TransformationMetadata.GroupID_ambiguous_there_are_multiple_update_plans_available_for_this_groupID__3=GroupID ambiguous, there are multiple update plans available for this groupID
-TransformationMetadata.GroupID_ambiguous_there_are_multiple_delete_plans_available_for_this_groupID__4=GroupID ambiguous, there are multiple delete plans available for this groupID
-TransformationMetadata.Failed_to_create_index_files_for_non-indexed_model_resources__1=Failed to create index files for non-indexed model resources :
-TransformationMetadata.Procedure_ambiguous_there_are_multiple_procedure_plans_available_for_this_name___4=Procedure ambiguous, there are multiple procedure plans available for this name:
-TransformationMetadata.Could_not_find_query_plan_for_the_group__5=Could not find query plan for the group
TransformationMetadata.QueryPlan_could_not_be_found_for_physical_group__6=QueryPlan could not be found for physical group
TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__8=InsertPlan could not be found for physical group
TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__10=InsertPlan could not be found for physical group
TransformationMetadata.DeletePlan_could_not_be_found_for_physical_group__12=DeletePlan could not be found for physical group
-TransformationMetadata.Could_not_find_transformation_record_for_the_group__1=Could not find transformation record for the group
TransformationMetadata.Error_trying_to_read_schemas_for_the_document/table____1=Error trying to read schemas for the document/table :
-TransformationMetadata.Multiple_transformation_records_found_for_the_group___1=Multiple transformation records found for the group:
-TransformationMetadata.Multiple_annotation_records_found_for_the_entity_{0}_1=Multiple annotation records found for the entity {0}
-TransformationMetadata.No_metadata_info_available_for_the_index_with_UUID_{0}._1=No metadata info available for the index with UUID {0}.
-TransformationMetadata.Ambiguous_index_with_UUID_{0},_found_multiple_indexes_with_the_given_UUID._2=Ambiguous index with UUID {0}, found multiple indexes with the given UUID.
TransformationMetadata.Invalid_type=Invalid type: {0}.
-TransformationMetadata.Unable_to_determine_fullname_for_element__1=Unable to determine fullname for element
CachedFinder.no_connector_found=No connector with jndi-name {0} found for Model {1} with source name {2}
-failed_to_get_connection= Failed to get connection for translator {0}
-failed_to_close_connection=Failed to close the connection for translator {0}
translator_not_found=Translator {0} not accessible.
datasource_not_found=Data Source {0} not accessible.
-failed_to_bind_translator=Failed to bind the translator {0} on the jndi tree
-failed_to_unbind_translator=Failed to un-bind the translator {0} from the jndi tree.
RequestWorkItem.cache_nondeterministic=Caching command '{0}'' at a session level, but less deterministic functions were evaluated.
not_found_cache=Results not found in cache
-failed_to_put_in_cache=Failed to put results in the cache
-failed_to_unwrap_connection=Failed to unwrap the source connection.
\ No newline at end of file
+failed_to_unwrap_connection=Failed to unwrap the source connection.
Modified: branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties
===================================================================
--- branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties 2010-09-07 19:22:48 UTC (rev 2536)
+++ branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties 2010-09-07 22:20:04 UTC (rev 2537)
@@ -128,57 +128,27 @@
ERR.015.009.0003= Error simplifying mathematical expression: {0}
ERR.015.009.0004= Unable to {0} {1} of type [{2}] to the expected type [{3}].
ERR.015.009.0005= Unexpected error evaluating {0}
-QueryRewriter.criteriaError= Error simplifying criteria: {0}
QueryRewriter.infinite_while=Infinite loop detected, procedure will not be executed.
BatchedUpdatePlanner.unrecognized_command=The batch contained an unrecognized command: {0}
-CacheFinder.Didnt_find_caps=Unable to find capabilities for {0}
-ProcedurePlanner.wrong_type=The ProcedurePlanner could not be used for planning commands of the type: {0}
ProcedurePlanner.bad_stmt=Error while planning update procedure, unknown statement type encountered: {0}
-RuleBreakMultiJoin.Unable_find_join_plan=Unable to find join plan for join region
RulePushSelectCriteria.Error_getting_modelID=Error getting modelID
-RelatePlanner.mixed_wrappers=Criteria conjunct uses a mixture of source and target wrappers, which is invalid: ''{0}''.
-RelatePlanner.misapplied_wrapper=Criteria conjunct is applied against the {0} entity fragment but uses the {1} function wrapper: ''{2}''.
-RelatePlanner.misapplied_relateSource=Function relateSource refers to a fragment in only the target entity: {0}
-RelatePlanner.misapplied_relateTarget=Function relateTarget refers to a fragment in only the source entity: {0}
-RelatePlanner.misapplied_ToMappingEntity=Function relateSource or relateTarget refers to a mapping entity fragment: {0}
-RelatePlanner.bad_mapping_rs_for_relate=When using the relate() function, the relationship mapping class {0} must include INPUT set criteria referring back to the entity mapping classes {1} and {2}
XMLPlanner.no_uri=Cannot find namespace URI for namespace {0} of element {1}
XMLPlanner.The_XML_document_element_{0}_is_not_mapped_to_data_and_cannot_be_used_in_the_ORDER_BY_clause__{1}_1=The XML document element {0} is not mapped to data and cannot be used in the ORDER BY clause: {1}
XMLPlanner.The_rowlimit_parameter_{0}_is_not_in_the_scope_of_any_mapping_class=The ''rowlimit'' or ''rowlimitexception'' function parameter ''{0}'' is not an XML node within the scope of any mapping class.
XMLPlanner.Criteria_{0}_contains_conflicting_row_limits=The criteria ''{0}'' contains conflicting row limits for an XML mapping class.
-BatchedUpdatePlan.cannot_connect_tuplesource=Unable to deliver results for nodeID {0}
AccessNode.rewrite_failed=Failed to rewrite the command: {0}
BatchedUpdateNode.unexpected_end_of_batch=Unexpectedly reached the end of the batched update counts at {0}, expected {1}.
-DependentAccessNode.Cannot_apply_required_criteria=Cannot apply required criteria to meet the access pattern because the number of values exceeds the "Set Criteria Max Size" property of model "{0}".
-DuplicateFilter.remoteException=Received RemoteException from BufferManager, but shouldn''t have: {0}
-AbstractProcessorEnvironment.No_ts_found=No tuple source {0} found during processing
-AbstractProcessorEnvironment.row_limit_passed=More then expected number rows found in resultset {1}. The limit is set at {0} rows.
row_limit_passed=The row limit {0} has been exceeded for XML mapping class {1}.
-row_limit_low=The minimum row limit {0} has not been met for XML mapping class {1}.
AddNodeInstruction.element__1=element
-AddNodeInstruction.attribute__2=attribute
AddNodeInstruction.Unable_to_add_xml_{0}_{1},_namespace_{2},_namespace_declarations_{3}_3=Unable to add xml {0} {1}, namespace {2}, namespace declarations {3}
-MappingNodeConstants.XMLSchemaInstance_Prefix=xsi
-ProxyDataManager.Proxy_Data_Manager_connected_tuple_source_for_group_symbol_2=Proxy Data Manager connected tuple source for group symbol
-ProxyDataManager.Proxy_Data_Manager,_group_symbol_3=Proxy Data Manager, group symbol
-ProxyDataManager.is_not_temp_group_symbol_4=is not temp group symbol
-XMLPlan.Validation_feature=http://xml.org/sax/features/validation
-XMLPlan.Schema_validation_feature=http://apache.org/xml/features/validation/schema
-XMLPlan.Namespaces_features=http://xml.org/sax/features/namespaces
-XMLPlan.No_namespace_property=http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation
-XMLPlan.External_schema_location=http://apache.org/xml/properties/schema/external-schemaLocation
QueryProcessor.request_cancelled=The request {0} has been cancelled.
-VariableSubstitutionVisitor.Error_lookup_default_value=Error trying to lookup the default value for the element
VariableSubstitutionVisitor.Input_vars_should_have_same_changing_state=INPUT variables used in the expression should all have same CHANGING state: {0}
-SqlEval.Dynamic_sql_doesnt_return_xml=Dynamic sql does not return XML: {0}
ExecDynamicSqlInstruction.0=Evaluated dynamic SQL expression value was null.
-ExecDynamicSqlInstruction.1=The actual model update count ''{0}'' is greater than the expected value of ''{1}''. This is potentially unsafe in OPTIMISTIC transaction mode. Please adjust the UPDATE clause of the dynamic SQL statement.
ExecDynamicSqlInstruction.3=There is a recursive invocation of group ''{0}''. Please correct the SQL.
ExecDynamicSqlInstruction.4=The dynamic sql string contains an incorrect number of elements.
-ExecDynamicSqlInstruction.5=No match found for expected symbol ''{0}'' in the dynamic SQL.
ExecDynamicSqlInstruction.6=The datatype ''{0}'' for element ''{1}'' in the dynamic SQL cannot be implicitly converted to ''{2}''.
ExecDynamicSqlInstruction.couldnt_execute=Couldn''t execute the dynamic SQL command "{0}" with the SQL statement "{1}" due to: {2}
@@ -187,27 +157,18 @@
TempTableStore.table_doesnt_exist_error=Temporary table "{0}" does not exist.
XMLQueryPlanner.cannot_plan=Cannot create a query for MappingClass with user criteria {0}
-XMLQueryPlanner.staging_table_has_input_set=Staging table ''{0}'' is not allowed to have an input set.
CriteriaPlanner.staging_context=Staging table criteria cannot contian context functions
CriteriaPlanner.multiple_staging=Staging table criteria {0} was not specified against a single staging table
CriteriaPlanner.invalid_context=Element {0} is not in the scope of the context {1}
CriteriaPlanner.invalid_element=Element {0} is not a valid data node
results_not_found=Results for the mapping class {0} are not found;
-tuple_not_found=Tuple source results for the mapping class {0} are not found;
-unmapped_reference=Reference value for {0} is not supplied; can not continue.
RulePlanProcedures.no_values=No valid criteria specified for procedure parameter {0}
ProcedurePlan.nonNullableParam=The procedure parameter is not nullable, but is set to null: {0}
-BufferManagerImpl.no_memory_available=No memory available
-BufferManagerImpl.tuple_source_not_found=Tuple source does not exist: {0}
-FileStoreageManager.file_exists=Unable to create {0} as it already exists
FileStoreageManager.error_creating=Error creating {0}
FileStoreageManager.error_reading=Error reading {0}
FileStoreageManager.no_directory=No directory specified for the file storage manager.
FileStoreageManager.not_a_directory={0} is not a valid storage manager directory.
-FileStorageManager.error_getting_free_disk_space=Error while seeking free disk space for directory: {0}
-FileStorageManager.can_not_save_lobs=Can not save *Reference Lobs* into persistent disk storage.
-FileStorageManager.batch_error=Error while converting batched data to file storage.
FileStoreageManager.space_exhausted=Max buffer space of {0} bytes has been exceed. The current operation will be aborted.
TextTableNode.no_value=No value found for column \"{0}\" in the row ending on text line {1} in {2}.
@@ -230,4 +191,4 @@
TempTableDataManager.row_refresh_composite=Materialized view {0} cannot have a row refreshed because it uses a composite key.
TempTableDataManager.row_refresh_updatable=Materialized view {0} cannot have a row refreshed because it's cache hint did not specify \"updatable\".
TempTableDataManager.row_refresh=Refreshing row {1} for materialized view {0}.
-CriteriaPlanner.no_context=No root node found.
\ No newline at end of file
+CriteriaPlanner.no_context=No root node found.
Modified: branches/7.1.x/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties
===================================================================
--- branches/7.1.x/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2010-09-07 19:22:48 UTC (rev 2536)
+++ branches/7.1.x/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2010-09-07 22:20:04 UTC (rev 2537)
@@ -21,26 +21,20 @@
#
engine_started=Teiid Engine Started = {0}
-socket_not_enabled=Socket transport for {0} is not enabled in Teiid.
socket_enabled={0} {1}
odbc_not_enabled=ODBC transport is not enabled in Teiid.
odbc_enabled={0} {1}
engine_stopped=Teiid Engine stopped {0}
admin_connection_closed=Teiid admin connection is already closed.
-translator_exists=Translator with name {0} already exists in the configuration
-translator_does_not_exist=Translator with name {0} does not exist in the configuration
bad_vdb_extension=The extension of the file name must be either ".vdb" for designer vdb or "xxx-vdb.xml" for dynamic VDBs
-translator_template_not_found=Template with name {0} not found for creating a translator
vdb_not_found=VDB with name "{0}" version "{1}" not found in configuration
model_not_found=Model name "{0}" not found in the VDB with name "{1}" version "{2}"
policy_not_found=Policy name "{0}" not found in the VDB with name "{1}" version "{2}"
-connectionfactory_not_found=Connection factory {0} not found in the configuration.
datasource_not_found=Datasource {0} not found in the configuration.
sourcename_not_found=No source name {0} found in the model: {1}.{2}.{3}
no_operation=No operation found with given name = {0}
failed_to_remove=Failed to remove the deployment
-distibute_failed={0} distribute failed.
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.
@@ -50,4 +44,4 @@
datasource_template_not_found=Template {0} for creating the data source is not found.
jndi_failed=JNDI lookup failed.
distribute_failed=Deploy of the archive failed {0}
-template_not_found=Template not found for {0}
\ No newline at end of file
+template_not_found=Template not found for {0}
Modified: branches/7.1.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties
===================================================================
--- branches/7.1.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2010-09-07 19:22:48 UTC (rev 2536)
+++ branches/7.1.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2010-09-07 22:20:04 UTC (rev 2537)
@@ -20,237 +20,33 @@
# 02110-1301 USA.
#
-EmbeddedConfigSource.No_configuration_file_specified_1=No configuration file specified
-EmbeddedConfigSource.Can_not_load_config_file_2=Can not load config file: \"{0}\"
-EmbeddedConfigSource.Service_class__4=Service class \"{0}\" is not assignable to expected type \"{1}\"
-EmbeddedConfigSource.0=Error trying to initialize IndexMetadataService
-EmbeddedConfigSource.1=Unable to get the url for the system vdb from the current configuration.
-EmbeddedConfigSource.Unable_to_find_service_class_6=Unable to find service class: \"{0}\"
-EmbeddedConfigSource.Unable_to_instantiate_service_class_7=Unable to instantiate service class: \"{0}\"
-EmbeddedConfigSource.Unable_to_instantiate_service_class_due_to_security_error_8=Unable to instantiate service class due to security error: \"{0}\"
-EmbeddedConfigurationService.invalid_vdb=Failed to add/load the VDB \"{0}\", because it is invalid
-VDBConfigurationWriter.vdb_delete_failed=Failed to delete VDB \"{0}\" with version \"{1}\" from configuration
-VDBConfigurationWriter.vdb_delete=Successfully deleted VDB \"{0}\" with version \"{1}\" from configuration
-LocalBufferService.Error_initializing_buffer_manager__missing_required_property_7=Error initializing buffer manager: missing required property \"{0}\"
LocalBufferService.Failed_initializing_buffer_manager._8=Failed initializing buffer manager.
-ServerConfiguration.Props_file_null=Properties file name must be non-null
-ServerConfiguration.Err_interpreting_property=Error interpreting property \"{0}\" with value \"{1}\" as a URL.
-ServerConfiguration.Req_prop_not_specified=Required property \"{0}\" not specified
-VDBConfigFileReader.Connector_type_names_do_not_match=Connector names do not match: \"{0}\" and \"{1}\".
-VDBConfigFileReader.No_connector_type_for_connector=Configuration has no connector definition for type \"{0}\" for connection factory \"{1}\".
-VDBConfigFileReader.Already_contains_connector_type=Configuration has two definitions for connector \"{0}\".
VDBConfigFileReader.No_connector_binding_in_config = A model \"{0}\" specifies a connection factory "{1}" for which there is no definition found in the configuration or VDB definition files.
VDBService.VDB_does_not_exist._1=VDB \"{0}\" version \"{1}\" does not exist.
VDBService.VDB_does_not_exist._2=VDB \"{0}\" version \"{1}\" is not in "active" status.
-VDBService.VDB_does_not_exist._3=In VDB \"{0}\" version \"{1}\" the Model \"{2}\" does not exist.
-VDBService.Model_does_not_exist._4=Model "{0}" does not exist.
-VDBService.0=Error trying to read visibility information from the vdb \"{0}\".
-LOAD_VDB.FAILED.0=Invalid file location \"{0}\". The VDB file location must be a file or a directory path.
-VDBService.failed_load=Failed to load the VDB
-VDBService.lookup=VDB \"{0}\" with version \"{1}\" being loaded from configuration
-VDBService.vdb_deleted=VDB \"{0}\" with version \"{1}\" deleted from VDB Service and configuration
-VDBService.vdb_change_status=VDB \"{0}\" with version \"{1}\" has changed its status from \"{2}\" to \"{3}\" in VDBService
-VDBService.vdb_change_status_failed=VDB \"{0}\" with version \"{1}\" has failed to change its status from \"{2}\" to \"{3}\" in VDBService
-VDBService.connector_binding_changed=VDB \"{0}\" with version \"{1}\" has changed its connection factory for model name \"{2}\" with \"{3}\"
-VDBService.vdb_already_exists=VDB \"{0}\" with version \"{1}\" already exists in the configuration, saving as a new version of the VDB
-VDBService.vdb_deployed=VDB \"{0}\" with version \"{1}\" has been deployed to the Teiid system.
-VDBService.vdb_loded=VDB \"{0}\" with version \"{1}\" has been loaded from the configuration.
-VDBService.vdb_missing_bindings=VDB \"{0}\" with version \"{1}\" is incomplete, it does not have all the connection factories mapped to their physical models.
-VDBService.lookup=VDB \"{0}\" with version \"{1}\" being loaded from configuration
-VDBService.vdb_deleted=VDB \"{0}\" with version \"{1}\" deleted from VDB Service and configuration
-VDBService.connector_binding_changed=VDB \"{0}\" with version \"{1}\" has changed its connection factory for model name {2} with {3}
-VDBService.vdb_already_exists=VDB \"{0}\" with version \"{1}\" already exists in the configuration, saving as a new version of the VDB
-VDBService.vdb_deployed=VDB \"{0}\" with version \"{1}\" has been deployed to the Teiid system.
-VDBService.vdb_loded=VDB \"{0}\" with version \"{1}\" has been loaded from the configuration.
-VDBService.vdb_missing_bindings=VDB \"{0}\" with version \"{1}\" is incomplete, it does not have all the connection factories mapped to their physical models.
-VDBService.vdb_active=VDB \"{0}\" with version \"{1}\" is set to ACTIVE.
-VDBService.validityErrors=Failed to deploy VDB \"{0}\" because it has following validity errors; {1}
-VDBService.vdb_missing_models=VDB \"{0}\" with version \"{1}\" is Invalid; This archive has no models defined.
-DataService.Didnt_find_caps=Unable to find capabilities for {0}
-DataService.Unable_to_find_connector_manager_for_{0}_1=Unable to find connector manager for \"{0}\"
-DataService.Unable_to_find_connector=Invalid Connector name supplied or Connector not found: \"{0}\"
-DataService.System_model_initialze_error=Connection factory for the System Model is not initialized
-DataService.System_model_failed_start=Failed to add the System Model connector to the system
-DataService.failed_to_load_connector=Failed to load the Connection factory with name \"{0}\" in the configuration
-DataService.Connector_State_invalid=Connection factory \"{0}\" failed to start, or did not start correctly. Please check the Connection factory properties. Check the log file for more information.
-DataService.useClassloader=Connector is using the following Classpth to load a new ClassLoader=\"{0}\"
-DataService.Failed_To_Start=Embedded DataService Failed to start. Check the Connection factory proeprties.
-DataService.Failed_Initialize_CM=Failed to Properly initialize the Connector manager for Connection factory \"{0}\"
-DataService.Stopped= Data Service is stopped. All the Connection factories have been stopped.
-DataService.Started=Data Service initialized and started and running..
-DataService.Connector_Stopped=Connector Service \"{0}\" has been stopped
-DataService.Connector_Started=Connector Service \"{0}\" has been started.
-DataService.Connector_Deleted=Connector Service \"{0}\" has been Deleted from the Data Service and Configuration
-DataService.Connector_Added=Connector Service \"{0}\" has been Added to the Data Service and also Configuration
-DataService.Connector_exists=Connection factory with name \"{0}\" already exists. Connector name must be unique.
-DataService.Connector_does_not_exists=Connection factory with name \"{0}\" does not exist in the configuration.
-DataService.Connector_modified=Connection factory with name \"{0}\" has been modified.
-DataService.Connector_Stopped=Connector Service {0} has been stopped
-DataService.Connector_Started=Connector Service {0} has been started.
-DataService.Connector_Deleted=Connector Service {0} has been Deleted from the Data Service and Configuration
-DataService.Connector_Added=Connector Service {0} has been Added to the Data Service and also Configuration
-DataService.Connector_exists_replace=Connection factory with name {0} already exists. The old connector will be replaced with the new connector.
-DataService.Connector_exists=Connection factory with name {0} already exists. Connector name must be unique to add, using the old connector as it is.
-DataService.Connector_does_not_exists=Connection factory with name {0} does not exist in the configuration.
-DataService.Connector_modified=Connection factory with name {0} has been modified.
-DataService.Connector_type_does_not_exists=Connection factory type specified for Connection factory \"{0}\" does not exist in the configuration, add Connector first.
-DataService.ext_module_not_found=Required extension module \"{0}\" not found in the extensions directory. if not using extension modules ignore.
-DataService.Connector_still_used=Connection factory \"{0}\" can not be deleted because it is still in use by VDBs. Remove the assosiation with VDB before deletion.
-DataService.decryption_failed=initialization of the Connection factory \"{0}\" failed because, system failed to decrypt the property \"{1}\"
-DataService.FailedStop=Failed to stop the Connection factory "{0}"
-DataService.FailedStart=Failed to start the Connection factory "{0}"
-DataService.ext_module_not_found=Required extension module {0} not found in the extensions directory. if not using extension modules ignore.
-DataService.Connector_still_used=Connection factory {0} can not be deleted because it is still in use by VDBs. Remove the assosiation with VDB before deletion.
-DataService.Connector_failed_start=Connection factory {0} failed to start, check the properties and start again.
-DataService.no_connectors_defined=No connectors defined for binding
-Failed_To_Service=Failed to get service requested
-VDBReader.Invalid_location=Invalid file location \"{0}\". No VDB files (*.DEF) found
-VDBReader.Archive_not_Found=Archive file \"{0}\" not found, failed to load the VDB.
-VDBReader.validityErrors=Failed to load VDB file \"{0}\" because of following validity errors; {1}
-EmbeddedConfigurationService.no_system_vdb_path=Failed to load the System.VDB, incorrect path \"{0}\"
-EmbeddedConfigurationService.Server_Config_notfound=ServerConfig.xml file not found the location \"{0}\"
-EmbeddedConfigurationService.Server_Config_failedload=Server Configuration file failed to load \"{0}\"
-EmbeddedConfigurationService.Server_Config_notdefined=Server Configuration file is not defined in the properties file
-EmbeddedConfigurationService.Alternate_binding_inuse=Connection factory \"{0}\" is using alternate properties defined in the system configuration file.
-EmbeddedConfigurationService.ConnectorBinding_in_use_failed_delete=Connection factory with Name \"{0}\" is currenlty in use by VDB \"{1}\" with version \"{2}\"; Can not delete; Remove the assosiation first
-#EmbeddedConfigurationService.Alternate_binding_inuse=Connector binding {0} is using alternate properties defined in the system configuration file.
-EmbeddedConfigurationService.ConnectorBinding_in_use_failed_delete=Connection factory with Name {0} is currenlty in use by VDB {1} with version {2}; Can not delete; Remove the assosiation first
-EmbeddedConfigurationService.savingConfiguration=Teiid Configuration is being saved.
-EmbeddedConfigurationService.vdb_delete=VDB with name \"{0}\" and version \"{1}\" is being deleted from the configuration.
-EmbeddedConfigurationService.vdb_delete_failed=configuration service failed to delte VDB with name \"{0}\" and version \"{1}\".
-EmbeddedConfigurationService.vdb_saved=VDB with name \"{0}\" and version \"{1}\" is being saved by the configuration to \"{2}\" file name.
-EmbeddedConfigurationService.add_system_property=Adding a System property \"{0}\" with value \"{1}\" is being added to the configuration.
-EmbeddedConfigurationService.update_system_properties=Adding System properties to the configuration: {0}.
-EmbeddedConfigurationService.connector_save=Connection factory with name \"{0}\" is being saved.
-EmbeddedConfigurationService.connector_delete=Connection factory with name \"{0}\" is being deleted from the configuration.
-EmbeddedConfigurationService.connector_type_save=Connector with name \"{0}\" is being saved to configuration.
-EmbeddedConfigurationService.connector_type_save=Connector with name \"{0}\" is being deleted from configuration.
-EmbeddedConfigurationService.connector_type_delete_failed=Connector with name \"{0}\" failed to delete from configuration as they type is not found in configuration.
-EmbeddedConfigurationService.custom_connectors_restricted=License does not allow adding connectors.
-EmbeddedConfigurationService.Failed_to_load_vdb=Failed to load the VDB \"{0}\" during the initialization of Teiid
-EmbeddedConfigurationService.loaded_vdb=Loaded the VDB \"{0}\" sucessfully into Teiid.
-EmbeddedConfigurationService.not_loaded_vdb=VDB \"{0}\" is not loaded into Teiid due to licensing issues.
-EmbeddedConfigurationService.connector_binding_delete_failed=Delete of Connection factory \"{0}\" failed. Binding not found in the configuration.
-EmbeddedConfigurationService.connector_type_in_use=Delete of Connector \"{0}\" failed. Currently in use by a Connection factory.
-EmbeddedConfigurationService.duplicate_vdb_found=Duplicate VDB \"{0}\" is being loaded. Can not load have multiple VDBs with same name and version.
-EmbeddedConfigurationService.connector_type_delete=Connector \"{0}\" is deleted from the configuration.
-EmbeddedConfigurationService.connectionAdded=Connection added to VDB \"{0}\" with version \"{1}\" with connection id \"{2}\"
-EmbeddedConfigurationService.connectionRemoved=Connection removed from VDB \"{0}\" with version \"{1}\" with connection id \"{2}\"
-EmbeddedConfigurationService.dqp_loading=Teiid instance with instance id \"{0}\" is being loaded.
-EmbeddedConfigurationService.init_encryption=Cryptography libraries are in use and are initialized
-EmbeddedConfigurationService.udf_classspath_failure=Failed to resolve the user defined function''s classpath
-EmbeddedConfigurationService.udf_load=User Defined Functions file \"{0}\" is loaded, using classloader \"{1}\"
-EmbeddedConfigurationService.udf_unload=User Defined Functions file unloaded
-EmbeddedConfigurationService.bindings_exceeded_limit=VDB {1} has {0} Connection factories, that exceeds MetaMatrix license allowed number of Connection factories.
-EmbeddedConfigurationService.Invalid_connector_binding=Can not assign binding "{2}" to VDB "{0}" with "{1}", because it is a private binding from another vdb.
-EmbeddedConfigurationService.connector_binding_deployed=Connection factory {0} deployed
-ExtensionModuleReader.ext_module_failed_to_read=failed to read the extension module \"{0}\" from file system.
-ExtensionModuleReader.ext_module_does_not_exist=Extension module \"{0}\" does not exist in the configuration
-ExtensionModuleWriter.ext_module_save=Extension module with name \"{0}\" is saved to \"{1}\".
-ExtensionModuleWriter.ext_module_already_exists=Extension module \"{0}\" already exists in the configuration failed to delete.
-ExtensionModuleWriter.ext_module_delete_failed=Failed to delete Extension Module \"{0}\"; It may be currently in use by the Teiid, check if is it been un-assigned from all models.
-ExtensionModuleWriter.ext_module_delete=Extension module with name \"{0}\" is being deleted with file \"{1}\".
-UnSupported_object_conversion=This object conversion not supported..
-Admin.Vdb_or_Model_notfound=Requested Vdb or model Name not Found..
-Admin.timeout=Admin request timedout after \"{0}\" minutes
-Admin.invalid_request=Invalid request \"{0}\" is submitted to the Admin API. Please check the API documentation on usage.
-Admin.ext_path_invalid=Extension directory path is wrong or does not exists
-Admin.admin_isnull=Admin Object supplied is null
-Admin.can_not_set_property=Currently setting property on this type of Admin object is not supported.
-Admin.connector_load_failed_wrong_contents=Failed to load the Connection factory with name \"{0}\". Contents supplied are incorrect, check the contents again.
-Admin.connector_load_failed_wrong_type=Failed to load the Connection factory with name \"{0}\". Conntextor Type supplied and Connector used in binding are different.
-Admin.Connector_binding_does_not_exists=Connection factory with name \"{0}\" does not exist in the configuration
-Admin.Connector_type_does_not_exists=Connector with name \"{0}\" does not exist in the configuration
-Admin.ext_module_does_not_exists=Extension Module with name \"{0}\" does not exist in the configuration
-Admin.vdb_does_not_exists=VDB with name \"{0}\" and version \"{1}\" does not exist in the configuration
-Admin.Invalid_ext_source=Source contents supplied for Extension module can not be null.
-Admin.Invalid_ext_source_name=Source name can not be null, use a proper file name with extension as name for the Extension Module.
-Admin.Invalid_cb_name=Connection factory name can not be null, a valid name must be supplied
-Admin.Invalid_cb_source=Connection factory''s source contents can not be null
-Admin.Invalid_ct_name=Connector name can not be null or use of special characters is not allowed, a valid name must be supplied
-Admin.Invalid_ct_source=Connector''s source contents can not be null
-Admin.Invalid_vdb_name=VDB name can not be null or use of special characters is allowed, a valid name must be supplied
-Admin.Invalid_vdb_source=VDB source contents can not be null
-Admin.load_combined_vdb=Loading the VDB file \"{0}\", where DEF/VDB are combined in single source
-Admin.Invalid_model_name=Model name can not be null or use of special characters is not alloed, a valid name must be supplied to identify the model inside the VDB
-Admin.Invalid_identifier=Identifier supplied can not be null and must adhere to the naming patterns; Please check the java docs for the proper naming patterns.
-Admin_invalid_log_listener=Supplied log listener can not be null
-Admin.Invalid_ext_module=Extension module specified is not the JAR type, currently only ".jar" extension modules supported.
-Admin.Connector_type_exists=Connector \"{0}\" already exists; Can not add a duplicate, try delete and add again.
-Admin.extension_module_exists=Extension Module \"{0}\" already exists; Can not add a duplicate, delete first and add again.
-Admin.addBindingEixists=Connection factory \"{0}\" already exists in exists in the configuration, use a unique name for the Connection factory in the given Teiid instance.
-Admin.addBinding_type_exists=Adding Connection factory \"{0}\" failed, because the Connector \"{1}\" already exists, and admin option set to fail on conflict
-Admin.connector_type_not_exists=Connector \"{0}\" does not exists in the configuration, please add Connector.
-Admin.Invalid Request=Request submitted does not match the requirement \"{0}\"
-Admin.No_Objects_Found=No AdminObjects found for identifier {0} and class {1}.
-Admin.Multiple_Objects_Found=Multiple AdminObjects found for identifier {0} and class {1}.
-Admin.Unsupported_Object_Class=AdminObjects class {0} not supported for this operation.
-Admin.bindings_exceeded_limit=You have reached the MetaMatrix license limit of Connection factories, Failed to add Connection factories.
-Admin.cb_doesnot_exist=The Connection factory does not exist:{0}
-Admin.ct_doesnot_exist=The connector 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}
-DQPEmbeddedManager.duplicate_process= There is another process running with same name {0}; Failed to start.
-ServerSecurityAdminImpl.User_name_too_long=The user name may not be null and cannot be longer than {0} charachters
-ServerSecurityAdminImpl.neither_User_nor_Group=Parameter memberType is neither a User nor a Group.
-ServerSecurityAdminImpl.Unable_to_aquire_MembershipObjectEditor=Unable to aquire MembershipObjectEditor.
-ServerSecurityAdminImpl.Cant_use_wildcard=The wildcard cannot be used here.
-ServerSecurityAdminImpl.Non_existant_role=No administrative role exists with the identifier [{0}].
-ServerSecurityAdminImpl.Unknown_principal=Unknown principal: {0}
-ServerSecurityAdminImpl.Empty_props=No properties to set.
-ServerSecurityAdminImpl.Invalid_prop=Property [{0}] is not a valid User property and will not be set.
-ServerSecurityAdminImpl.Invalid_props=One or more properties were not set because they are no valid for a User:
-ServerSecurityAdminImpl.vdbName_can_not_be_null=Supplied VDB name is null
-ServerSecurityAdminImpl.vdbVersion_can_not_be_null=Supplied VDB version is null
-ServerSecurityAdminImpl.no_vdb_exists=No VDB with name {0}.{1} deployed in the system.
-ServerSecurityAdminImpl.not_implemented=This feature not available.
-failed_to_load_admin_roles=Failed to load Admin role permissions
-admin_roles_not_defined=Admin Role permissions are not defined. Refer to admin-roles.properties file
# authorization service
-AuthorizationServiceImpl.invalid_session=The principal with SessionToken <{0}> is invalid.
AuthorizationServiceImpl.wrong_realms = Permission collection contains requests from different realms.
-AuthorizationServiceImpl.error_seraching_policies=An exception occurred while searching for all policy IDs.
-AuthorizationServiceImpl.failed_to_get_groups=Can''t get principal''s groups from Membership service.
-AuthorizationServiceImpl.Authorization_Realm_is_null=The requested Authorization Realm is null
# membership service
MembershipServiceImpl.loaded = Loaded membership domain: "{0}".
MembershipServiceImpl.failed_to_create = Unable to create membership domain {0}
MembershipServiceImpl.unable_to_create = Unable to create membership domain "{0}". Factory class not found in environment properties.
MembershipServiceImpl.invalid_principal = The principal "{0}" is invalid.
-MembershipServiceImpl.Null_authentication=Domain {0} returned a null authentication result for user {1}
-MembershipServiceImpl.Invalid_user=Domain {0} indicated that user {1} was not valid
-MembershipServiceImpl.Unsupported_credentials=Domain {0} indicated that the credentials were not supported
-MembershipServiceImpl.Failed_authentication={0} could not be authenticated in any domain
-MembershipServiceImpl.Root_password_required=password is required for super user
-MembershipServiceImpl.Root_password_decryption_failed=super password could not be decrypted
-MembershipServiceImpl.principal_does_not_exist=The principal ''{0}'' does not exist in domain ''{1}''
-MembershipServiceImpl.Decrypt_failed=Could not decrypt the encrypted password for user ''{0}''
-MembershipServiceImpl.source_exception=Membership Domain ''{0}'' failed to perform the desired operation, please check the settings for this domain
-MembershipServiceImpl.load_error=Could not load file ''{0}'' from the classpath, the file system, or as a URL.
-MembershipServiceImpl.unknown_host=Did not allow root user authentication attempt, since root logons are restricted and could not determine the remote host.
-MembershipServiceImpl.invalid_host=Could not authenticate root user, since the client address {0} is not in the allowed values {1}
MembershipServiceImpl.error_shuting_down = Error shutting down domain after ''killService'' method received.
-MembershipServiceImpl.Logon_failed=log on failed for user {1} on the domain {0}
-LDAPMembershipDomain.No_annonymous=Annonymous user authentications are not allowed in domain {0}
-LDAPMembershipDomain.Required_property=Required property {0} was missing.
-LDAPMembershipDomain.Admin_credentials=Admin DN and/or password supplied for LDAP Membership Domain {0} are invalid.
-LDAPMembershipDomain.Require_memberof_property=Users in LDAP Membership Domain {0} will not appear as members of any group since user's memberOf and group's memberOf attributes are both unspecified.
# session service
@@ -259,25 +55,18 @@
SessionServiceImpl.failed_to_getprincipal = Membership service encountered an error getting the principal for user "{0}".
SessionServiceImpl.expireSession = Expiring session {0}
SessionServiceImpl.keepaliveFailed = Keepalive failed for session {0}
-SessionServiceImpl.Unexpected_error_finding_latest_version_of_Virtual_Database=Unexpected error finding latest version of Virtual Database {0}
-SessionServiceImpl.Unexpected_error_finding_latest_version_of_Virtual_Database_{0}_of_version_{1}=Unexpected error finding latest version of Virtual Database {0} of version {1}
-SessionServiceImpl.Membership_service_could_not_authenticate_user=Membership service could not authenticate user "{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.
SessionServiceImpl.terminateSession = Admin [{0}] is terminating this session: {1}.
no_passthrough_identity_found = Passthrough authentication failed. No authentication information found.
-LogonImpl.Invalid_use_of_credentials_and_token=Conflicting use of both client session token and credentials.
ServerWorkItem.Received_exception_processing_request=Unexpected exception for session {0}
ServerWorkItem.processing_error=Processing exception ''{0}'' for session {1}. Exception type {2} thrown from {3}. Enable more detailed logging to see the entire stacktrace.
ServerWorkItem.Component_Not_Found=Component not found: {0}
SocketTransport.1=Bound to address {0} listening on port {1}
-SocketTransport.2=Problem starting server binding to address {0} and listening on port {1}
-SocketTransport.3=Socket transport is not enabled for Teiid.
-Illegal_access_on_admin=Illegal use of admin based connection by : {0}, {1}
invlaid_vdb_file=Invalid VDB file deployment failed {0}
redeploying_vdb=Re-deploying VDB {0}
validity_errors_in_vdb=VDB has validaity errors; failed to deploy - {0}
@@ -292,7 +81,6 @@
udf_model_not_found=User Defined Function (UDF) model "{0}" not found in the VDB
duplicate_vdb=VDB with given name and version already exists! {0}.{1}
system_vdb_not_found=System.vdb not found in classpath
-failed_to_deployed=Failed to deploy {0}
invalid_udf_file=No "path" information found to load the FUNCTION model {0}; FUNCTION model must have path information.
failed_matadata_load=Failed to load metadata for VDB {0}.{1}
vdb_not_found=VDB {0}.{1} not found deployed.
@@ -315,4 +103,4 @@
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 metadata is currently being loaded. Start Time: {2}
-ambigious_name=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}
\ No newline at end of file
+ambigious_name=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}
14 years, 3 months
- 1
- 0
teiid SVN: r2536 - in branches/7.1.x: runtime/src/main/java/org/teiid/deployers and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2010-09-07 15:22:48 -0400 (Tue, 07 Sep 2010)
New Revision: 2536
Modified:
branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java
branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java
branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
Log:
TEIID-1195 minor changes made reviewing the inactive issue
Modified: branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java 2010-09-07 18:41:05 UTC (rev 2535)
+++ branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java 2010-09-07 19:22:48 UTC (rev 2536)
@@ -285,7 +285,7 @@
}
public String toString() {
- return getName()+VERSION_DELIM+getVersion()+ models.getMap().values(); //$NON-NLS-1$
+ return getName()+VERSION_DELIM+getVersion()+ models.getMap().values();
}
public ModelMetaData getModel(String modelName) {
Modified: branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java
===================================================================
--- branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-09-07 18:41:05 UTC (rev 2535)
+++ branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-09-07 19:22:48 UTC (rev 2536)
@@ -206,10 +206,10 @@
for(Model m:deployment.getModels()) {
ModelMetaData model = (ModelMetaData)m;
List<SourceMappingMetadata> mappings = model.getSourceMappings();
+ if (model.getName().equals(CoreConstants.SYSTEM_MODEL) || model.getName().equals(CoreConstants.ODBC_MODEL)) {
+ continue;
+ }
for (SourceMappingMetadata mapping:mappings) {
- if (mapping.getName().equals(CoreConstants.SYSTEM_MODEL) || model.getName().equals(CoreConstants.ODBC_MODEL)) {
- continue;
- }
ConnectorManager cm = cmr.getConnectorManager(mapping.getName());
String msg = cm.getStausMessage();
if (msg != null && msg.length() > 0) {
@@ -310,7 +310,7 @@
private void loadMetadata(VDBMetaData vdb, ModelMetaData model, boolean cache, File cacheFile, MetadataStoreGroup vdbStore, ConnectorManagerRepository cmr) {
Exception exception = null;
- boolean loaded = false;;
+ boolean loaded = false;
for (String sourceName: model.getSourceNames()) {
ConnectorManager cm = cmr.getConnectorManager(sourceName);
if (cm == null) {
Modified: branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
===================================================================
--- branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2010-09-07 18:41:05 UTC (rev 2535)
+++ branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2010-09-07 19:22:48 UTC (rev 2536)
@@ -44,7 +44,6 @@
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
import org.teiid.metadata.Datatype;
-import org.teiid.metadata.MetadataFactory;
import org.teiid.metadata.MetadataStore;
import org.teiid.query.metadata.TransformationMetadata.Resource;
import org.teiid.runtime.RuntimePlugin;
14 years, 3 months
- 1
- 0
teiid SVN: r2535 - in branches/7.1.x: client/src/main/resources/org/teiid/jdbc and 5 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-09-07 14:41:05 -0400 (Tue, 07 Sep 2010)
New Revision: 2535
Modified:
branches/7.1.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java
branches/7.1.x/client/src/main/resources/org/teiid/jdbc/i18n.properties
branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties
branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties
branches/7.1.x/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java
branches/7.1.x/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties
branches/7.1.x/metadata/src/main/resources/org/teiid/metadata/i18n.properties
Log:
TEIID-1027: missing text
Modified: branches/7.1.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2010-09-07 15:48:49 UTC (rev 2534)
+++ branches/7.1.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2010-09-07 18:41:05 UTC (rev 2535)
@@ -1044,7 +1044,7 @@
public void setMaxFieldSize(int max) throws SQLException {
checkStatement();
if ( max < 0 ) {
- throw new TeiidSQLException(JDBCPlugin.Util.getString("MMStatement.Invalid_field_size")); //$NON-NLS-1$
+ throw new TeiidSQLException(JDBCPlugin.Util.getString("MMStatement.Invalid_field_size", max)); //$NON-NLS-1$
}
this.maxFieldSize = max;
}
Modified: branches/7.1.x/client/src/main/resources/org/teiid/jdbc/i18n.properties
===================================================================
--- branches/7.1.x/client/src/main/resources/org/teiid/jdbc/i18n.properties 2010-09-07 15:48:49 UTC (rev 2534)
+++ branches/7.1.x/client/src/main/resources/org/teiid/jdbc/i18n.properties 2010-09-07 18:41:05 UTC (rev 2535)
@@ -122,7 +122,8 @@
MMStatement.Err_query=Error trying to execute a query statement {0}: {1}
MMStatement.Success_query=Successfully executed a query {0} and obtained results
MMStatement.Err_update=Error trying to execute an Update statement {0}: {1}
-MMStatement.Success_update= Successfully executed an update {0}.
+MMStatement.Success_update= Successfully executed an update {0}.
+MMStatement.Invalid_field_size=Invalid MaxFieldSize {0}
MMBlob.Unable_to_get_bytes_from_pos_to_length._{0}_1=Unable to get bytes from pos to length. {0}
MMBlob.Unable_to_get_the_position_for_the_byte_array._{0}_2=Unable to get the position for the byte array. {0}
MMClob.Unable_to_get_chars_from_pos_to_length._{0}_1=Unable to get chars from pos to length. {0}
Modified: branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties
===================================================================
--- branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties 2010-09-07 15:48:49 UTC (rev 2534)
+++ branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties 2010-09-07 18:41:05 UTC (rev 2535)
@@ -229,4 +229,5 @@
TempTableDataManager.row_refresh_pk=Materialized view {0} cannot have a row refreshed since there is no primary key.
TempTableDataManager.row_refresh_composite=Materialized view {0} cannot have a row refreshed because it uses a composite key.
TempTableDataManager.row_refresh_updatable=Materialized view {0} cannot have a row refreshed because it's cache hint did not specify \"updatable\".
-TempTableDataManager.row_refresh=Refreshing row {1} for materialized view {0}.
\ No newline at end of file
+TempTableDataManager.row_refresh=Refreshing row {1} for materialized view {0}.
+CriteriaPlanner.no_context=No root node found.
\ No newline at end of file
Modified: branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties
===================================================================
--- branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties 2010-09-07 15:48:49 UTC (rev 2534)
+++ branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties 2010-09-07 18:41:05 UTC (rev 2535)
@@ -952,4 +952,7 @@
XMLSystemFunctions.invalid_namespaces=Invalid namespaces supplied for XPath expression - ''{0}''
-TempTable.duplicate_key=Duplicate key
\ No newline at end of file
+TempTable.duplicate_key=Duplicate key
+ValidationVisitor.group_in_both_dep=Table specified in both dependent and independent queries '{0}'
+XMLQuery.resolvingError=Failed to resolve the query '{0}'
+SQLParser.non_position_constant=Invalid order by at {0}
\ No newline at end of file
Modified: branches/7.1.x/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java
===================================================================
--- branches/7.1.x/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java 2010-09-07 15:48:49 UTC (rev 2534)
+++ branches/7.1.x/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java 2010-09-07 18:41:05 UTC (rev 2535)
@@ -383,7 +383,7 @@
info = getView().getTemplate(TranslatorMetaData.TRANSLATOR_PREFIX+templateName);
}
if(info == null) {
- throw new AdminProcessingException(IntegrationPlugin.Util.getString("connector_type_not_found", templateName)); //$NON-NLS-1$
+ throw new AdminProcessingException(IntegrationPlugin.Util.getString("template_not_found", templateName)); //$NON-NLS-1$
}
ArrayList<PropertyDefinition> props = new ArrayList<PropertyDefinition>();
Modified: branches/7.1.x/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties
===================================================================
--- branches/7.1.x/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2010-09-07 15:48:49 UTC (rev 2534)
+++ branches/7.1.x/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2010-09-07 18:41:05 UTC (rev 2535)
@@ -47,4 +47,7 @@
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.
\ No newline at end of file
+datasource_template_not_found=Template {0} for creating the data source is not found.
+jndi_failed=JNDI lookup failed.
+distribute_failed=Deploy of the archive failed {0}
+template_not_found=Template not found for {0}
\ No newline at end of file
Modified: branches/7.1.x/metadata/src/main/resources/org/teiid/metadata/i18n.properties
===================================================================
--- branches/7.1.x/metadata/src/main/resources/org/teiid/metadata/i18n.properties 2010-09-07 15:48:49 UTC (rev 2534)
+++ branches/7.1.x/metadata/src/main/resources/org/teiid/metadata/i18n.properties 2010-09-07 18:41:05 UTC (rev 2535)
@@ -24,4 +24,5 @@
# Note: All new messages should have been looked up before being logged! DON'T use I18nLogManager!
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-TransformationMetadata.0={0} ambiguous, more than one entity matching the same name
\ No newline at end of file
+TransformationMetadata.0={0} ambiguous, more than one entity matching the same name
+exception.wrongFormat=Index file in wrong format
\ No newline at end of file
14 years, 3 months
- 1
- 0
teiid SVN: r2534 - branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin.
by teiid-commits＠lists.jboss.org
Author: tejones
Date: 2010-09-07 11:48:49 -0400 (Tue, 07 Sep 2010)
New Revision: 2534
Modified:
branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/Facet.java
Log:
TEIID-1243: Re-implemented previously removed method. Also, modified logic to support multiple versions of a VDB which was previously unaccounted for.
Modified: branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/Facet.java
===================================================================
--- branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/Facet.java 2010-09-04 03:29:29 UTC (rev 2533)
+++ branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/Facet.java 2010-09-07 15:48:49 UTC (rev 2534)
@@ -21,17 +21,19 @@
*/
package org.teiid.rhq.plugin;
+import java.io.BufferedOutputStream;
import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
import java.io.InputStream;
-import java.util.Collections;
+import java.io.OutputStream;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.naming.NamingException;
-
+import org.apache.commons.io.FileUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.deployers.spi.management.ManagementView;
@@ -49,6 +51,8 @@
import org.rhq.core.domain.configuration.definition.ConfigurationTemplate;
import org.rhq.core.domain.content.PackageDetailsKey;
import org.rhq.core.domain.content.PackageType;
+import org.rhq.core.domain.content.transfer.ContentResponseResult;
+import org.rhq.core.domain.content.transfer.DeployIndividualPackageResponse;
import org.rhq.core.domain.content.transfer.DeployPackageStep;
import org.rhq.core.domain.content.transfer.DeployPackagesResponse;
import org.rhq.core.domain.content.transfer.RemovePackagesResponse;
@@ -72,6 +76,7 @@
import org.rhq.core.pluginapi.measurement.MeasurementFacet;
import org.rhq.core.pluginapi.operation.OperationFacet;
import org.rhq.core.pluginapi.operation.OperationResult;
+import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.plugins.jbossas5.ProfileServiceComponent;
import org.rhq.plugins.jbossas5.connection.ProfileServiceConnection;
import org.teiid.rhq.admin.DQPManagementView;
@@ -85,11 +90,13 @@
* This class implements required RHQ interfaces and provides common logic used
* by all MetaMatrix components.
*/
-public abstract class Facet implements ProfileServiceComponent<ResourceComponent>, MeasurementFacet,
+public abstract class Facet implements
+ ProfileServiceComponent<ResourceComponent>, MeasurementFacet,
OperationFacet, ConfigurationFacet, ContentFacet, DeleteResourceFacet,
CreateChildResourceFacet {
- protected final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
+ protected final Log LOG = LogFactory
+ .getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
/**
* Represents the resource configuration of the custom product being
@@ -113,11 +120,15 @@
private final Log log = LogFactory.getLog(this.getClass());
+ private File deploymentFile;
+ private static final String BACKUP_FILE_EXTENSION = ".rej"; //$NON-NLS-1$
+
/**
* The name of the ManagedDeployment (e.g.:
* C:/opt/jboss-5.0.0.GA/server/default/deploy/foo.vdb).
*/
protected String deploymentName;
+ protected String deploymentUrl;
private PackageVersions versions = null;
@@ -128,12 +139,12 @@
* "vdb". This is still unique within the context of the parent resource
* type and lets this class use the same package type name in both cases.
*/
- private static final String PKG_TYPE_VDB = "vdb";
+ private static final String PKG_TYPE_VDB = "vdb"; //$NON-NLS-1$
/**
* Architecture string used in describing discovered packages.
*/
- private static final String ARCHITECTURE = "noarch";
+ private static final String ARCHITECTURE = "noarch"; //$NON-NLS-1$
abstract String getComponentType();
@@ -149,8 +160,6 @@
deploymentName = context.getResourceKey();
}
-
-
/**
* This is called when the component is being stopped, usually due to the
* plugin container shutting down. You can perform some cleanup here; though
@@ -176,7 +185,7 @@
public void setResourceConfiguration(Configuration resourceConfiguration) {
this.resourceConfiguration = resourceConfiguration;
}
-
+
public String componentType() {
return name;
}
@@ -197,8 +206,8 @@
Configuration configuration, Map<String, Object> argumentMap) {
// moved this logic up to the associated implemented class
throw new InvalidPluginConfigurationException(
- "Not implemented on component type " + this.getComponentType()
- + " named " + this.name);
+ "Not implemented on component type " + this.getComponentType() //$NON-NLS-1$
+ + " named " + this.name); //$NON-NLS-1$
}
@@ -206,12 +215,13 @@
Map<String, Object> argumentMap) {
// moved this logic up to the associated implemented class
throw new InvalidPluginConfigurationException(
- "Not implemented on component type " + this.getComponentType()
- + " named " + this.name);
+ "Not implemented on component type " + this.getComponentType() //$NON-NLS-1$
+ + " named " + this.name); //$NON-NLS-1$
}
- protected void execute(final ProfileServiceConnection connection, final ExecutedResult result, final Map valueMap) {
+ protected void execute(final ProfileServiceConnection connection,
+ final ExecutedResult result, final Map<String, Object> valueMap) {
DQPManagementView dqp = new DQPManagementView();
dqp.executeOperation(connection, result, valueMap);
@@ -262,7 +272,7 @@
*/
public OperationResult invokeOperation(String name,
Configuration configuration) {
- Map valueMap = new HashMap();
+ Map<String, Object> valueMap = new HashMap<String, Object>();
Set operationDefinitionSet = this.resourceContext.getResourceType()
.getOperationDefinitions();
@@ -317,24 +327,27 @@
resourceConfiguration = report.getConfiguration().deepCopy();
Configuration resourceConfig = report.getConfiguration();
-
- ManagementView managementView = null;
+
+ ManagementView managementView = null;
ComponentType componentType = null;
- if (this.getComponentType().equals(PluginConstants.ComponentType.VDB.NAME)) {
+ if (this.getComponentType().equals(
+ PluginConstants.ComponentType.VDB.NAME)) {
componentType = new ComponentType(
PluginConstants.ComponentType.VDB.TYPE,
PluginConstants.ComponentType.VDB.SUBTYPE);
} else {
report.setStatus(ConfigurationUpdateStatus.FAILURE);
- report.setErrorMessage("Update not implemented for the component type.");
+ report
+ .setErrorMessage("Update not implemented for the component type."); //$NON-NLS-1$
}
ManagedComponent managedComponent = null;
report.setStatus(ConfigurationUpdateStatus.SUCCESS);
try {
-
+
managementView = getConnection().getManagementView();
- managedComponent = managementView.getComponent(this.name, componentType);
+ managedComponent = managementView.getComponent(this.name,
+ componentType);
Map<String, ManagedProperty> managedProperties = managedComponent
.getProperties();
@@ -343,16 +356,16 @@
.getResourceType());
try {
- managementView.updateComponent(managedComponent);
+ managementView.updateComponent(managedComponent);
} catch (Exception e) {
- LOG.error("Unable to update component ["
- + managedComponent.getName() + "] of type "
- + componentType + ".", e);
+ LOG.error("Unable to update component [" //$NON-NLS-1$
+ + managedComponent.getName() + "] of type " //$NON-NLS-1$
+ + componentType + ".", e); //$NON-NLS-1$
report.setStatus(ConfigurationUpdateStatus.FAILURE);
report.setErrorMessageFromThrowable(e);
}
} catch (Exception e) {
- LOG.error("Unable to process update request", e);
+ LOG.error("Unable to process update request", e); //$NON-NLS-1$
report.setStatus(ConfigurationUpdateStatus.FAILURE);
report.setErrorMessageFromThrowable(e);
}
@@ -373,11 +386,11 @@
*/
protected void updateComponent(ManagedComponent managedComponent)
throws Exception {
- log.trace("Updating " + this.name + " with component "
- + managedComponent.toString() + "...");
+ log.trace("Updating " + this.name + " with component " //$NON-NLS-1$ //$NON-NLS-2$
+ + managedComponent.toString() + "..."); //$NON-NLS-1$
ManagementView managementView = getConnection().getManagementView();
managementView.updateComponent(managedComponent);
-
+
}
@Override
@@ -386,25 +399,25 @@
DeploymentManager deploymentManager = getConnection()
.getDeploymentManager();
- log.debug("Stopping deployment [" + this.deploymentName + "]...");
+ log.debug("Stopping deployment [" + this.deploymentName + "]..."); //$NON-NLS-1$ //$NON-NLS-2$
DeploymentProgress progress = deploymentManager
.stop(this.deploymentName);
DeploymentStatus stopStatus = DeploymentUtils.run(progress);
if (stopStatus.isFailed()) {
- log.error("Failed to stop deployment '" + this.deploymentName
- + "'.", stopStatus.getFailure());
- throw new Exception("Failed to stop deployment '"
- + this.deploymentName + "' - cause: "
+ log.error("Failed to stop deployment '" + this.deploymentName //$NON-NLS-1$
+ + "'.", stopStatus.getFailure()); //$NON-NLS-1$
+ throw new Exception("Failed to stop deployment '" //$NON-NLS-1$
+ + this.deploymentName + "' - cause: " //$NON-NLS-1$
+ stopStatus.getFailure());
}
- log.debug("Removing deployment [" + this.deploymentName + "]...");
+ log.debug("Removing deployment [" + this.deploymentName + "]..."); //$NON-NLS-1$ //$NON-NLS-2$
progress = deploymentManager.remove(this.deploymentName);
DeploymentStatus removeStatus = DeploymentUtils.run(progress);
if (removeStatus.isFailed()) {
- log.error("Failed to remove deployment '" + this.deploymentName
- + "'.", removeStatus.getFailure());
- throw new Exception("Failed to remove deployment '"
- + this.deploymentName + "' - cause: "
+ log.error("Failed to remove deployment '" + this.deploymentName //$NON-NLS-1$
+ + "'.", removeStatus.getFailure()); //$NON-NLS-1$
+ throw new Exception("Failed to remove deployment '" //$NON-NLS-1$
+ + this.deploymentName + "' - cause: " //$NON-NLS-1$
+ removeStatus.getFailure());
}
@@ -414,13 +427,257 @@
public DeployPackagesResponse deployPackages(
Set<ResourcePackageDetails> packages,
ContentServices contentServices) {
- return null;
+ // You can only update the one application file referenced by this
+ // resource, so punch out if multiple are
+ // specified.
+ if (packages.size() != 1) {
+ log
+ .warn("Request to update a VDB file contained multiple packages: " //$NON-NLS-1$
+ + packages);
+ DeployPackagesResponse response = new DeployPackagesResponse(
+ ContentResponseResult.FAILURE);
+ response
+ .setOverallRequestErrorMessage("When updating a VDB, only one VDB can be updated at a time."); //$NON-NLS-1$
+ return response;
+ }
+
+ ResourcePackageDetails packageDetails = packages.iterator().next();
+
+ log.debug("Updating VDB file '" + this.deploymentFile + "' using [" //$NON-NLS-1$ //$NON-NLS-2$
+ + packageDetails + "]..."); //$NON-NLS-1$
+
+ log.debug("Writing new VDB bits to temporary file..."); //$NON-NLS-1$
+ File tempFile;
+ try {
+ tempFile = writeNewAppBitsToTempFile(contentServices,
+ packageDetails);
+ } catch (Exception e) {
+ return failApplicationDeployment(
+ "Error writing new application bits to temporary file - cause: " //$NON-NLS-1$
+ + e, packageDetails);
+ }
+ log.debug("Wrote new VDB bits to temporary file '" + tempFile //$NON-NLS-1$
+ + "'."); //$NON-NLS-1$
+
+ boolean deployExploded = this.deploymentFile.isDirectory();
+
+ // Backup the original app file/dir to <filename>.rej.
+ File backupOfOriginalFile = new File(this.deploymentFile.getPath()
+ + BACKUP_FILE_EXTENSION);
+ log.debug("Backing up existing VDB '" + this.deploymentFile //$NON-NLS-1$
+ + "' to '" + backupOfOriginalFile + "'..."); //$NON-NLS-1$ //$NON-NLS-2$
+ try {
+ if (backupOfOriginalFile.exists())
+ FileUtils.forceDelete(backupOfOriginalFile);
+ if (this.deploymentFile.isDirectory())
+ FileUtils.copyDirectory(this.deploymentFile,
+ backupOfOriginalFile, true);
+ else
+ FileUtils.copyFile(this.deploymentFile, backupOfOriginalFile,
+ true);
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to backup existing EAR/WAR '" //$NON-NLS-1$
+ + this.deploymentFile + "' to '" + backupOfOriginalFile //$NON-NLS-1$
+ + "'."); //$NON-NLS-1$
+ }
+
+ // Now stop the original app.
+ try {
+ DeploymentManager deploymentManager = getConnection()
+ .getDeploymentManager();
+ DeploymentProgress progress = deploymentManager
+ .stop(this.deploymentUrl);
+ DeploymentUtils.run(progress);
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to stop deployment [" //$NON-NLS-1$
+ + this.deploymentUrl + "].", e); //$NON-NLS-1$
+ }
+
+ // And then remove it (this will delete the physical file/dir from the
+ // deploy dir).
+ try {
+ DeploymentManager deploymentManager = getConnection()
+ .getDeploymentManager();
+ DeploymentProgress progress = deploymentManager
+ .remove(this.deploymentUrl);
+ DeploymentUtils.run(progress);
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to remove deployment [" //$NON-NLS-1$
+ + this.deploymentUrl + "].", e); //$NON-NLS-1$
+ }
+
+ // Deploy away!
+ log.debug("Deploying '" + tempFile + "'..."); //$NON-NLS-1$ //$NON-NLS-2$
+ DeploymentManager deploymentManager = getConnection()
+ .getDeploymentManager();
+ try {
+ DeploymentUtils.deployArchive(deploymentManager, tempFile,
+ deployExploded);
+ } catch (Exception e) {
+ // Deploy failed - rollback to the original app file...
+ log.debug("Redeploy failed - rolling back to original archive...", //$NON-NLS-1$
+ e);
+ String errorMessage = ThrowableUtil.getAllMessages(e);
+ try {
+ // Delete the new app, which failed to deploy.
+ FileUtils.forceDelete(this.deploymentFile);
+ // Need to re-deploy the original file - this generally should
+ // succeed.
+ DeploymentUtils.deployArchive(deploymentManager,
+ backupOfOriginalFile, deployExploded);
+ errorMessage += " ***** ROLLED BACK TO ORIGINAL APPLICATION FILE. *****"; //$NON-NLS-1$
+ } catch (Exception e1) {
+ log.debug("Rollback failed!", e1); //$NON-NLS-1$
+ errorMessage += " ***** FAILED TO ROLLBACK TO ORIGINAL APPLICATION FILE. *****: " //$NON-NLS-1$
+ + ThrowableUtil.getAllMessages(e1);
+ }
+ log.info("Failed to update VDB file '" + this.deploymentFile //$NON-NLS-1$
+ + "' using [" + packageDetails + "]."); //$NON-NLS-1$ //$NON-NLS-2$
+ return failApplicationDeployment(errorMessage, packageDetails);
+ }
+
+ // Deploy was successful!
+
+ deleteBackupOfOriginalFile(backupOfOriginalFile);
+ persistApplicationVersion(packageDetails, this.deploymentFile);
+
+ DeployPackagesResponse response = new DeployPackagesResponse(
+ ContentResponseResult.SUCCESS);
+ DeployIndividualPackageResponse packageResponse = new DeployIndividualPackageResponse(
+ packageDetails.getKey(), ContentResponseResult.SUCCESS);
+ response.addPackageResponse(packageResponse);
+
+ log.debug("Updated VDB file '" + this.deploymentFile //$NON-NLS-1$
+ + "' successfully - returning response [" + response + "]..."); //$NON-NLS-1$ //$NON-NLS-2$
+
+ return response;
}
+ private void deleteBackupOfOriginalFile(File backupOfOriginalFile) {
+ log.debug("Deleting backup of original file '" + backupOfOriginalFile //$NON-NLS-1$
+ + "'..."); //$NON-NLS-1$
+ try {
+ FileUtils.forceDelete(backupOfOriginalFile);
+ } catch (Exception e) {
+ // not critical.
+ log.warn("Failed to delete backup of original file: " //$NON-NLS-1$
+ + backupOfOriginalFile);
+ }
+ }
+
+ private void persistApplicationVersion(ResourcePackageDetails packageDetails, File appFile)
+ {
+ String packageName = appFile.getName();
+ log.debug("Persisting application version '" + packageDetails.getVersion() + "' for package '" + packageName //$NON-NLS-1$ //$NON-NLS-2$
+ + "'"); //$NON-NLS-1$
+ PackageVersions versions = loadPackageVersions();
+ versions.putVersion(packageName, packageDetails.getVersion());
+ }
+
+ private File writeNewAppBitsToTempFile(ContentServices contentServices,
+ ResourcePackageDetails packageDetails) throws Exception {
+ File tempDir = this.resourceContext.getTemporaryDirectory();
+ File tempFile = new File(tempDir, this.deploymentFile.getName());
+
+ OutputStream tempOutputStream = null;
+ try {
+ tempOutputStream = new BufferedOutputStream(new FileOutputStream(
+ tempFile));
+ long bytesWritten = contentServices.downloadPackageBits(
+ this.resourceContext.getContentContext(), packageDetails
+ .getKey(), tempOutputStream, true);
+ log
+ .debug("Wrote " + bytesWritten + " bytes to '" + tempFile //$NON-NLS-1$ //$NON-NLS-2$
+ + "'."); //$NON-NLS-1$
+ } catch (IOException e) {
+ log.error(
+ "Error writing updated application bits to temporary location: " //$NON-NLS-1$
+ + tempFile, e);
+ throw e;
+ } finally {
+ if (tempOutputStream != null) {
+ try {
+ tempOutputStream.close();
+ } catch (IOException e) {
+ log.error("Error closing temporary output stream", e); //$NON-NLS-1$
+ }
+ }
+ }
+ if (!tempFile.exists()) {
+ log.error("Temporary file for application update not written to: " //$NON-NLS-1$
+ + tempFile);
+ throw new Exception();
+ }
+ return tempFile;
+ }
+
+ /**
+ * Creates the necessary transfer objects to report a failed application
+ * deployment (update).
+ *
+ * @param errorMessage
+ * reason the deploy failed
+ * @param packageDetails
+ * describes the update being made
+ * @return response populated to reflect a failure
+ */
+ private DeployPackagesResponse failApplicationDeployment(
+ String errorMessage, ResourcePackageDetails packageDetails) {
+ DeployPackagesResponse response = new DeployPackagesResponse(
+ ContentResponseResult.FAILURE);
+
+ DeployIndividualPackageResponse packageResponse = new DeployIndividualPackageResponse(
+ packageDetails.getKey(), ContentResponseResult.FAILURE);
+ packageResponse.setErrorMessage(errorMessage);
+
+ response.addPackageResponse(packageResponse);
+
+ return response;
+ }
+
@Override
public Set<ResourcePackageDetails> discoverDeployedPackages(PackageType arg0) {
- // Teiid does not support the versions yet.
- return Collections.EMPTY_SET;
+
+ // PLEASE DO NOT REMOVE THIS METHOD. IT IS REQUIRED FOR THE CONTENT TAB.
+
+ Configuration pluginConfig = this.resourceContext
+ .getPluginConfiguration();
+ this.deploymentUrl = pluginConfig.getSimple("url").getStringValue(); //$NON-NLS-1$
+
+ if (this.deploymentUrl != null) {
+ this.deploymentFile = new File(this.deploymentUrl
+ .substring(deploymentUrl.indexOf(":/") + 1)); //$NON-NLS-1$
+ }
+
+ if (!deploymentFile.exists())
+ throw new IllegalStateException("Deployment file '" //$NON-NLS-1$
+ + this.deploymentFile + "' for " + this.getComponentType() //$NON-NLS-1$
+ + " does not exist."); //$NON-NLS-1$
+
+ String fileName = deploymentFile.getName();
+ org.rhq.core.pluginapi.content.version.PackageVersions packageVersions = loadPackageVersions();
+ String version = packageVersions.getVersion(fileName);
+ if (version == null) {
+ // This is either the first time we've discovered this VDB, or
+ // someone purged the PC's data dir.
+ version = "1.0"; //$NON-NLS-1$
+ packageVersions.putVersion(fileName, version);
+ packageVersions.saveToDisk();
+ }
+
+ // Package name is the deployment's file name (e.g. foo.ear).
+ PackageDetailsKey key = new PackageDetailsKey(fileName, version,
+ PKG_TYPE_VDB, ARCHITECTURE);
+ ResourcePackageDetails packageDetails = new ResourcePackageDetails(key);
+ packageDetails.setFileName(fileName);
+ packageDetails.setLocation(deploymentFile.getPath());
+ if (!deploymentFile.isDirectory())
+ packageDetails.setFileSize(deploymentFile.length());
+ packageDetails.setFileCreatedDate(null);
+ Set<ResourcePackageDetails> packages = new HashSet<ResourcePackageDetails>();
+ packages.add(packageDetails);
+
+ return packages;
}
@Override
@@ -459,11 +716,11 @@
@Override
public CreateResourceReport createResource(CreateResourceReport report) {
ResourceType resourceType = report.getResourceType();
-// if (resourceType.getName().equals("Translators")) {
-// createConfigurationBasedResource(report);
-// } else {
- createContentBasedResource(report);
-// }
+ // if (resourceType.getName().equals("Translators")) {
+ // createConfigurationBasedResource(report);
+ // } else {
+ createContentBasedResource(report);
+ // }
return report;
}
@@ -481,12 +738,12 @@
ManagementView managementView = null;
;
managementView = getConnection().getManagementView();
-
- if (ProfileServiceUtil.isManagedComponent(getConnection(), resourceName,
- componentType)) {
+
+ if (ProfileServiceUtil.isManagedComponent(getConnection(),
+ resourceName, componentType)) {
createResourceReport.setStatus(CreateResourceStatus.FAILURE);
- createResourceReport.setErrorMessage("A " + resourceType.getName()
- + " named '" + resourceName + "' already exists.");
+ createResourceReport.setErrorMessage("A " + resourceType.getName() //$NON-NLS-1$
+ + " named '" + resourceName + "' already exists."); //$NON-NLS-1$ //$NON-NLS-2$
return createResourceReport;
}
@@ -499,7 +756,6 @@
String templateName = templateNameProperty.getStringValue();
DeploymentTemplateInfo template;
- Set templateNamesSet = managementView.getTemplateNames();
try {
template = managementView.getTemplate(templateName);
Map<String, ManagedProperty> managedProperties = template
@@ -508,26 +764,26 @@
ProfileServiceUtil.convertConfigurationToManagedProperties(
managedProperties, resourceConfig, resourceType);
- LOG.debug("Applying template [" + templateName
- + "] to create ManagedComponent of type [" + componentType
- + "]...");
+ LOG.debug("Applying template [" + templateName //$NON-NLS-1$
+ + "] to create ManagedComponent of type [" + componentType //$NON-NLS-1$
+ + "]..."); //$NON-NLS-1$
try {
managementView.applyTemplate(resourceName, template);
managementView.process();
createResourceReport.setStatus(CreateResourceStatus.SUCCESS);
} catch (Exception e) {
- LOG.error("Unable to apply template [" + templateName
- + "] to create ManagedComponent of type "
- + componentType + ".", e);
+ LOG.error("Unable to apply template [" + templateName //$NON-NLS-1$
+ + "] to create ManagedComponent of type " //$NON-NLS-1$
+ + componentType + ".", e); //$NON-NLS-1$
createResourceReport.setStatus(CreateResourceStatus.FAILURE);
createResourceReport.setException(e);
}
} catch (NoSuchDeploymentException e) {
- LOG.error("Unable to find template [" + templateName + "].", e);
+ LOG.error("Unable to find template [" + templateName + "].", e); //$NON-NLS-1$ //$NON-NLS-2$
createResourceReport.setStatus(CreateResourceStatus.FAILURE);
createResourceReport.setException(e);
} catch (Exception e) {
- LOG.error("Unable to process create request", e);
+ LOG.error("Unable to process create request", e); //$NON-NLS-1$
createResourceReport.setStatus(CreateResourceStatus.FAILURE);
createResourceReport.setException(e);
}
@@ -551,8 +807,8 @@
resourceContext.getResourceType())) {
createResourceReport.setStatus(CreateResourceStatus.FAILURE);
createResourceReport
- .setErrorMessage("Incorrect extension specified on filename ["
- + archivePath + "]");
+ .setErrorMessage("Incorrect extension specified on filename [" //$NON-NLS-1$
+ + archivePath + "]"); //$NON-NLS-1$
}
@@ -567,7 +823,7 @@
createResourceReport.setStatus(CreateResourceStatus.SUCCESS);
} catch (Throwable t) {
- log.error("Error deploying application for report: "
+ log.error("Error deploying application for report: " //$NON-NLS-1$
+ createResourceReport, t);
createResourceReport.setStatus(CreateResourceStatus.FAILURE);
createResourceReport.setException(t);
@@ -581,15 +837,15 @@
.getSimple(TranslatorComponent.Config.RESOURCE_NAME);
if (resourceNameProp == null
|| resourceNameProp.getStringValue() == null)
- throw new IllegalStateException("Property ["
+ throw new IllegalStateException("Property [" //$NON-NLS-1$
+ TranslatorComponent.Config.RESOURCE_NAME
- + "] is not defined in the default plugin configuration.");
+ + "] is not defined in the default plugin configuration."); //$NON-NLS-1$
String resourceNamePropName = resourceNameProp.getStringValue();
PropertySimple propToUseAsResourceName = resourceConfig
.getSimple(resourceNamePropName);
if (propToUseAsResourceName == null)
- throw new IllegalStateException("Property [" + resourceNamePropName
- + "] is not defined in initial Resource configuration.");
+ throw new IllegalStateException("Property [" + resourceNamePropName //$NON-NLS-1$
+ + "] is not defined in initial Resource configuration."); //$NON-NLS-1$
return propToUseAsResourceName.getStringValue();
}
@@ -597,9 +853,9 @@
ComponentType componentType = ProfileServiceUtil
.getComponentType(resourceType);
if (componentType == null)
- throw new IllegalStateException("Unable to map " + resourceType
- + " to a ComponentType.");
- return componentType.getType() + ":" + componentType.getSubtype() + ":"
+ throw new IllegalStateException("Unable to map " + resourceType //$NON-NLS-1$
+ + " to a ComponentType."); //$NON-NLS-1$
+ return componentType.getType() + ":" + componentType.getSubtype() + ":" //$NON-NLS-1$ //$NON-NLS-2$
+ resourceName;
}
@@ -615,9 +871,9 @@
File dataDirectoryFile = resourceContext.getDataDirectory();
dataDirectoryFile.mkdirs();
String dataDirectory = dataDirectoryFile.getAbsolutePath();
- log.trace("Creating application versions store with plugin name ["
- + pluginName + "] and data directory [" + dataDirectory
- + "]");
+ log.trace("Creating application versions store with plugin name [" //$NON-NLS-1$
+ + pluginName + "] and data directory [" + dataDirectory //$NON-NLS-1$
+ + "]"); //$NON-NLS-1$
this.versions = new PackageVersions(pluginName, dataDirectory);
this.versions.loadFromDisk();
}
14 years, 3 months
- 1
- 0
Teiid-NightlyBuild - Build # 939 - Failure!
by jboss-qa-internal＠redhat.com
Teiid-NightlyBuild - Build # 939 - Failure:
Check console output at http://hudson.qa.jboss.com/hudson/job/Teiid-NightlyBuild/939/ to view the results.
14 years, 3 months
- 1
- 1
teiid SVN: r2533 - in branches/7.1.x/engine/src: test/java/org/teiid/dqp/internal/process and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-09-03 23:29:29 -0400 (Fri, 03 Sep 2010)
New Revision: 2533
Modified:
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java
branches/7.1.x/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPWorkContext.java
Log:
TEIID-1247: The policies for the logged in user were cached in the DQP Context. If session was reset the policies were not reset. Fixed the issue.
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java 2010-09-03 22:22:18 UTC (rev 2532)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java 2010-09-04 03:29:29 UTC (rev 2533)
@@ -82,6 +82,7 @@
public void setSession(SessionMetadata session) {
this.session = session;
+ this.policies = null;
}
public void setSecurityHelper(SecurityHelper securityHelper) {
Modified: branches/7.1.x/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPWorkContext.java
===================================================================
--- branches/7.1.x/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPWorkContext.java 2010-09-03 22:22:18 UTC (rev 2532)
+++ branches/7.1.x/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPWorkContext.java 2010-09-04 03:29:29 UTC (rev 2533)
@@ -22,6 +22,11 @@
package org.teiid.dqp.internal.process;
+import java.util.Map;
+
+import org.mockito.Mockito;
+import org.teiid.adminapi.DataPolicy;
+import org.teiid.adminapi.impl.SessionMetadata;
import org.teiid.core.util.UnitTestUtil;
import junit.framework.TestCase;
@@ -58,4 +63,16 @@
assertEquals("querybuilder", copy.getAppName()); //$NON-NLS-1$
}
+
+ public void testClearPolicies() {
+ DQPWorkContext message = new DQPWorkContext();
+ message.setSession(Mockito.mock(SessionMetadata.class));
+ Map<String, DataPolicy> map = message.getAllowedDataPolicies();
+ map.put("role", Mockito.mock(DataPolicy.class)); //$NON-NLS-1$
+ assertFalse(map.isEmpty());
+
+ message.setSession(Mockito.mock(SessionMetadata.class));
+ map = message.getAllowedDataPolicies();
+ assertTrue(map.isEmpty());
+ }
}
14 years, 3 months
- 1
- 0
teiid SVN: r2532 - in branches/7.1.x/documentation: client-developers-guide/src/main/docbook/en-US/content and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-09-03 18:22:18 -0400 (Fri, 03 Sep 2010)
New Revision: 2532
Modified:
branches/7.1.x/documentation/admin-guide/src/main/docbook/en-US/content/security.xml
branches/7.1.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml
Log:
TEIID-1247: some doc changes regarding the pass through.
Modified: branches/7.1.x/documentation/admin-guide/src/main/docbook/en-US/content/security.xml
===================================================================
--- branches/7.1.x/documentation/admin-guide/src/main/docbook/en-US/content/security.xml 2010-09-03 22:20:34 UTC (rev 2531)
+++ branches/7.1.x/documentation/admin-guide/src/main/docbook/en-US/content/security.xml 2010-09-03 22:22:18 UTC (rev 2532)
@@ -29,7 +29,7 @@
application's security domain name in the "teiid-jboss-beans.xml" file in the SessionService section.
Please note that for this to work, the security-domain
must be a JAAS based Login Module and your client application MUST obtain Teiid connection
- using <emphasis>Local</emphasis> Connection.</para>
+ using <emphasis>Local</emphasis> Connection, with <emphasis>PassthroughAuthentication=true</emphasis> flag set.</para>
</section>
</section>
<section>
Modified: branches/7.1.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml
===================================================================
--- branches/7.1.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml 2010-09-03 22:20:34 UTC (rev 2531)
+++ branches/7.1.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml 2010-09-03 22:22:18 UTC (rev 2532)
@@ -218,7 +218,7 @@
<entry>
<code>boolean</code>
</entry>
- <entry>Only applies to embedded connections. When this option is set to "true", then Teiid looks for
+ <entry>Only applies to "local" connections. When this option is set to "true", then Teiid looks for
already authenticated security context on the calling thread. If one found it uses that users credentials
to create session. Teiid also verifies that the same user is using this connection during the life of the connection.
if it finds a different security context on the calling thread, it switches the identity on the connection,
@@ -339,7 +339,7 @@
<entry>
<code>boolean</code>
</entry>
- <entry>Only applies to embedded connections. When this option is set to "true", then Teiid looks for
+ <entry>Only applies to "local" connections. When this option is set to "true", then Teiid looks for
already authenticated security context on the calling thread. If one found it uses that users credentials
to create session. Teiid also verifies that the same user is using this connection during the life of the connection.
if it finds a different security context on the calling thread, it switches the identity on the connection,
14 years, 3 months
- 1
- 0
teiid SVN: r2531 - in branches/7.1.x: connectors/connector-file/src/main/java/org/teiid/resource/adapter/file and 3 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-09-03 18:20:34 -0400 (Fri, 03 Sep 2010)
New Revision: 2531
Modified:
branches/7.1.x/api/src/main/java/org/teiid/resource/spi/BasicManagedConnectionFactory.java
branches/7.1.x/api/src/main/java/org/teiid/resource/spi/WrappedConnection.java
branches/7.1.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file/FileManagedConnectionFactory.java
branches/7.1.x/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesForceManagedConnectionFactory.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java
branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties
Log:
TEIID-1244: The Teiid based connection factories were not correctly wired in for the managed connection, as seems to be regression at some point in the past, thus the issue. The error is fixed now the connection management is done through the pool.
Modified: branches/7.1.x/api/src/main/java/org/teiid/resource/spi/BasicManagedConnectionFactory.java
===================================================================
--- branches/7.1.x/api/src/main/java/org/teiid/resource/spi/BasicManagedConnectionFactory.java 2010-09-03 16:14:36 UTC (rev 2530)
+++ branches/7.1.x/api/src/main/java/org/teiid/resource/spi/BasicManagedConnectionFactory.java 2010-09-03 22:20:34 UTC (rev 2531)
@@ -47,11 +47,11 @@
private BasicResourceAdapter ra;
@Override
- public abstract Object createConnectionFactory() throws ResourceException;
+ public abstract BasicConnectionFactory createConnectionFactory() throws ResourceException;
@Override
- public Object createConnectionFactory(ConnectionManager arg0) throws ResourceException {
- return createConnectionFactory();
+ public Object createConnectionFactory(ConnectionManager cm) throws ResourceException {
+ return new WrappedConnectionFactory(createConnectionFactory(), cm, this);
}
@Override
Modified: branches/7.1.x/api/src/main/java/org/teiid/resource/spi/WrappedConnection.java
===================================================================
--- branches/7.1.x/api/src/main/java/org/teiid/resource/spi/WrappedConnection.java 2010-09-03 16:14:36 UTC (rev 2530)
+++ branches/7.1.x/api/src/main/java/org/teiid/resource/spi/WrappedConnection.java 2010-09-03 22:20:34 UTC (rev 2531)
@@ -69,5 +69,9 @@
public ResultSetInfo getResultSetInfo() throws ResourceException {
return this.mc.getConnection().getResultSetInfo();
}
+
+ public Connection unwrap() throws ResourceException {
+ return this.mc.getConnection();
+ }
}
Modified: branches/7.1.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file/FileManagedConnectionFactory.java
===================================================================
--- branches/7.1.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file/FileManagedConnectionFactory.java 2010-09-03 16:14:36 UTC (rev 2530)
+++ branches/7.1.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file/FileManagedConnectionFactory.java 2010-09-03 22:20:34 UTC (rev 2531)
@@ -37,7 +37,7 @@
private String parentDirectory;
@Override
- public Object createConnectionFactory() throws ResourceException {
+ public BasicConnectionFactory createConnectionFactory() throws ResourceException {
if (this.parentDirectory == null) {
throw new InvalidPropertyException(UTIL.getString("parentdirectory_not_set")); //$NON-NLS-1$
}
Modified: branches/7.1.x/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesForceManagedConnectionFactory.java
===================================================================
--- branches/7.1.x/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesForceManagedConnectionFactory.java 2010-09-03 16:14:36 UTC (rev 2530)
+++ branches/7.1.x/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesForceManagedConnectionFactory.java 2010-09-03 22:20:34 UTC (rev 2531)
@@ -95,7 +95,7 @@
}
@Override
- public Object createConnectionFactory() throws ResourceException {
+ public BasicConnectionFactory createConnectionFactory() throws ResourceException {
return new BasicConnectionFactory() {
@Override
public SalesforceConnectionImpl getConnection() throws ResourceException {
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java 2010-09-03 16:14:36 UTC (rev 2530)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java 2010-09-03 22:20:34 UTC (rev 2531)
@@ -33,6 +33,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import javax.resource.ResourceException;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.util.Assertion;
@@ -51,6 +52,7 @@
import org.teiid.query.optimizer.capabilities.SourceCapabilities;
import org.teiid.query.optimizer.capabilities.SourceCapabilities.Scope;
import org.teiid.query.sql.lang.Command;
+import org.teiid.resource.spi.WrappedConnection;
import org.teiid.translator.ExecutionContext;
import org.teiid.translator.ExecutionFactory;
import org.teiid.translator.TranslatorException;
@@ -102,8 +104,18 @@
MetadataFactory factory = new MetadataFactory(modelName, datatypes, importProperties);
Object connectionFactory = getConnectionFactory();
Object connection = executionFactory.getConnection(connectionFactory);
+ Object unwrapped = null;
+
+ if (connection instanceof WrappedConnection) {
+ try {
+ unwrapped = ((WrappedConnection)connection).unwrap();
+ } catch (ResourceException e) {
+ throw new TranslatorException(DQPPlugin.Util.getString("failed_to_unwrap_connection")); //$NON-NLS-1$
+ }
+ }
+
try {
- executionFactory.getMetadata(factory, connection);
+ executionFactory.getMetadata(factory, (unwrapped == null) ? connection:unwrapped);
} finally {
executionFactory.closeConnection(connection, connectionFactory);
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java 2010-09-03 16:14:36 UTC (rev 2530)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java 2010-09-03 22:20:34 UTC (rev 2531)
@@ -27,6 +27,8 @@
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
+import javax.resource.ResourceException;
+
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.common.buffer.BlockedException;
import org.teiid.common.buffer.TupleBuffer;
@@ -47,6 +49,7 @@
import org.teiid.query.metadata.TempMetadataStore;
import org.teiid.query.sql.lang.Command;
import org.teiid.query.sql.lang.StoredProcedure;
+import org.teiid.resource.spi.WrappedConnection;
import org.teiid.translator.DataNotAvailableException;
import org.teiid.translator.Execution;
import org.teiid.translator.ExecutionFactory;
@@ -193,6 +196,16 @@
try {
this.connectionFactory = this.manager.getConnectionFactory();
this.connection = this.connector.getConnection(this.connectionFactory);
+
+ Object unwrapped = null;
+ if (connection instanceof WrappedConnection) {
+ try {
+ unwrapped = ((WrappedConnection)connection).unwrap();
+ } catch (ResourceException e) {
+ throw new TranslatorException(DQPPlugin.Util.getString("failed_to_unwrap_connection")); //$NON-NLS-1$
+ }
+ }
+
// Translate the command
Command command = this.requestMsg.getCommand();
this.expectedColumns = command.getProjectedSymbols().size();
@@ -202,7 +215,7 @@
RuntimeMetadata rmd = new RuntimeMetadataImpl(queryMetadata);
// Create the execution based on mode
- final Execution exec = connector.createExecution(this.translatedCommand, this.securityContext, rmd, this.connection);
+ final Execution exec = connector.createExecution(this.translatedCommand, this.securityContext, rmd, (unwrapped == null) ? this.connection:unwrapped);
if (this.translatedCommand instanceof Call) {
this.execution = Assertion.isInstanceOf(exec, ProcedureExecution.class, "Call Executions are expected to be ProcedureExecutions"); //$NON-NLS-1$
StoredProcedure proc = (StoredProcedure)command;
Modified: branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties
===================================================================
--- branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties 2010-09-03 16:14:36 UTC (rev 2530)
+++ branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties 2010-09-03 22:20:34 UTC (rev 2531)
@@ -524,4 +524,5 @@
RequestWorkItem.cache_nondeterministic=Caching command '{0}'' at a session level, but less deterministic functions were evaluated.
not_found_cache=Results not found in cache
-failed_to_put_in_cache=Failed to put results in the cache
\ No newline at end of file
+failed_to_put_in_cache=Failed to put results in the cache
+failed_to_unwrap_connection=Failed to unwrap the source connection.
\ No newline at end of file
14 years, 3 months
- 1
- 0
teiid SVN: r2530 - in branches/7.1.x/console/src/main: java/org/teiid/rhq/plugin/util and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: tejones
Date: 2010-09-03 12:14:36 -0400 (Fri, 03 Sep 2010)
New Revision: 2530
Added:
branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/DataRoleComponent.java
branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/DataRoleDiscoveryComponent.java
Modified:
branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/util/PluginConstants.java
branches/7.1.x/console/src/main/resources/META-INF/rhq-plugin.xml
Log:
TEIID-1228: Added Data Role resource node under VDB Resource
Added: branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/DataRoleComponent.java
===================================================================
--- branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/DataRoleComponent.java (rev 0)
+++ branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/DataRoleComponent.java 2010-09-03 16:14:36 UTC (rev 2530)
@@ -0,0 +1,287 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+package org.teiid.rhq.plugin;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.naming.NamingException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.deployers.spi.management.ManagementView;
+import org.jboss.managed.api.ComponentType;
+import org.jboss.managed.api.ManagedComponent;
+import org.jboss.managed.api.ManagedObject;
+import org.jboss.managed.api.ManagedProperty;
+import org.jboss.managed.plugins.ManagedObjectImpl;
+import org.jboss.metatype.api.types.MetaType;
+import org.jboss.metatype.api.types.SimpleMetaType;
+import org.jboss.metatype.api.values.CollectionValueSupport;
+import org.jboss.metatype.api.values.CompositeValueSupport;
+import org.jboss.metatype.api.values.EnumValueSupport;
+import org.jboss.metatype.api.values.GenericValue;
+import org.jboss.metatype.api.values.GenericValueSupport;
+import org.jboss.metatype.api.values.MetaValue;
+import org.jboss.metatype.api.values.MetaValueFactory;
+import org.jboss.metatype.api.values.SimpleValue;
+import org.jboss.metatype.api.values.SimpleValueSupport;
+import org.mc4j.ems.connection.EmsConnection;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.ConfigurationUpdateStatus;
+import org.rhq.core.domain.configuration.Property;
+import org.rhq.core.domain.configuration.PropertyList;
+import org.rhq.core.domain.configuration.PropertyMap;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.domain.measurement.MeasurementDataNumeric;
+import org.rhq.core.domain.measurement.MeasurementDataTrait;
+import org.rhq.core.domain.measurement.MeasurementReport;
+import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
+import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
+import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
+import org.rhq.core.pluginapi.inventory.CreateResourceReport;
+import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
+import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.pluginapi.inventory.ResourceComponent;
+import org.rhq.core.pluginapi.inventory.ResourceContext;
+import org.rhq.plugins.jbossas5.connection.ProfileServiceConnection;
+import org.rhq.plugins.jbossas5.util.ConversionUtils;
+import org.teiid.adminapi.impl.PropertyMetadata;
+import org.teiid.rhq.admin.DQPManagementView;
+import org.teiid.rhq.plugin.util.PluginConstants;
+import org.teiid.rhq.plugin.util.ProfileServiceUtil;
+import org.teiid.rhq.plugin.util.PluginConstants.Operation;
+import org.teiid.rhq.plugin.util.PluginConstants.ComponentType.Platform;
+import org.teiid.rhq.plugin.util.PluginConstants.ComponentType.VDB;
+
+/**
+ * Component class for a Teiid VDB
+ *
+ */
+public class DataRoleComponent extends Facet {
+ private final Log LOG = LogFactory
+ .getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.teiid.rhq.plugin.Facet#start(org.rhq.core.pluginapi.inventory.
+ * ResourceContext)
+ */
+ @Override
+ public void start(ResourceContext context) {
+ this.resourceConfiguration = context.getPluginConfiguration();
+ this.componentType = PluginConstants.ComponentType.DATA_ROLE.NAME;
+ super.start(context);
+ }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.teiid.rhq.plugin.Facet#getAvailability()
+ */
+ @Override
+ public AvailabilityType getAvailability() {
+ return ((VDBComponent)this.resourceContext.getParentResourceComponent()).getAvailability();
+ }
+
+ @Override
+ String getComponentType() {
+ return PluginConstants.ComponentType.DATA_ROLE.NAME;
+ }
+
+ @Override
+ public void getValues(MeasurementReport arg0,
+ Set<MeasurementScheduleRequest> arg1) throws Exception {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * The plugin container will call this method when it has a new
+ * configuration for your managed resource. Your plugin will re-configure
+ * the managed resource in your own custom way, setting its configuration
+ * based on the new values of the given configuration.
+ *
+ * @see ConfigurationFacet#updateResourceConfiguration(ConfigurationUpdateReport)
+ */
+ public void updateResourceConfiguration(ConfigurationUpdateReport report) {
+
+ Configuration resourceConfig = report.getConfiguration();
+ resourceConfiguration = resourceConfig.deepCopy();
+
+ // Get the vdb and update date role anyAuthenticated and MappedRoleNames
+ ManagementView managementView = null;
+ ComponentType componentType = new ComponentType(
+ PluginConstants.ComponentType.VDB.TYPE,
+ PluginConstants.ComponentType.VDB.SUBTYPE);
+
+ ManagedComponent managedComponent = null;
+ ManagedProperty anyAuthenticatedMp = null;
+ report.setStatus(ConfigurationUpdateStatus.SUCCESS);
+ try {
+
+ managementView = getConnection().getManagementView();
+ managedComponent = managementView.getComponent(
+ ((VDBComponent) this.resourceContext
+ .getParentResourceComponent()).name, componentType);
+ ManagedProperty mp = managedComponent.getProperty("dataPolicies");//$NON-NLS-1$
+ List<ManagedObject> dataRolesListMp = (List<ManagedObject>) MetaValueFactory
+ .getInstance().unwrap(mp.getValue());
+ String name = resourceConfiguration.getSimpleValue("name", null); //$NON-NLS-1$
+ String anyAuthenticated = resourceConfiguration.getSimpleValue(
+ "anyAuthenticated", null); //$NON-NLS-1$
+
+ for (ManagedObject mo : dataRolesListMp) {
+
+ String pname = ProfileServiceUtil.stringValue(mo.getProperty(
+ "name").getValue()); //$NON-NLS-1$
+ if (!pname.equals(name)) {
+ continue;
+ }
+ anyAuthenticatedMp = mo.getProperty("anyAuthenticated"); //$NON-NLS-1$
+ anyAuthenticatedMp.setValue(ProfileServiceUtil.wrap(
+ SimpleMetaType.BOOLEAN, anyAuthenticated));
+ List<Property> mappedRoleNamePropertyList = resourceConfiguration
+ .getList("mappedRoleNameList").getList(); //$NON-NLS-1$
+
+ List<String> mappedRoleNameList = new ArrayList<String>();
+
+ for (Property mappedRoleNameProperty : mappedRoleNamePropertyList){
+ String mappedRoleNameString = ((PropertyMap)mappedRoleNameProperty).getSimpleValue("name", null); //$NON-NLS-1$
+ mappedRoleNameList.add(mappedRoleNameString);
+ }
+ ManagedProperty mappedRoleNameMp = mo.getProperty("mappedRoleNames"); //$NON-NLS-1$
+ mappedRoleNameMp.setValue(MetaValueFactory.getInstance().create(mappedRoleNameList));
+ }
+
+ try {
+ managementView.updateComponent(managedComponent);
+ } catch (Exception e) {
+ LOG.error("Unable to update component [" //$NON-NLS-1$
+ + managedComponent.getName() + "] of type " //$NON-NLS-1$
+ + componentType + ".", e); //$NON-NLS-1$
+ report.setStatus(ConfigurationUpdateStatus.FAILURE);
+ report.setErrorMessageFromThrowable(e);
+ }
+ } catch (Exception e) {
+ LOG.error("Unable to process update request", e); //$NON-NLS-1$
+ report.setStatus(ConfigurationUpdateStatus.FAILURE);
+ report.setErrorMessageFromThrowable(e);
+ }
+
+ }
+
+ @Override
+ public Configuration loadResourceConfiguration() {
+
+ VDBComponent parentComponent = (VDBComponent) this.resourceContext
+ .getParentResourceComponent();
+ ManagedComponent mcVdb = null;
+ Configuration configuration = resourceContext.getPluginConfiguration();
+ try {
+ mcVdb = ProfileServiceUtil.getManagedComponent(getConnection(),
+ new ComponentType(PluginConstants.ComponentType.VDB.TYPE,
+ PluginConstants.ComponentType.VDB.SUBTYPE),
+ parentComponent.name);
+ } catch (NamingException e) {
+ final String msg = "NamingException in loadResourceConfiguration(): " + e.getMessage(); //$NON-NLS-1$
+ LOG.error(msg, e);
+ } catch (Exception e) {
+ final String msg = "Exception in loadResourceConfiguration(): " + e.getMessage(); //$NON-NLS-1$
+ LOG.error(msg, e);
+ }
+
+ // Get data roles from VDB
+ ManagedProperty property = mcVdb.getProperty("dataPolicies"); //$NON-NLS-1$
+ if (property != null) {
+ CollectionValueSupport valueSupport = (CollectionValueSupport) property
+ .getValue();
+ MetaValue[] metaValues = valueSupport.getElements();
+
+ for (MetaValue value : metaValues) {
+ GenericValueSupport genValueSupport = (GenericValueSupport) value;
+ ManagedObjectImpl managedObject = (ManagedObjectImpl) genValueSupport
+ .getValue();
+
+ String dataRoleName = ProfileServiceUtil.getSimpleValue(
+ managedObject, "name", String.class); //$NON-NLS-1$
+ Boolean anyAuthenticated = ProfileServiceUtil.getSimpleValue(
+ managedObject, "anyAuthenticated", Boolean.class); //$NON-NLS-1$
+ String description = ProfileServiceUtil.getSimpleValue(
+ managedObject, "description", String.class); //$NON-NLS-1$
+
+ configuration.put(new PropertySimple("name", dataRoleName)); //$NON-NLS-1$
+ configuration.put(new PropertySimple("anyAuthenticated", //$NON-NLS-1$
+ anyAuthenticated));
+ configuration
+ .put(new PropertySimple("description", description)); //$NON-NLS-1$
+
+ PropertyList mappedRoleNameList = new PropertyList(
+ "mappedRoleNameList"); //$NON-NLS-1$
+ configuration.put(mappedRoleNameList);
+ ManagedProperty mappedRoleNames = managedObject
+ .getProperty("mappedRoleNames"); //$NON-NLS-1$
+ if (mappedRoleNames != null) {
+ List<String> props = (List<String>) MetaValueFactory
+ .getInstance().unwrap(mappedRoleNames.getValue());
+ for (String mappedRoleName : props) {
+ PropertyMap mappedRoleNameMap = null;
+
+ mappedRoleNameMap = new PropertyMap("map", //$NON-NLS-1$
+ new PropertySimple("name", mappedRoleName)); //$NON-NLS-1$
+ mappedRoleNameList.add(mappedRoleNameMap);
+ }
+ }
+ }
+ }
+
+ return configuration;
+
+ }
+
+ @Override
+ public CreateResourceReport createResource(
+ CreateResourceReport createResourceReport) {
+
+ createContentBasedResource(createResourceReport);
+ return createResourceReport;
+ }
+
+ @Override
+ public ProfileServiceConnection getConnection() {
+ return ((VDBComponent) this.resourceContext
+ .getParentResourceComponent()).getConnection();
+ }
+
+ @Override
+ public EmsConnection getEmsConnection() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
Property changes on: branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/DataRoleComponent.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/DataRoleDiscoveryComponent.java
===================================================================
--- branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/DataRoleDiscoveryComponent.java (rev 0)
+++ branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/DataRoleDiscoveryComponent.java 2010-09-03 16:14:36 UTC (rev 2530)
@@ -0,0 +1,139 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+package org.teiid.rhq.plugin;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.managed.api.ComponentType;
+import org.jboss.managed.api.ManagedComponent;
+import org.jboss.managed.api.ManagedObject;
+import org.jboss.managed.api.ManagedProperty;
+import org.jboss.managed.plugins.ManagedObjectImpl;
+import org.jboss.metatype.api.values.CollectionValueSupport;
+import org.jboss.metatype.api.values.GenericValueSupport;
+import org.jboss.metatype.api.values.MetaValue;
+import org.jboss.metatype.api.values.MetaValueFactory;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertyList;
+import org.rhq.core.domain.configuration.PropertyMap;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
+import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+import org.rhq.plugins.jbossas5.connection.ProfileServiceConnection;
+import org.teiid.rhq.plugin.util.PluginConstants;
+import org.teiid.rhq.plugin.util.ProfileServiceUtil;
+
+/**
+ * Discovery component for Data Roles of a VDB
+ *
+ */
+public class DataRoleDiscoveryComponent implements ResourceDiscoveryComponent {
+
+ private final Log log = LogFactory
+ .getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
+
+ public Set<DiscoveredResourceDetails> discoverResources(
+ ResourceDiscoveryContext discoveryContext)
+ throws InvalidPluginConfigurationException, Exception {
+ Set<DiscoveredResourceDetails> discoveredResources = new HashSet<DiscoveredResourceDetails>();
+ VDBComponent parenComponent = (VDBComponent) discoveryContext
+ .getParentResourceComponent();
+ ProfileServiceConnection connection = parenComponent.getConnection();
+
+ ManagedComponent mcVdb = ProfileServiceUtil.getManagedComponent(
+ connection, new ComponentType(
+ PluginConstants.ComponentType.VDB.TYPE,
+ PluginConstants.ComponentType.VDB.SUBTYPE),
+ parenComponent.name);
+
+ // Get data roles from VDB
+ ManagedProperty property = mcVdb.getProperty("dataPolicies");
+ if (property != null) {
+ CollectionValueSupport valueSupport = (CollectionValueSupport) property
+ .getValue();
+ MetaValue[] metaValues = valueSupport.getElements();
+
+ for (MetaValue value : metaValues) {
+ GenericValueSupport genValueSupport = (GenericValueSupport) value;
+ ManagedObjectImpl managedObject = (ManagedObjectImpl) genValueSupport
+ .getValue();
+
+ String dataRoleName = ProfileServiceUtil.getSimpleValue(
+ managedObject, "name", String.class);
+ Boolean anyAuthenticated = ProfileServiceUtil.getSimpleValue(
+ managedObject, "anyAuthenticated", Boolean.class);
+ String description = ProfileServiceUtil.getSimpleValue(
+ managedObject, "description", String.class);
+
+ /**
+ *
+ * A discovered resource must have a unique key, that must stay
+ * the same when the resource is discovered the next time
+ */
+ DiscoveredResourceDetails detail = new DiscoveredResourceDetails(
+ discoveryContext.getResourceType(), // ResourceType
+ dataRoleName, // Resource Key
+ dataRoleName, // Resource Name
+ null, // Version
+ PluginConstants.ComponentType.DATA_ROLE.DESCRIPTION, // Description
+ discoveryContext.getDefaultPluginConfiguration(), // Plugin
+ // Config
+ null // Process info from a process scan
+ );
+
+ Configuration configuration = detail.getPluginConfiguration();
+
+ configuration.put(new PropertySimple("name", dataRoleName));
+ configuration.put(new PropertySimple("anyAuthenticated",
+ anyAuthenticated));
+ configuration
+ .put(new PropertySimple("description", description));
+
+ PropertyList mappedRoleNameList = new PropertyList(
+ "mappedRoleNameList");
+ configuration.put(mappedRoleNameList);
+ ManagedProperty mappedRoleNames = managedObject
+ .getProperty("mappedRoleNames");
+ if (mappedRoleNames != null) {
+ List<String> props = (List<String>) MetaValueFactory
+ .getInstance().unwrap(mappedRoleNames.getValue());
+ for (String mappedRoleName : props) {
+ mappedRoleNameList.add(new PropertySimple("name", mappedRoleName));
+ }
+
+ }
+ // Add to return values
+ discoveredResources.add(detail);
+ log.debug("Discovered Teiid VDB Data Role: " + dataRoleName);
+ }
+ }
+
+ return discoveredResources;
+
+ }
+}
\ No newline at end of file
Property changes on: branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/DataRoleDiscoveryComponent.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/util/PluginConstants.java
===================================================================
--- branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/util/PluginConstants.java 2010-09-03 14:43:18 UTC (rev 2529)
+++ branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/util/PluginConstants.java 2010-09-03 16:14:36 UTC (rev 2530)
@@ -118,7 +118,20 @@
}
}
+
+ public interface DATA_ROLE {
+ public final static String NAME = "VDB Data Role"; //$NON-NLS-1$
+ public final static String DESCRIPTION = "Data/Security Role for a Teiid Virtual Database (VDB)"; //$NON-NLS-1$
+
+ public static interface Operations {
+ }
+
+ public static interface Metrics {
+ }
+
+ }
+
public interface Translator {
public final static String TYPE = "teiid"; //$NON-NLS-1$
Modified: branches/7.1.x/console/src/main/resources/META-INF/rhq-plugin.xml
===================================================================
--- branches/7.1.x/console/src/main/resources/META-INF/rhq-plugin.xml 2010-09-03 14:43:18 UTC (rev 2529)
+++ branches/7.1.x/console/src/main/resources/META-INF/rhq-plugin.xml 2010-09-03 16:14:36 UTC (rev 2530)
@@ -154,20 +154,22 @@
</c:list-property>
</results>
</operation>
-
+
<operation name="deployVdbByUrl" displayName="Deploy a VDB via URL"
description="Deploy a VDB using a URL">
<parameters>
<c:simple-property displayName="VDB URL" name="vdbUrl"
type="file" required="true" description="The URL of the VDB to deploy" />
- <c:simple-property displayName="VDB Deploy File Name" name="vdbDeployName"
- type="string" required="true" description="The deployment file name to use. Must match the VDB Name you are deploying." />
+ <c:simple-property displayName="VDB Deploy File Name"
+ name="vdbDeployName" type="string" required="true"
+ description="The deployment file name to use. Must match the VDB Name you are deploying." />
<c:simple-property displayName="VDB Version" name="vdbVersion"
- type="integer" required="false" description="The version to use for the deployed VDB (leave blank for overwrite of version one)" />
+ type="integer" required="false"
+ description="The version to use for the deployed VDB (leave blank for overwrite of version one)" />
</parameters>
</operation>
-
+
<operation name="terminateSession" displayName="Terminate Session"
description="Terminate a specified session">
<parameters>
@@ -269,30 +271,30 @@
displayType="detail" category="throughput" property="userBufferSpace"
description="The currently used file buffer space in MB." />
- <metric displayName="Prepared Plan Cache Hit Ratio %" defaultOn="true"
- displayType="detail" category="performance" property="PREPARED_PLAN_CACHE.hitRatio"
- description="Percentage of positive cache hits" />
+ <metric displayName="Prepared Plan Cache Hit Ratio %"
+ defaultOn="true" displayType="detail" category="performance"
+ property="PREPARED_PLAN_CACHE.hitRatio" description="Percentage of positive cache hits" />
- <metric displayName="Prepared Plan Cache Size" defaultOn="true"
- displayType="detail" category="performance" property="PREPARED_PLAN_CACHE.totalEntries"
- description="Current number of entries in cache" />
+ <metric displayName="Prepared Plan Cache Size" defaultOn="true"
+ displayType="detail" category="performance" property="PREPARED_PLAN_CACHE.totalEntries"
+ description="Current number of entries in cache" />
- <metric displayName="Prepared Plan Cache # of Requests" defaultOn="true"
- displayType="detail" category="performance" property="PREPARED_PLAN_CACHE.requestCount"
- description="Total number of requests made against cache" />
-
- <metric displayName="ResultSet Cache Hit Ratio %" defaultOn="true"
- displayType="detail" category="performance" property="QUERY_SERVICE_RESULT_SET_CACHE.hitRatio"
- description="Percentage of positive cache hits" />
+ <metric displayName="Prepared Plan Cache # of Requests"
+ defaultOn="true" displayType="detail" category="performance"
+ property="PREPARED_PLAN_CACHE.requestCount" description="Total number of requests made against cache" />
- <metric displayName="ResultSet Cache Size" defaultOn="true"
- displayType="detail" category="performance" property="QUERY_SERVICE_RESULT_SET_CACHE.totalEntries"
- description="Current number of entries in cache" />
+ <metric displayName="ResultSet Cache Hit Ratio %" defaultOn="true"
+ displayType="detail" category="performance"
+ property="QUERY_SERVICE_RESULT_SET_CACHE.hitRatio" description="Percentage of positive cache hits" />
- <metric displayName="ResultSet Cache # of Requests" defaultOn="true"
- displayType="detail" category="performance" property="QUERY_SERVICE_RESULT_SET_CACHE.requestCount"
- description="Total number of requests made against cache" />
+ <metric displayName="ResultSet Cache Size" defaultOn="true"
+ displayType="detail" category="performance"
+ property="QUERY_SERVICE_RESULT_SET_CACHE.totalEntries" description="Current number of entries in cache" />
+ <metric displayName="ResultSet Cache # of Requests" defaultOn="true"
+ displayType="detail" category="performance"
+ property="QUERY_SERVICE_RESULT_SET_CACHE.requestCount" description="Total number of requests made against cache" />
+
<resource-configuration>
<c:group name="teiidProperties" displayName="Runtime Engine Properties"
hiddenByDefault="false">
@@ -498,7 +500,7 @@
<c:option value="INACTIVE" name="DOWN" default="true" />
</c:property-options>
</c:simple-property>
- <c:simple-property name="connectionType" type="string"
+ <c:simple-property name="connectionType" type="string"
description="Allowable Connections: 1) NONE - disallow new connections 2) BY VERSION - allow connections only if the version is specified or if this is the earliest 'BY VERSION' vdb and there are no vdbs marked as 'ANY'
3) ANY - allow connections with or without a version specified. If multiple versions of same VDB are deployed, connect to one specified with ANY, or if there are multiple VDBs with ANY then connect to the latest version with ANY "
required="false">
@@ -598,6 +600,32 @@
</c:group>
</resource-configuration>
+ <service name="Data Roles" description="Data Roles for this VDB"
+ class="DataRoleComponent" discovery="DataRoleDiscoveryComponent">
+
+ <resource-configuration>
+ <c:simple-property name="name" displayName="Name"
+ description="Name of the data role" readOnly="true" required="false" />
+ <c:simple-property name="anyAuthenticated"
+ displayName="Any Authenticated" type="boolean"
+ description="Indicates if the role is mapped to any authenticated user"
+ readOnly="false" required="false" />
+ <c:simple-property name="description"
+ displayName="Description" type="string"
+ description="Description of this data role"
+ readOnly="true" required="false" />
+ <c:list-property name="mappedRoleNameList"
+ readOnly="false" required="false" displayName="Mapped Role Names"
+ description="Mapped role names for this data role">
+ <c:map-property name="map" readOnly="false">
+ <c:simple-property name="name" displayName="Name"
+ description="Name of this mapped role" readOnly="true" />
+ </c:map-property>
+ </c:list-property>
+ </resource-configuration>
+
+ </service>
+
</service>
<service name="Translators" description="Teiid Translators"
14 years, 3 months
- 1
- 0
teiid SVN: r2529 - in trunk: adminshell and 35 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2010-09-03 10:43:18 -0400 (Fri, 03 Sep 2010)
New Revision: 2529
Modified:
trunk/adminshell/pom.xml
trunk/api/pom.xml
trunk/build/pom.xml
trunk/cache-jbosscache/pom.xml
trunk/client/pom.xml
trunk/common-core/pom.xml
trunk/connectors/connector-file/pom.xml
trunk/connectors/connector-ldap/pom.xml
trunk/connectors/connector-salesforce/pom.xml
trunk/connectors/connector-ws/pom.xml
trunk/connectors/pom.xml
trunk/connectors/salesforce-api/pom.xml
trunk/connectors/sandbox/pom.xml
trunk/connectors/sandbox/translator-yahoo/pom.xml
trunk/connectors/translator-file/pom.xml
trunk/connectors/translator-jdbc/pom.xml
trunk/connectors/translator-ldap/pom.xml
trunk/connectors/translator-loopback/pom.xml
trunk/connectors/translator-salesforce/pom.xml
trunk/connectors/translator-ws/pom.xml
trunk/console/pom.xml
trunk/documentation/admin-guide/pom.xml
trunk/documentation/caching-guide/pom.xml
trunk/documentation/client-developers-guide/pom.xml
trunk/documentation/developer-guide/pom.xml
trunk/documentation/pom.xml
trunk/documentation/quick-start-example/pom.xml
trunk/documentation/reference/pom.xml
trunk/engine/pom.xml
trunk/hibernate-dialect/pom.xml
trunk/jboss-integration/pom.xml
trunk/metadata/pom.xml
trunk/pom.xml
trunk/runtime/pom.xml
trunk/test-integration/common/pom.xml
trunk/test-integration/db/pom.xml
trunk/test-integration/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: trunk/adminshell/pom.xml
===================================================================
--- trunk/adminshell/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/adminshell/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: trunk/api/pom.xml
===================================================================
--- trunk/api/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/api/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-api</artifactId>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/build/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>build</artifactId>
Modified: trunk/cache-jbosscache/pom.xml
===================================================================
--- trunk/cache-jbosscache/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/cache-jbosscache/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-cache-jbosscache</artifactId>
Modified: trunk/client/pom.xml
===================================================================
--- trunk/client/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/client/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
Modified: trunk/common-core/pom.xml
===================================================================
--- trunk/common-core/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/common-core/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-common-core</artifactId>
Modified: trunk/connectors/connector-file/pom.xml
===================================================================
--- trunk/connectors/connector-file/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/connectors/connector-file/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-file</artifactId>
Modified: trunk/connectors/connector-ldap/pom.xml
===================================================================
--- trunk/connectors/connector-ldap/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/connectors/connector-ldap/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ldap</artifactId>
Modified: trunk/connectors/connector-salesforce/pom.xml
===================================================================
--- trunk/connectors/connector-salesforce/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/connectors/connector-salesforce/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-salesforce</artifactId>
Modified: trunk/connectors/connector-ws/pom.xml
===================================================================
--- trunk/connectors/connector-ws/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/connectors/connector-ws/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ws</artifactId>
Modified: trunk/connectors/pom.xml
===================================================================
--- trunk/connectors/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/connectors/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/connectors/salesforce-api/pom.xml
===================================================================
--- trunk/connectors/salesforce-api/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/connectors/salesforce-api/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>salesforce-api</artifactId>
Modified: trunk/connectors/sandbox/pom.xml
===================================================================
--- trunk/connectors/sandbox/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/connectors/sandbox/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
Modified: trunk/connectors/sandbox/translator-yahoo/pom.xml
===================================================================
--- trunk/connectors/sandbox/translator-yahoo/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/connectors/sandbox/translator-yahoo/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-yahoo</artifactId>
Modified: trunk/connectors/translator-file/pom.xml
===================================================================
--- trunk/connectors/translator-file/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/connectors/translator-file/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-file</artifactId>
Modified: trunk/connectors/translator-jdbc/pom.xml
===================================================================
--- trunk/connectors/translator-jdbc/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/connectors/translator-jdbc/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-jdbc</artifactId>
Modified: trunk/connectors/translator-ldap/pom.xml
===================================================================
--- trunk/connectors/translator-ldap/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/connectors/translator-ldap/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ldap</artifactId>
Modified: trunk/connectors/translator-loopback/pom.xml
===================================================================
--- trunk/connectors/translator-loopback/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/connectors/translator-loopback/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-loopback</artifactId>
Modified: trunk/connectors/translator-salesforce/pom.xml
===================================================================
--- trunk/connectors/translator-salesforce/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/connectors/translator-salesforce/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-salesforce</artifactId>
Modified: trunk/connectors/translator-ws/pom.xml
===================================================================
--- trunk/connectors/translator-ws/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/connectors/translator-ws/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ws</artifactId>
Modified: trunk/console/pom.xml
===================================================================
--- trunk/console/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/console/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/documentation/admin-guide/pom.xml
===================================================================
--- trunk/documentation/admin-guide/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/documentation/admin-guide/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>admin-guide</artifactId>
Modified: trunk/documentation/caching-guide/pom.xml
===================================================================
--- trunk/documentation/caching-guide/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/documentation/caching-guide/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>caching-guide</artifactId>
Modified: trunk/documentation/client-developers-guide/pom.xml
===================================================================
--- trunk/documentation/client-developers-guide/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/documentation/client-developers-guide/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>client-developers-guide</artifactId>
Modified: trunk/documentation/developer-guide/pom.xml
===================================================================
--- trunk/documentation/developer-guide/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/documentation/developer-guide/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>developer-guide</artifactId>
Modified: trunk/documentation/pom.xml
===================================================================
--- trunk/documentation/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/documentation/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/documentation/quick-start-example/pom.xml
===================================================================
--- trunk/documentation/quick-start-example/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/documentation/quick-start-example/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>quick-start-example</artifactId>
Modified: trunk/documentation/reference/pom.xml
===================================================================
--- trunk/documentation/reference/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/documentation/reference/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>reference</artifactId>
Modified: trunk/engine/pom.xml
===================================================================
--- trunk/engine/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/engine/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-engine</artifactId>
Modified: trunk/hibernate-dialect/pom.xml
===================================================================
--- trunk/hibernate-dialect/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/hibernate-dialect/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-hibernate-dialect</artifactId>
Modified: trunk/jboss-integration/pom.xml
===================================================================
--- trunk/jboss-integration/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/jboss-integration/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/metadata/pom.xml
===================================================================
--- trunk/metadata/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/metadata/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -5,15 +5,15 @@
<artifactId>teiid</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
<description>Federated SQL and XML query engine.</description>
<properties>
<ant.version>1.7.0</ant.version>
<site.url>http://www.jboss.org/teiid</site.url>
</properties>
<scm>
- <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/teiid-7.2.0.Alpha1</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-7.2.0.Alpha1</developerConnection>
+ <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/trunk</developerConnection>
</scm>
<licenses>
<license>
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/runtime/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/test-integration/common/pom.xml
===================================================================
--- trunk/test-integration/common/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/test-integration/common/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-integration-common</artifactId>
Modified: trunk/test-integration/db/pom.xml
===================================================================
--- trunk/test-integration/db/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/test-integration/db/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -9,7 +9,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/test-integration/pom.xml
===================================================================
--- trunk/test-integration/pom.xml 2010-09-03 14:42:45 UTC (rev 2528)
+++ trunk/test-integration/pom.xml 2010-09-03 14:43:18 UTC (rev 2529)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.2.0.Alpha1</version>
+ <version>7.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
14 years, 3 months
- 1
- 0