March 2012 - teiid-commits - Jboss List Archives

teiid SVN: r3948 - in branches/7.4.x: client/src/main/resources and 1 other directories.

by teiid-commits＠lists.jboss.org

Author: jolee Date: 2012-03-22 16:51:52 -0400 (Thu, 22 Mar 2012) New Revision: 3948 Added: branches/7.4.x/client/src/main/resources/teiid-client-settings.orig.properties Removed: branches/7.4.x/client/src/main/resources/teiid-client-settings.properties Modified: branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java branches/7.4.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml branches/7.4.x/documentation/client-developers-guide/src/main/docbook/en-US/content/ssl.xml Log: TEIID-1950 renaming the teiid-client-settings in the client to not interfere with signed jars Modified: branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java =================================================================== --- branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java 2012-03-19 15:53:55 UTC (rev 3947) +++ branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java 2012-03-22 20:51:52 UTC (rev 3948) @@ -33,16 +33,7 @@ import java.net.NetworkInterface; import java.net.SocketException; import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.Timer; -import java.util.TimerTask; +import java.util.*; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; @@ -158,7 +149,7 @@ private Map<CachedInstance, CachedInstance> instancePool = new LinkedHashMap<CachedInstance, CachedInstance>(); //config properties - private long synchronousTtl = 120000l; + private long synchronousTtl = 240000l; private int maxCachedInstances=16; public static synchronized SocketServerConnectionFactory getInstance() { Copied: branches/7.4.x/client/src/main/resources/teiid-client-settings.orig.properties (from rev 3945, branches/7.4.x/client/src/main/resources/teiid-client-settings.properties) =================================================================== --- branches/7.4.x/client/src/main/resources/teiid-client-settings.orig.properties (rev 0) +++ branches/7.4.x/client/src/main/resources/teiid-client-settings.orig.properties 2012-03-22 20:51:52 UTC (rev 3948) @@ -0,0 +1,129 @@ +######################################## +# Settings file for Teiid clients +######################################## + +######################################## +# SSL Settings +######################################## + +# +# The key store type. Defaults to JKS +# + +org.teiid.ssl.keyStoreType=JKS + +# +# The key store algorithm, defaults to +# the system property "ssl.TrustManagerFactory.algorithm" +# + +#org.teiid.ssl.algorithm= + +# +# The classpath or filesystem location of the +# key store. +# +# This property is required only if performing 2-way +# authentication that requires a specific private +# key. +# + +#org.teiid.ssl.keyStore= + +# +# The key store password (not required) +# + +#org.teiid.ssl.keyStorePassword= + +# +# The classpath or filesystem location of the +# trust store. +# +# This property is required if performing 1-way +# authentication that requires trust not provided +# by the system defaults. +# + +#org.teiid.ssl.trustStore= + +# +# The trust store password (not required) +# + +#org.teiid.ssl.trustStorePassword= + +# +# The cipher protocol, defaults to TLSv1 +# + +org.teiid.ssl.protocol=TLSv1 + +# +# Whether to allow anonymous SSL +# (the TLS_DH_anon_WITH_AES_128_CBC_SHA cipher suite) +# defaults to true +# + +org.teiid.ssl.allowAnon=true + +######################################## +# Misc Socket Configuration +######################################## + +# +# The time in milliseconds for socket timeouts. +# A timeout during the initialization, handshake, or +# a server ping will be treated as an error. +# +# Setting this value too low may cause read errors. +# + +org.teiid.sockets.soTimeout=3000 + +# +# The max number of cached server instances +# to reuse. A server instance is a connected +# socket to a particular cluster member with +# client encryption and or SSL already established. +# +# Caching instances helps in 2 circumstances: +# - when Connection pooling is not being used. +# - load-balancing performance to a cluster +# when using Connection pooling of the DataSource. +# +# This value should typically be a multiple of the +# cluster size. +# +# Set to 0 to disable instance caching. +# + +org.teiid.sockets.maxCachedInstances=16 + +# +# Set the max time to live (in milliseconds) for non-execution +# synchronous calls. +# + +org.teiid.sockets.synchronousttl=240000 + +# +# Set the socket receive buffer size (in bytes) +# 0 indicates that the default socket setting will be used. +# + +org.teiid.sockets.receiveBufferSize=0 + +# +# Set the socket send buffer size (in bytes) +# 0 indicates that the default socket setting will be used. +# + +org.teiid.sockets.sendBufferSize=0 + +# +# Set to true to enable Nagle's algorithm to conserve bandwidth +# by minimizing the number of segments that are sent. +# + +org.teiid.sockets.conserveBandwidth=false Deleted: branches/7.4.x/client/src/main/resources/teiid-client-settings.properties =================================================================== --- branches/7.4.x/client/src/main/resources/teiid-client-settings.properties 2012-03-19 15:53:55 UTC (rev 3947) +++ branches/7.4.x/client/src/main/resources/teiid-client-settings.properties 2012-03-22 20:51:52 UTC (rev 3948) @@ -1,129 +0,0 @@ -######################################## -# Settings file for Teiid clients -######################################## - -######################################## -# SSL Settings -######################################## - -# -# The key store type. Defaults to JKS -# - -org.teiid.ssl.keyStoreType=JKS - -# -# The key store algorithm, defaults to -# the system property "ssl.TrustManagerFactory.algorithm" -# - -#org.teiid.ssl.algorithm= - -# -# The classpath or filesystem location of the -# key store. -# -# This property is required only if performing 2-way -# authentication that requires a specific private -# key. -# - -#org.teiid.ssl.keyStore= - -# -# The key store password (not required) -# - -#org.teiid.ssl.keyStorePassword= - -# -# The classpath or filesystem location of the -# trust store. -# -# This property is required if performing 1-way -# authentication that requires trust not provided -# by the system defaults. -# - -#org.teiid.ssl.trustStore= - -# -# The trust store password (not required) -# - -#org.teiid.ssl.trustStorePassword= - -# -# The cipher protocol, defaults to TLSv1 -# - -org.teiid.ssl.protocol=TLSv1 - -# -# Whether to allow anonymous SSL -# (the TLS_DH_anon_WITH_AES_128_CBC_SHA cipher suite) -# defaults to true -# - -org.teiid.ssl.allowAnon=true - -######################################## -# Misc Socket Configuration -######################################## - -# -# The time in milliseconds for socket timeouts. -# A timeout during the initialization, handshake, or -# a server ping will be treated as an error. -# -# Setting this value too low may cause read errors. -# - -org.teiid.sockets.soTimeout=3000 - -# -# The max number of cached server instances -# to reuse. A server instance is a connected -# socket to a particular cluster member with -# client encryption and or SSL already established. -# -# Caching instances helps in 2 circumstances: -# - when Connection pooling is not being used. -# - load-balancing performance to a cluster -# when using Connection pooling of the DataSource. -# -# This value should typically be a multiple of the -# cluster size. -# -# Set to 0 to disable instance caching. -# - -org.teiid.sockets.maxCachedInstances=16 - -# -# Set the max time to live (in milliseconds) for non-execution -# synchronous calls. -# - -org.teiid.sockets.synchronousttl=240000 - -# -# Set the socket receive buffer size (in bytes) -# 0 indicates that the default socket setting will be used. -# - -org.teiid.sockets.receiveBufferSize=0 - -# -# Set the socket send buffer size (in bytes) -# 0 indicates that the default socket setting will be used. -# - -org.teiid.sockets.sendBufferSize=0 - -# -# Set to true to enable Nagle's algorithm to conserve bandwidth -# by minimizing the number of segments that are sent. -# - -org.teiid.sockets.conserveBandwidth=false Modified: branches/7.4.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml =================================================================== --- branches/7.4.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml 2012-03-19 15:53:55 UTC (rev 3947) +++ branches/7.4.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml 2012-03-22 20:51:52 UTC (rev 3948) @@ -547,9 +547,9 @@ </example> </para> <para>Teiid by default maintians a pool of extra socket connections that are reused. For load balancing, this reduces the potential cost of switching a connection to another server instance. - The default setting is to maintain 16 connections (see <code>org.teiid.sockets.maxCachedInstances</code> in the client jar's teiid-client-settings.properties file. + The default setting is to maintain 16 connections (can be set via <code>org.teiid.sockets.maxCachedInstances</code> in a teiid-client-settings.properties file). If you're client is connecting to large numbers of Teiid instances and you're using post connection time load balancing, then consider increasing the number of cached instances. - You may either set an analogous system property or create another version of teiid-client-settings.properties file and place it into the classpath ahead of the client jar.</para> + You may either set an analogous system property or create a teiid-client-settings.properties (see the teiid-client-settings.orig.properties file in the client jar) file and place it into the classpath ahead of the client jar.</para> <note><para>Session level temporary tables, currently running transactions, session level cache entries, and PreparedPlans for a given session will not be available on other cluster members. Therefore, it is recommended that post connection time load balancing is only used when the logical connection could have been closed, but the actual connection is reused (the typical connection pool pattern).</para></note> </section> Modified: branches/7.4.x/documentation/client-developers-guide/src/main/docbook/en-US/content/ssl.xml =================================================================== --- branches/7.4.x/documentation/client-developers-guide/src/main/docbook/en-US/content/ssl.xml 2012-03-19 15:53:55 UTC (rev 3947) +++ branches/7.4.x/documentation/client-developers-guide/src/main/docbook/en-US/content/ssl.xml 2012-03-22 20:51:52 UTC (rev 3948) @@ -98,13 +98,13 @@ certificate keystores is not allowed.</para> <para>In this scenario, a different set of Teiid-specific SSL properties can be set as system properties or defined inside - the "teiid-client-settings.properties" file. The "teiid-client-settings.properties" file - can be found inside the "teiid-&versionNumber;-client.jar" file at the root. + a "teiid-client-settings.properties" file. A sample "teiid-client-settings.properties" file + can be found inside the "teiid-&versionNumber;-client.jar" file at the root called "teiid-client-settings.orig.properties". Extract this file, or make a copy, change the property values required for the chosen SSL mode, and place this file in the client application's classpath before the "teiid-&versionNumber;-client.jar" file.</para> - <para>SSL properties and definitions inside the "teiid-client-settings.properties" are shown below.</para> + <para>SSL properties and definitions that can be set in a "teiid-client-settings.properties" file are shown below.</para> <programlisting><![CDATA[######################################## # SSL Settings

12 years, 9 months

1
0
0 / 0

teiid SVN: r3947 - in trunk: jboss-integration/src/main/resources/org/teiid/jboss and 5 other directories.

by teiid-commits＠lists.jboss.org

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

12 years, 9 months

1
0
0 / 0

teiid SVN: r3946 - in branches/7.7.x/connectors: translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres and 1 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2012-03-17 07:05:22 -0400 (Sat, 17 Mar 2012) New Revision: 3946 Modified: branches/7.7.x/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveExecutionFactory.java branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/IngresExecutionFactory.java branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teradata/TeradataExecutionFactory.java Log: TEIID-1974 removing rand support Modified: branches/7.7.x/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveExecutionFactory.java =================================================================== --- branches/7.7.x/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveExecutionFactory.java 2012-03-16 21:10:45 UTC (rev 3945) +++ branches/7.7.x/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveExecutionFactory.java 2012-03-17 11:05:22 UTC (rev 3946) @@ -21,12 +21,7 @@ */ package org.teiid.translator.hive; -import static org.teiid.translator.TypeFacility.RUNTIME_NAMES.BIG_INTEGER; -import static org.teiid.translator.TypeFacility.RUNTIME_NAMES.DATE; -import static org.teiid.translator.TypeFacility.RUNTIME_NAMES.DOUBLE; -import static org.teiid.translator.TypeFacility.RUNTIME_NAMES.INTEGER; -import static org.teiid.translator.TypeFacility.RUNTIME_NAMES.OBJECT; -import static org.teiid.translator.TypeFacility.RUNTIME_NAMES.STRING; +import static org.teiid.translator.TypeFacility.RUNTIME_NAMES.*; import java.sql.Connection; import java.sql.SQLException; @@ -322,7 +317,6 @@ supportedFunctions.add(SourceSystemFunctions.POWER); supportedFunctions.add(SourceSystemFunctions.SECOND); supportedFunctions.add(SourceSystemFunctions.SQRT); - supportedFunctions.add(SourceSystemFunctions.RAND); supportedFunctions.add(SourceSystemFunctions.ROUND); supportedFunctions.add(SourceSystemFunctions.RTRIM); supportedFunctions.add(SourceSystemFunctions.RPAD); Modified: branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/IngresExecutionFactory.java =================================================================== --- branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/IngresExecutionFactory.java 2012-03-16 21:10:45 UTC (rev 3945) +++ branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/IngresExecutionFactory.java 2012-03-17 11:05:22 UTC (rev 3946) @@ -74,7 +74,6 @@ registerFunctionModifier(SourceSystemFunctions.CURTIME, new AliasModifier("current_time")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.CURDATE, new AliasModifier("current_date")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.LCASE, new AliasModifier("lowercase")); //$NON-NLS-1$ - registerFunctionModifier(SourceSystemFunctions.RAND, new AliasModifier("random")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.UCASE, new AliasModifier("uppercase")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.DAYOFMONTH, new AliasModifier("day")); //$NON-NLS-1$ @@ -144,7 +143,6 @@ supportedFunctions.add(SourceSystemFunctions.MINUTE); supportedFunctions.add(SourceSystemFunctions.MONTH); supportedFunctions.add(SourceSystemFunctions.POWER); - supportedFunctions.add(SourceSystemFunctions.RAND); supportedFunctions.add(SourceSystemFunctions.RIGHT); supportedFunctions.add(SourceSystemFunctions.RPAD); supportedFunctions.add(SourceSystemFunctions.SECOND); Modified: branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teradata/TeradataExecutionFactory.java =================================================================== --- branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teradata/TeradataExecutionFactory.java 2012-03-16 21:10:45 UTC (rev 3945) +++ branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teradata/TeradataExecutionFactory.java 2012-03-17 11:05:22 UTC (rev 3946) @@ -33,16 +33,7 @@ import java.util.List; import java.util.Map; -import org.teiid.language.ColumnReference; -import org.teiid.language.Command; -import org.teiid.language.DerivedColumn; -import org.teiid.language.Expression; -import org.teiid.language.Function; -import org.teiid.language.LanguageFactory; -import org.teiid.language.Literal; -import org.teiid.language.QueryExpression; -import org.teiid.language.Select; -import org.teiid.language.SortSpecification; +import org.teiid.language.*; import org.teiid.translator.ExecutionContext; import org.teiid.translator.SourceSystemFunctions; import org.teiid.translator.Translator; @@ -116,7 +107,6 @@ registerFunctionModifier(SourceSystemFunctions.CONVERT, convert); registerFunctionModifier(SourceSystemFunctions.SUBSTRING, new AliasModifier("substr")); //$NON-NLS-1$ - registerFunctionModifier(SourceSystemFunctions.RAND, new AliasModifier("random")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.LOG, new AliasModifier("LN")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.LCASE, new AliasModifier("LOWER")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.UCASE, new AliasModifier("UPPER")); //$NON-NLS-1$ @@ -243,7 +233,6 @@ supportedFunctions.add(SourceSystemFunctions.MOD); supportedFunctions.add(SourceSystemFunctions.MONTH); supportedFunctions.add(SourceSystemFunctions.NULLIF); - supportedFunctions.add(SourceSystemFunctions.RAND); supportedFunctions.add(SourceSystemFunctions.RIGHT); supportedFunctions.add(SourceSystemFunctions.RTRIM); supportedFunctions.add(SourceSystemFunctions.SECOND);

12 years, 9 months

1
0
0 / 0

teiid SVN: r3945 - in branches/7.4.x/runtime/src/main/java/org/teiid: transport and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: jolee Date: 2012-03-16 17:10:45 -0400 (Fri, 16 Mar 2012) New Revision: 3945 Modified: branches/7.4.x/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java branches/7.4.x/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java Log: TEIID-1973 (minor mod for backport) SQLFetch hangs after first batch returned when odbc.ini property UseDeclareFetch=1 is used Modified: branches/7.4.x/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java =================================================================== --- branches/7.4.x/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2012-03-16 18:21:37 UTC (rev 3944) +++ branches/7.4.x/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2012-03-16 21:10:45 UTC (rev 3945) @@ -228,10 +228,12 @@ public void onCompletion(ResultsFuture<Boolean> future) { executionFuture = null; try { - List<PgColInfo> cols = getPgColInfo(stmt.getResultSet().getMetaData()); - cursorMap.put(cursorName, new Cursor(cursorName, sql, stmt, null, stmt.getResultSet(), cols)); - client.sendCommandComplete("DECLARE CURSOR", 0); //$NON-NLS-1$ - completion.getResultsReceiver().receiveResults(0); + if (future.get()) { + List<PgColInfo> cols = getPgColInfo(stmt.getResultSet().getMetaData()); + cursorMap.put(cursorName, new Cursor(cursorName, sql, stmt, null, stmt.getResultSet(), cols)); + client.sendCommandComplete("DECLARE CURSOR", 0); //$NON-NLS-1$ + completion.getResultsReceiver().receiveResults(0); + } } catch (Throwable e) { completion.getResultsReceiver().exceptionOccurred(e); } @@ -488,11 +490,12 @@ try { int rowsSent = future.get(); if (rowsSent < cursor.fetchSize) { - client.sendCommandComplete(cursor.sql, 0); + client.sendCommandComplete(cursor.sql, rowsSent); } else { client.sendPortalSuspended(); } + doneExecuting(); } catch (InterruptedException e) { throw new AssertionError(e); } catch (ExecutionException e) { @@ -749,10 +752,7 @@ preparedName = UNNAMED; } Prepared query = this.preparedMap.remove(preparedName); - if (query == null) { - errorOccurred(RuntimePlugin.Util.getString("no_stmt_found", preparedName)); //$NON-NLS-1$ - } - else { + if (query != null) { // Close all the bound messages off of this prepared // TODO: can there be more than one? this.portalMap.remove(preparedName); Modified: branches/7.4.x/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java =================================================================== --- branches/7.4.x/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java 2012-03-16 18:21:37 UTC (rev 3944) +++ branches/7.4.x/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java 2012-03-16 21:10:45 UTC (rev 3945) @@ -377,7 +377,7 @@ @Override public void terminated() { trace("channel being terminated"); - this.sendNoticeResponse("Connection closed"); + // no need to send any reply; this is showing as malformed packet. this.ctx.getChannel().close(); }

12 years, 9 months

1
0
0 / 0

teiid SVN: r3944 - branches/7.7.x/test-integration/perf.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2012-03-16 14:21:37 -0400 (Fri, 16 Mar 2012) New Revision: 3944 Modified: branches/7.7.x/test-integration/perf/pom.xml Log: MISC: updating the build version Modified: branches/7.7.x/test-integration/perf/pom.xml =================================================================== --- branches/7.7.x/test-integration/perf/pom.xml 2012-03-16 18:20:55 UTC (rev 3943) +++ branches/7.7.x/test-integration/perf/pom.xml 2012-03-16 18:21:37 UTC (rev 3944) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.7.0.CR1-SNAPSHOT</version> + <version>7.7.1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>test-integration-perf</artifactId>

12 years, 9 months

1
0
0 / 0

teiid SVN: r3943 - in branches/7.7.x/runtime/src/main/java/org/teiid: transport and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2012-03-16 14:20:55 -0400 (Fri, 16 Mar 2012) New Revision: 3943 Modified: branches/7.7.x/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java branches/7.7.x/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java Log: TEIID-1973: SQLFetch was not finishing because doneExecuting call was never called for the cursor results. Also fixed capture error condition, and error during termination. Modified: branches/7.7.x/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java =================================================================== --- branches/7.7.x/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2012-03-15 19:04:10 UTC (rev 3942) +++ branches/7.7.x/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2012-03-16 18:20:55 UTC (rev 3943) @@ -264,10 +264,12 @@ public void onCompletion(ResultsFuture<Boolean> future) { executionFuture = null; try { - List<PgColInfo> cols = getPgColInfo(stmt.getResultSet().getMetaData()); - cursorMap.put(cursorName, new Cursor(cursorName, sql, stmt, null, stmt.getResultSet(), cols)); - client.sendCommandComplete("DECLARE CURSOR", null); //$NON-NLS-1$ - completion.getResultsReceiver().receiveResults(0); + if (future.get()) { + List<PgColInfo> cols = getPgColInfo(stmt.getResultSet().getMetaData()); + cursorMap.put(cursorName, new Cursor(cursorName, sql, stmt, null, stmt.getResultSet(), cols)); + client.sendCommandComplete("DECLARE CURSOR", null); //$NON-NLS-1$ + completion.getResultsReceiver().receiveResults(0); + } } catch (Throwable e) { completion.getResultsReceiver().exceptionOccurred(e); } @@ -524,11 +526,12 @@ try { int rowsSent = future.get(); if (rowsSent < cursor.fetchSize) { - client.sendCommandComplete(cursor.sql, 0); + client.sendCommandComplete(cursor.sql, rowsSent); } else { client.sendPortalSuspended(); } + doneExecuting(); } catch (InterruptedException e) { throw new AssertionError(e); } catch (ExecutionException e) { @@ -785,10 +788,7 @@ preparedName = UNNAMED; } Prepared query = this.preparedMap.remove(preparedName); - if (query == null) { - errorOccurred(RuntimePlugin.Util.getString("no_stmt_found", preparedName)); //$NON-NLS-1$ - } - else { + if (query != null) { // Close all the bound messages off of this prepared // TODO: can there be more than one? this.portalMap.remove(preparedName); Modified: branches/7.7.x/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java =================================================================== --- branches/7.7.x/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java 2012-03-15 19:04:10 UTC (rev 3942) +++ branches/7.7.x/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java 2012-03-16 18:20:55 UTC (rev 3943) @@ -391,7 +391,7 @@ @Override public void terminated() { trace("channel being terminated"); - this.sendNoticeResponse("Connection closed"); + // no need to send any reply; this is showing as malformed packet. this.ctx.getChannel().close(); }

12 years, 9 months

1
0
0 / 0

teiid SVN: r3942 - in branches/7.7.x: documentation and 1 other directories.

by teiid-commits＠lists.jboss.org

Author: van.halbert Date: 2012-03-15 15:04:10 -0400 (Thu, 15 Mar 2012) New Revision: 3942 Added: branches/7.7.x/documentation/javadocs/ branches/7.7.x/documentation/javadocs/pom.xml Modified: branches/7.7.x/documentation/pom.xml branches/7.7.x/pom.xml Log: TEIID-1897 applied the javadocs patch to enable building teiid release in one pass Added: branches/7.7.x/documentation/javadocs/pom.xml =================================================================== --- branches/7.7.x/documentation/javadocs/pom.xml (rev 0) +++ branches/7.7.x/documentation/javadocs/pom.xml 2012-03-15 19:04:10 UTC (rev 3942) @@ -0,0 +1,465 @@ +<project xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='http://maven.apache.org/POM/4.0.0'> + <parent> + <groupId>org.jboss.teiid</groupId> + <artifactId>documentation</artifactId> + <version>7.7.1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>javadocs</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> + <name>Teiid Javadocs</name> + <description>Javadocs for the Teiid project</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-adminshell</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-cache-jbosscache</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client-jdk15</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>salesforce-api</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>translator-file</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>translator-hive</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>translator-jdbc</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>translator-ldap</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>translator-loopback</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>translator-olap</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>translator-salesforce</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>translator-ws</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-console</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-hibernate-dialect</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-jboss-integration</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-metadata</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-runtime</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>test-integration-common</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid.teiid-test-integration</groupId> + <artifactId>test-integration-db</artifactId> + <version>7.7.1</version> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>1.7.2</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + </dependency> + <dependency> + <groupId>jline</groupId> + <artifactId>jline</artifactId> + <version>0.9.94</version> + </dependency> + <dependency> + <groupId>org.fusesource.jansi</groupId> + <artifactId>jansi</artifactId> + <version>1.2.1</version> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + </dependency> + <dependency> + <groupId>net.sf.retrotranslator</groupId> + <artifactId>retrotranslator-runtime</artifactId> + <version>1.2.9</version> + </dependency> + <dependency> + <groupId>net.sf.retrotranslator</groupId> + <artifactId>retrotranslator-transformer</artifactId> + <version>1.2.9</version> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-managed</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxws</artifactId> + <version>2.2.2</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http</artifactId> + <version>2.2.2</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-security</artifactId> + <version>2.2.2</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-policy</artifactId> + <version>2.2.2</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-vfs</artifactId> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>org.olap4j</groupId> + <artifactId>olap4j</artifactId> + <version>0.9.8.343</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-core-domain</artifactId> + <version>${org.rhq.version}</version> + </dependency> + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-core-plugin-api</artifactId> + <version>${org.rhq.version}</version> + </dependency> + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-core-native-system</artifactId> + <version>${org.rhq.version}</version> + </dependency> + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-jmx-plugin</artifactId> + <version>${org.rhq.version}</version> + </dependency> + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-core-util</artifactId> + <version>${org.rhq.version}</version> + </dependency> + <dependency> + <groupId>mc4j</groupId> + <artifactId>org-mc4j-ems</artifactId> + <version>1.2.6</version> + </dependency> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>jboss.jboss-embeddable-ejb3</groupId> + <artifactId>hibernate-all</artifactId> + <version>1.0.0.Alpha9</version> + </dependency> + <dependency> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-profileservice-spi</artifactId> + <version>5.1.0.CR2</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-io</artifactId> + <version>1.3.2</version> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs-spi</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs</artifactId> + </dependency> + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxonhe</artifactId> + </dependency> + <dependency> + <groupId>com.googlecode.json-simple</groupId> + <artifactId>json-simple</artifactId> + </dependency> + <dependency> + <groupId>nux</groupId> + <artifactId>nux</artifactId> + <version>1.6</version> + </dependency> + <dependency> + <groupId>xom</groupId> + <artifactId>xom</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.5.2-Final</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-connector</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-aop-mc-int</artifactId> + <version>2.0.6.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + <version>2.0.3.SP1</version> + </dependency> + <dependency> + <groupId>org.jboss.naming</groupId> + <artifactId>jnp-client</artifactId> + <version>5.0.3.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + <version>2.5.1</version> + </dependency> + <dependency> + <groupId>org.jboss.aspects</groupId> + <artifactId>jboss-security-aspects</artifactId> + <version>1.0.0.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.aspects</groupId> + <artifactId>jboss-remoting-aspects</artifactId> + <version>1.0.1.GA</version> + </dependency> + <dependency> + <groupId>oswego-concurrent</groupId> + <artifactId>concurrent</artifactId> + <version>1.3.4-jboss-update1</version> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-server</artifactId> + <version>5.1.0.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-profileservice</artifactId> + <version>5.1.0.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.netty</groupId> + <artifactId>netty</artifactId> + </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.3-606.jdbc3</version> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.2.147</version> + </dependency> + <dependency> + <groupId>jgroups</groupId> + <artifactId>jgroups</artifactId> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-launcher</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>ant-contrib</artifactId> + <version>1.0b3</version> + </dependency> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>cpptasks</artifactId> + <version>1.0b3</version> + </dependency> + <dependency> + <groupId>org.dbunit</groupId> + <artifactId>dbunit</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.6</version> + </dependency> + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi</artifactId> + <version>3.2-FINAL</version> + </dependency> + <dependency> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <version>${derby.version}</version> + </dependency> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>${mysql.connector.version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>javadoc-jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <includeDependencySources>true</includeDependencySources> + <detectOfflineLinks>false</detectOfflineLinks> + <dependencySourceIncludes> + <dependencySourceInclude>org.jboss.teiid*</dependencySourceInclude> + </dependencySourceIncludes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <properties> + <org.jboss.jopr.as5.version>1.2.0.GA</org.jboss.jopr.as5.version> + <mysql.connector.version>5.1.5</mysql.connector.version> + <org.rhq.version>1.3.0.GA</org.rhq.version> + <postgresql.version>8.4-702.jdbc4</postgresql.version> + <derby.version>10.2.1.6</derby.version> + <teiid.version>${project.version}</teiid.version> + <site.url>http://www.jboss.org/teiid</site.url> + <ant.version>1.7.0</ant.version> + <apache.ant.version>1.7.0</apache.ant.version> + <jopr.jboss.as5.plugin.version>1.4.0.B01</jopr.jboss.as5.plugin.version> + </properties> +</project> \ No newline at end of file Modified: branches/7.7.x/documentation/pom.xml =================================================================== --- branches/7.7.x/documentation/pom.xml 2012-03-14 21:39:03 UTC (rev 3941) +++ branches/7.7.x/documentation/pom.xml 2012-03-15 19:04:10 UTC (rev 3942) @@ -17,5 +17,6 @@ <module>quick-start-example</module> <module>client-developers-guide</module> <module>caching-guide</module> + <module>javadocs</module> </modules> </project> \ No newline at end of file Modified: branches/7.7.x/pom.xml =================================================================== --- branches/7.7.x/pom.xml 2012-03-14 21:39:03 UTC (rev 3941) +++ branches/7.7.x/pom.xml 2012-03-15 19:04:10 UTC (rev 3942) @@ -82,25 +82,18 @@ </modules> <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.8</version> - <configuration> - <maxmemory>512m</maxmemory> - <excludePackageNames>*.internal,com.*,net.*,org.teiid.cache,org.teiid.common.*,org.teiid.core,org.teiid.deployers,org.teiid.dqp.*,org.teiid.jboss,org.teiid.netty.*,org.teiid.odbc,org.teiid.query,org.teiid.resource.*,org.teiid.rhq.*,org.teiid.runtime,org.teiid.security,org.teiid.services,org.teiid.templates,org.teiid.test.*,org.teiid.transport,org.teiid.vdb.*</excludePackageNames> - </configuration> - <executions> - <execution> - <goals> - <goal>aggregate-jar</goal> - </goals> - </execution> - </executions> - </plugin> + </plugins> + </build> </profile> + + <profile> + <id>docs</id> + <modules> + <module>documentation</module> + </modules> + </profile> <profile>  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.8.1</version> + <configuration> + <maxmemory>512m</maxmemory> + <excludePackageNames>*.internal,com.*,net.*,org.teiid.cache,org.teiid.common.*,org.teiid.core,org.teiid.deployers,org.teiid.dqp.*,org.teiid.jboss,org.teiid.netty.*,org.teiid.odbc,org.teiid.query,org.teiid.resource.*,org.teiid.rhq.*,org.teiid.runtime,org.teiid.security,org.teiid.services,org.teiid.templates,org.teiid.test.*,org.teiid.transport,org.teiid.vdb.*</excludePackageNames> + </configuration> + <executions> + <execution> + <goals> + <goal>aggregate-jar</goal> + </goals> + </execution> + </executions> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> @@ -200,7 +209,7 @@ <execution> <id>attach-sources</id> <goals> - <goal>jar</goal> + <goal>jar-no-fork</goal> </goals> </execution> </executions>

12 years, 9 months

1
0
0 / 0

teiid SVN: r3941 - in trunk: engine/src/main/java/org/teiid/query/metadata and 2 other directories.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2012-03-14 17:39:03 -0400 (Wed, 14 Mar 2012) New Revision: 3941 Modified: trunk/api/src/main/java/org/teiid/metadata/MetadataRepository.java trunk/engine/src/main/java/org/teiid/query/metadata/BaseMetadataRepository.java trunk/engine/src/main/java/org/teiid/query/metadata/DDLMetadataRepository.java trunk/engine/src/main/java/org/teiid/query/metadata/NativeMetadataRepository.java trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataRepository.java Log: TEIID-1971: Adding facility to stack the metadata repositories for given model. Modified: trunk/api/src/main/java/org/teiid/metadata/MetadataRepository.java =================================================================== --- trunk/api/src/main/java/org/teiid/metadata/MetadataRepository.java 2012-03-14 18:56:05 UTC (rev 3940) +++ trunk/api/src/main/java/org/teiid/metadata/MetadataRepository.java 2012-03-14 21:39:03 UTC (rev 3941) @@ -106,4 +106,11 @@ * @param value */ void setProperty(String vdbName, int vdbVersion, AbstractMetadataRecord record, String name, String value); + + /** + * Next repository in the repository chain. The implementation contract of this method dictates if this method is set then + * Implementation class must delegete the call to 'next' instance after it is done with the processing of the call. + * @param next + */ + void setNext(MetadataRepository next); } Modified: trunk/engine/src/main/java/org/teiid/query/metadata/BaseMetadataRepository.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/BaseMetadataRepository.java 2012-03-14 18:56:05 UTC (rev 3940) +++ trunk/engine/src/main/java/org/teiid/query/metadata/BaseMetadataRepository.java 2012-03-14 21:39:03 UTC (rev 3941) @@ -24,47 +24,81 @@ import org.teiid.metadata.AbstractMetadataRecord; import org.teiid.metadata.Column; import org.teiid.metadata.ColumnStats; +import org.teiid.metadata.MetadataFactory; import org.teiid.metadata.MetadataRepository; import org.teiid.metadata.Procedure; import org.teiid.metadata.Table; import org.teiid.metadata.Table.TriggerEvent; import org.teiid.metadata.TableStats; +import org.teiid.translator.ExecutionFactory; +import org.teiid.translator.TranslatorException; -public abstract class BaseMetadataRepository<F, C> implements MetadataRepository { - +public class BaseMetadataRepository<F, C> implements MetadataRepository { + protected MetadataRepository nextRepository; + @Override - public void setViewDefinition(String vdbName, int vdbVersion, Table table, - String viewDefinition) { + public void loadMetadata(MetadataFactory factory, ExecutionFactory executionFactory, Object connectionFactory) throws TranslatorException { + if (this.nextRepository != null) { + this.nextRepository.loadMetadata(factory, executionFactory, connectionFactory); + } + } + + @Override + public void setViewDefinition(String vdbName, int vdbVersion, Table table,String viewDefinition) { + if (this.nextRepository != null) { + this.nextRepository.setViewDefinition(vdbName, vdbVersion, table, viewDefinition); + } } @Override public void setInsteadOfTriggerDefinition(String vdbName, int vdbVersion, Table table, TriggerEvent triggerOperation, String triggerDefinition) { + if (this.nextRepository != null) { + this.nextRepository.setInsteadOfTriggerDefinition(vdbName, vdbVersion, table, triggerOperation, triggerDefinition); + } } @Override public void setInsteadOfTriggerEnabled(String vdbName, int vdbVersion, Table table, TriggerEvent triggerOperation, boolean enabled) { + if (this.nextRepository != null) { + this.nextRepository.setInsteadOfTriggerEnabled(vdbName, vdbVersion, table, triggerOperation, enabled); + } } @Override public void setProcedureDefinition(String vdbName, int vdbVersion, Procedure procedure, String procedureDefinition) { + if (this.nextRepository != null) { + this.nextRepository.setProcedureDefinition(vdbName, vdbVersion, procedure, procedureDefinition); + } } @Override public void setTableStats(String vdbName, int vdbVersion, Table table, TableStats tableStats) { + if (this.nextRepository != null) { + this.nextRepository.setTableStats(vdbName, vdbVersion, table, tableStats); + } } @Override public void setColumnStats(String vdbName, int vdbVersion, Column column, ColumnStats columnStats) { + if (this.nextRepository != null) { + this.nextRepository.setColumnStats(vdbName, vdbVersion, column, columnStats); + } } @Override public void setProperty(String vdbName, int vdbVersion, AbstractMetadataRecord record, String name, String value) { + if (this.nextRepository != null) { + this.nextRepository.setProperty(vdbName, vdbVersion, record, name, value); + } } + public void setNext(MetadataRepository next) { + this.nextRepository = next; + } } Modified: trunk/engine/src/main/java/org/teiid/query/metadata/DDLMetadataRepository.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/DDLMetadataRepository.java 2012-03-14 18:56:05 UTC (rev 3940) +++ trunk/engine/src/main/java/org/teiid/query/metadata/DDLMetadataRepository.java 2012-03-14 21:39:03 UTC (rev 3941) @@ -29,12 +29,15 @@ public class DDLMetadataRepository extends BaseMetadataRepository { + @Override - public void loadMetadata(MetadataFactory factory, ExecutionFactory exeuctionFactory, Object connectionFactory) throws TranslatorException { + public void loadMetadata(MetadataFactory factory, ExecutionFactory executionFactory, Object connectionFactory) throws TranslatorException { try { QueryParser.getQueryParser().parseDDL(factory, factory.getRawMetadata()); } catch (ParseException e) { throw new TranslatorException(e.getMessage()); } + super.loadMetadata(factory, executionFactory, connectionFactory); } + } Modified: trunk/engine/src/main/java/org/teiid/query/metadata/NativeMetadataRepository.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/NativeMetadataRepository.java 2012-03-14 18:56:05 UTC (rev 3940) +++ trunk/engine/src/main/java/org/teiid/query/metadata/NativeMetadataRepository.java 2012-03-14 21:39:03 UTC (rev 3941) @@ -59,6 +59,8 @@ executionFactory.closeConnection(connection, connectionFactory); } validateMetadata(factory); + + super.loadMetadata(factory, executionFactory, connectionFactory); } private void validateMetadata(MetadataFactory schema) throws TranslatorException { Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java 2012-03-14 18:56:05 UTC (rev 3940) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java 2012-03-14 21:39:03 UTC (rev 3941) @@ -23,6 +23,7 @@ import java.util.List; import java.util.ServiceLoader; +import java.util.StringTokenizer; import java.util.concurrent.Executor; import org.jboss.as.naming.deployment.ContextNames; @@ -278,28 +279,51 @@ return null; } - if (model.getSchemaSourceType().equalsIgnoreCase("DDL")) { //$NON-NLS-1$ - return new DDLMetadataRepository(); - } + MetadataRepository first = null; + MetadataRepository current = null; + MetadataRepository previous = null; + StringTokenizer st = new StringTokenizer(model.getSchemaSourceType(), ","); //$NON-NLS-1$ + while (st.hasMoreTokens()) { + String repoType = st.nextToken().trim(); + if (repoType.equalsIgnoreCase("DDL")) { //$NON-NLS-1$ + current = new DDLMetadataRepository(); + } + else if (repoType.equalsIgnoreCase("INDEX")) { //$NON-NLS-1$ + current = indexRepo; + } + else if (repoType.equalsIgnoreCase("NATIVE")) { //$NON-NLS-1$ + current = new NativeMetadataRepository(); + } + else { + // if the schema type is a module based + current = getModuleBasedMetadataRepository(model.getName(), repoType); + } - if (model.getSchemaSourceType().equalsIgnoreCase("INDEX")) { //$NON-NLS-1$ - return indexRepo; + if (current != null) { + if (first == null) { + first = current; + } + + if (previous != null) { + previous.setNext(current); + } + previous = current; + current = null; + } } - - if (model.getSchemaSourceType().equalsIgnoreCase("NATIVE")) { //$NON-NLS-1$ - return new NativeMetadataRepository(); - } - - // if the schema type is a module based - final Module module; + return first; + } + + private MetadataRepository getModuleBasedMetadataRepository(final String modelName, final String moduleName) throws DeploymentUnitProcessingException { + final Module module; ClassLoader moduleLoader = this.getClass().getClassLoader(); ModuleLoader ml = Module.getCallerModuleLoader(); - if (model.getSchemaSourceType() != null && ml != null) { + if (moduleName != null && ml != null) { try { - module = ml.loadModule(ModuleIdentifier.create(model.getSchemaSourceType())); + module = ml.loadModule(ModuleIdentifier.create(moduleName)); moduleLoader = module.getClassLoader(); } catch (ModuleLoadException e) { - throw new DeploymentUnitProcessingException(IntegrationPlugin.Util.getString("failed_load_module", IntegrationPlugin.Event.TEIID50068, model.getSchemaSourceType(), model.getName())); //$NON-NLS-1$ + throw new DeploymentUnitProcessingException(IntegrationPlugin.Util.getString("failed_load_module", IntegrationPlugin.Event.TEIID50068, moduleName, modelName)); //$NON-NLS-1$ } } Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataRepository.java =================================================================== --- trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataRepository.java 2012-03-14 18:56:05 UTC (rev 3940) +++ trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataRepository.java 2012-03-14 21:39:03 UTC (rev 3941) @@ -48,5 +48,7 @@ } catch (IOException e) { throw new TranslatorException(e); } + + super.loadMetadata(factory, executionFactory, connectionFactory); } }

12 years, 9 months

1
0
0 / 0

teiid SVN: r3940 - in branches/7.7.x: engine/src/main/java/org/teiid/query/optimizer/relational/rules and 1 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2012-03-14 14:56:05 -0400 (Wed, 14 Mar 2012) New Revision: 3940 Modified: branches/7.7.x/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushAggregates.java branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java Log: TEIID-1972 fix for inappropriate staging and fixing a message Modified: branches/7.7.x/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties =================================================================== --- branches/7.7.x/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties 2012-03-14 15:17:58 UTC (rev 3939) +++ branches/7.7.x/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties 2012-03-14 18:56:05 UTC (rev 3940) @@ -28,6 +28,6 @@ JDBCQueryExecution.Error_executing_query__1 = ''{0}'' error executing statement(s): {1} SQLConversionVisitor.invalid_parameter=Invalid parameter {0}. Must be between 1 and {1}. SQLConversionVisitor.not_in_parameter=Invalid parameter {0}. Native query procedures cannot use non IN parameters. -OraleExecutionFactory.invalid_hint=Not using oracle execution payload {0} as hint, since it apprears to contain more than just a single comment. +OraleExecutionFactory.invalid_hint=Not using oracle execution payload {0} as hint, since it appears to contain more than just a single comment. ConnectionListener.failed_to_report_jdbc_connection_details=Failed to report the JDBC driver and connection information JDBCMetadataProcessor.not_unique=Teiid runtime names, which are case insensitive, for the imported metadata are not unique. If not already set, use the setting importer.useFullSchemaName to create Teiid names that include the source schema. \ No newline at end of file Modified: branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushAggregates.java =================================================================== --- branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushAggregates.java 2012-03-14 15:17:58 UTC (rev 3939) +++ branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushAggregates.java 2012-03-14 18:56:05 UTC (rev 3940) @@ -22,19 +22,7 @@ package org.teiid.query.optimizer.relational.rules; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import org.teiid.api.exception.query.QueryMetadataException; import org.teiid.api.exception.query.QueryPlannerException; @@ -69,16 +57,7 @@ import org.teiid.query.sql.lang.OrderBy; import org.teiid.query.sql.lang.Select; import org.teiid.query.sql.lang.SetQuery.Operation; -import org.teiid.query.sql.symbol.AggregateSymbol; -import org.teiid.query.sql.symbol.AliasSymbol; -import org.teiid.query.sql.symbol.Constant; -import org.teiid.query.sql.symbol.ElementSymbol; -import org.teiid.query.sql.symbol.Expression; -import org.teiid.query.sql.symbol.ExpressionSymbol; -import org.teiid.query.sql.symbol.Function; -import org.teiid.query.sql.symbol.GroupSymbol; -import org.teiid.query.sql.symbol.SearchedCaseExpression; -import org.teiid.query.sql.symbol.SingleElementSymbol; +import org.teiid.query.sql.symbol.*; import org.teiid.query.sql.symbol.AggregateSymbol.Type; import org.teiid.query.sql.util.SymbolMap; import org.teiid.query.sql.visitor.AggregateSymbolCollectorVisitor; @@ -795,12 +774,12 @@ return result; } for (T aggregateSymbol : expressions) { - if (aggs && ((AggregateSymbol)aggregateSymbol).getExpression() == null) { - return null; //count(*) is not yet handled. a general approach would be count(*) => count(r.col) * count(l.col), but the logic here assumes a simpler initial mapping + if (aggs) { + AggregateSymbol as = (AggregateSymbol)aggregateSymbol; + if ((!as.canStage() && as.isCardinalityDependent()) || (as.getAggregateFunction() == Type.COUNT && as.getExpression() == null)) { + return null; //count(*) is not yet handled. a general approach would be count(*) => count(r.col) * count(l.col), but the logic here assumes a simpler initial mapping + } } - if (aggs && !((AggregateSymbol)aggregateSymbol).canStage()) { - continue; - } Set<GroupSymbol> groups = GroupsUsedByElementsVisitor.getGroups(aggregateSymbol); if (groups.isEmpty()) { continue; Modified: branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java =================================================================== --- branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java 2012-03-14 15:17:58 UTC (rev 3939) +++ branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java 2012-03-14 18:56:05 UTC (rev 3940) @@ -620,6 +620,32 @@ }); } + @Test public void testCountXMLAgg() { + FakeCapabilitiesFinder capFinder = new FakeCapabilitiesFinder(); + BasicSourceCapabilities caps = getAggregateCapabilities(); + capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$ + capFinder.addCapabilities("pm2", caps); //$NON-NLS-1$ + + ProcessorPlan plan = TestOptimizer.helpPlan("select count(X.e1), xmlagg(xmlelement(name e1, x.e1) order by x.e2) FROM pm1.g1 as X, pm2.g2 as Y group by X.e2", RealMetadataFactory.example1Cached(), null, capFinder, //$NON-NLS-1$ + new String[]{"SELECT 1 FROM pm2.g2 AS g_0", "SELECT g_0.e2, g_0.e1 FROM pm1.g1 AS g_0"}, true); //$NON-NLS-1$ + TestOptimizer.checkNodeTypes(plan, new int[] { + 2, // Access + 0, // DependentAccess + 0, // DependentSelect + 0, // DependentProject + 0, // DupRemove + 1, // Grouping + 1, // NestedLoopJoinStrategy + 0, // MergeJoinStrategy + 0, // Null + 0, // PlanExecution + 1, // Project + 0, // Select + 0, // Sort + 0 // UnionAll + }); + } + @Test public void testBusObjQuestion1() { FakeCapabilitiesFinder capFinder = new FakeCapabilitiesFinder(); BasicSourceCapabilities caps = getTypicalCapabilities();

12 years, 9 months

1
0
0 / 0

teiid SVN: r3938 - branches/7.4.x/console/src/main/resources/META-INF.

by teiid-commits＠lists.jboss.org

Author: jolee Date: 2012-03-14 09:48:39 -0400 (Wed, 14 Mar 2012) New Revision: 3938 Modified: branches/7.4.x/console/src/main/resources/META-INF/rhq-plugin.xml Log: BZ-786561 Update of teiid-releasenotes.html and poms to 7.4.3 ( and rhq-plugin.xml to 2.0.2 ) Modified: branches/7.4.x/console/src/main/resources/META-INF/rhq-plugin.xml =================================================================== --- branches/7.4.x/console/src/main/resources/META-INF/rhq-plugin.xml 2012-03-14 13:16:48 UTC (rev 3937) +++ branches/7.4.x/console/src/main/resources/META-INF/rhq-plugin.xml 2012-03-14 13:48:39 UTC (rev 3938) @@ -73,7 +73,7 @@ <plugin name="TeiidPlugin" displayName="Teiid Plugin" package="org.teiid.rhq.plugin" - version="2.0.1" description="Supports management and monitoring of JBoss Teiid" + version="2.0.2" description="Supports management and monitoring of JBoss Teiid" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:xmlns:rhq-plugin" xmlns:c="urn:xmlns:rhq-configuration">

12 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

teiid-commits March 2012