March 2009 - teiid-commits - Jboss List Archives

teiid SVN: r577 - trunk/build/kit-embedded/examples/portfolio/PortfolioModel.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2009-03-18 14:39:01 -0400 (Wed, 18 Mar 2009) New Revision: 577 Modified: trunk/build/kit-embedded/examples/portfolio/PortfolioModel/Portfolio.vdb Log: TEIID-298: Fixing this for the 6.0 release Modified: trunk/build/kit-embedded/examples/portfolio/PortfolioModel/Portfolio.vdb =================================================================== (Binary files differ)

15 years, 2 months

1
0
0 / 0

teiid SVN: r576 - in trunk: embedded/src/main/java/com/metamatrix/dqp/embedded/services and 1 other directories.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2009-03-18 14:34:06 -0400 (Wed, 18 Mar 2009) New Revision: 576 Removed: trunk/embedded/src/main/resources/configuration.xml Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedDataService.java Log: TEIID-66 Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java =================================================================== --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java 2009-03-18 18:25:16 UTC (rev 575) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java 2009-03-18 18:34:06 UTC (rev 576) @@ -37,6 +37,7 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; +import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -74,6 +75,7 @@ static final String DQP_IDENTITY = "dqp.identity"; //$NON-NLS-1$ static final String MM_IO_TMPDIR = "mm.io.tmpdir"; //$NON-NLS-1$ + private static Logger logger = Logger.getLogger("org.teiid.jdbc"); //$NON-NLS-1$ private static EmbeddedTransport currentTransport = null; static Pattern urlPattern = Pattern.compile(URL_PATTERN); @@ -111,6 +113,10 @@ parseURL(url, info); conn = createConnection(info); + // logging + String logMsg = JDBCPlugin.Util.getString("JDBCDriver.Connection_sucess"); //$NON-NLS-1$ + logger.info(logMsg); + return conn; } @@ -226,7 +232,7 @@ * @param jdbcURL * @return default connection URL */ - String getDefaultConnectionURL() { + static String getDefaultConnectionURL() { return "classpath:/deploy.properties"; //$NON-NLS-1$ } @@ -349,15 +355,17 @@ //Load the properties from dqp.properties file Properties props = loadDQPProperties(dqpURL); props.putAll(info); - + this.classLoader = this.getClass().getClassLoader(); // a non-delegating class loader will be created from where all third party dependent jars can be loaded ArrayList<URL> runtimeClasspath = new ArrayList<URL>(); // find jars in the "lib" directory; patches is reverse alpaha and not case sensitive so small letters then capitals - runtimeClasspath.addAll(libClassPath(dqpURL, "lib/patches/", MMURLConnection.REVERSEALPHA)); //$NON-NLS-1$ - runtimeClasspath.addAll(libClassPath(dqpURL, "lib/", MMURLConnection.DATE)); //$NON-NLS-1$ + if (!EmbeddedDriver.getDefaultConnectionURL().equals(dqpURL.toString())) { + runtimeClasspath.addAll(libClassPath(dqpURL, "lib/patches/", MMURLConnection.REVERSEALPHA)); //$NON-NLS-1$ + runtimeClasspath.addAll(libClassPath(dqpURL, "lib/", MMURLConnection.DATE)); //$NON-NLS-1$ + } URL[] dqpClassPath = runtimeClasspath.toArray(new URL[runtimeClasspath.size()]); this.classLoader = new NonDelegatingClassLoader(dqpClassPath, Thread.currentThread().getContextClassLoader(), new MetaMatrixURLStreamHandlerFactory()); Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedDataService.java =================================================================== --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedDataService.java 2009-03-18 18:25:16 UTC (rev 575) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedDataService.java 2009-03-18 18:34:06 UTC (rev 576) @@ -585,7 +585,9 @@ ArrayList<URL> urlPath = new ArrayList<URL>(); urlPath.addAll(Arrays.asList(userPath)); - urlPath.addAll(Arrays.asList(commonExtensionPath)); + if (commonExtensionPath != null) { + urlPath.addAll(Arrays.asList(commonExtensionPath)); + } ClassLoader classLoader = new URLFilteringClassLoader(urlPath.toArray(new URL[urlPath.size()]), Thread.currentThread().getContextClassLoader(), new MetaMatrixURLStreamHandlerFactory()); Class cmgrImplClass = classLoader.loadClass(CONNECTOR_MGR_IMPL); Deleted: trunk/embedded/src/main/resources/configuration.xml =================================================================== --- trunk/embedded/src/main/resources/configuration.xml 2009-03-18 18:25:16 UTC (rev 575) +++ trunk/embedded/src/main/resources/configuration.xml 2009-03-18 18:34:06 UTC (rev 576) @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><ConfigurationDocument> - <Header> - <ApplicationCreatedBy>ConfigurationAdministration</ApplicationCreatedBy> - <ApplicationVersionCreatedBy>4.2</ApplicationVersionCreatedBy> - <UserCreatedBy>Configuration</UserCreatedBy> - <ConfigurationVersion>4.2</ConfigurationVersion> - <MetaMatrixSystemVersion>4.2</MetaMatrixSystemVersion> - <Time>2004-06-30T12:23:53.919-06:00</Time> - </Header> - - <Configuration Name="Next Startup" ComponentType="Configuration" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup"><Properties/></Configuration> - - <Services> - <Service Name="QueryService" ComponentType="QueryService" QueuedService="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup"> - <Properties> - <Property Name="metamatrix.service.essentialservice">false</Property> - <Property Name="ProcessPoolMaxThreads">64</Property> - <Property Name="ProcessPoolThreadTTL">120000</Property> - <Property Name="ServiceClassName">com.metamatrix.server.query.service.QueryService</Property> - <Property Name="ProcessorTimeslice">2000</Property> - <Property Name="MaxCodeTables">50</Property> - <Property Name="MaxCodeTableRecords">10000</Property> - <Property Name="MinFetchSize">100</Property> - <Property Name="MaxFetchSize">20000</Property> - <Property Name="ResultSetCacheEnabled">0</Property> - <Property Name="ResultSetCacheMaxSize">0</Property> - <Property Name="ResultSetCacheMaxAge">0</Property> - <Property Name="ResultSetCacheScope">vdb</Property> - <Property Name="MaxPlanCacheSize">100</Property> - </Properties> - </Service> - </Services> - - <ProductTypes> - <ProductType Name="Connectors" ComponentTypeCode="3" Deployable="false" Deprecated="false" Monitorable="false" SuperComponentType="Product" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup"> - </ProductType> - </ProductTypes> - - <ComponentTypes> - <ComponentType Name="Service" ComponentTypeCode="1" Deployable="false" Deprecated="false" Monitorable="false" ParentComponentType="VM" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup"> - <PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" Multiplicity="1" PropertyType="String" ValueDelimiter="," IsConstrainedToAllowedValues="true" IsExpert="false" IsHidden="true" IsMasked="false" IsModifiable="true" IsPreferred="false"/> - <PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the Integration Server" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" ValueDelimiter="," IsConstrainedToAllowedValues="true" IsExpert="true" IsHidden="true" IsMasked="false" IsModifiable="true" IsPreferred="false"/> - </ComponentType> - - <ComponentType Name="QueryService" ComponentTypeCode="1" Deployable="true" Deprecated="false" Monitorable="true" SuperComponentType="Service" ParentComponentType="Integration Server" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup"> - </ComponentType> - - <ComponentType Name="Configuration" ComponentTypeCode="0" Deployable="true" Deprecated="false" Monitorable="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup"> - </ComponentType> - </ComponentTypes> -</ConfigurationDocument> \ No newline at end of file

15 years, 2 months

1
0
0 / 0

teiid SVN: r575 - in trunk: connectors/connector-jdbc/src/main/resources and 5 other directories.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2009-03-18 14:25:16 -0400 (Wed, 18 Mar 2009) New Revision: 575 Modified: trunk/build/kit-embedded/deploy/configuration.xml trunk/connectors/connector-jdbc/src/main/resources/connector-jdbc.xml trunk/connectors/connector-ldap/src/main/resources/connector-ldap.xml trunk/connectors/connector-loopback/src/main/resources/connector-loopback.xml trunk/connectors/connector-salesforce/src/main/resources/connector-salesforce.xml trunk/connectors/connector-text/src/main/resources/connector-text.xml trunk/connectors/connector-xml/src/main/resources/connector-xml.xml Log: TEIID-413: Fixing Case sensitive "isExpert" to "IsExpert" Modified: trunk/build/kit-embedded/deploy/configuration.xml =================================================================== --- trunk/build/kit-embedded/deploy/configuration.xml 2009-03-17 22:07:31 UTC (rev 574) +++ trunk/build/kit-embedded/deploy/configuration.xml 2009-03-18 18:25:16 UTC (rev 575) @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?><ConfigurationDocument> <Header> <ApplicationCreatedBy>Teiid</ApplicationCreatedBy> - <ApplicationVersionCreatedBy>4.2</ApplicationVersionCreatedBy> + <ApplicationVersionCreatedBy>6.0</ApplicationVersionCreatedBy> <UserCreatedBy>Configuration</UserCreatedBy> - <ConfigurationVersion>4.2</ConfigurationVersion> - <MetaMatrixSystemVersion>4.2</MetaMatrixSystemVersion> - <Time>2008-06-30T12:23:53.919-06:00</Time> + <ConfigurationVersion>6.0</ConfigurationVersion> + <MetaMatrixSystemVersion>6.0</MetaMatrixSystemVersion> + <Time>2009-03-17T12:23:53.919-06:00</Time> </Header> <Configuration Name="Next Startup" ComponentType="Configuration" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup"><Properties/></Configuration> @@ -47,5 +47,76 @@ <ComponentType Name="Configuration" ComponentTypeCode="0" Deployable="true" Deprecated="false" Monitorable="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup"> </ComponentType> + <ComponentType Name="Connector" ComponentTypeCode="2" Deployable="false" Deprecated="false" Monitorable="true" SuperComponentType="Service" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.916-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.916-06:00"> + <PropertyDefinition Name="SourceConnectionTestInterval" DisplayName="Data Source Test Connect Interval (seconds)" ShortDescription="How often (in seconds) to create test connections to the underlying datasource to see if it is available." DefaultValue="600" Multiplicity="1" PropertyType="Integer" /> + <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true"/> + <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system)" Multiplicity="0..1" IsExpert="true"/> + <PropertyDefinition Name="ExceptionOnMaxRows" DisplayName="Exception on Exceeding Max Rows" ShortDescription="Indicates if an Exception should be thrown if the specified value for Maximum Result Rows is exceeded; else no exception and no more than the maximum will be returned" DefaultValue="true" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the Integration Server" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" IsExpert="true" IsHidden="true" /> + <PropertyDefinition Name="ServiceMonitoringEnabled" DisplayName="Data Source Monitoring Enabled" ShortDescription="Whether to monitor the underlying data source to see if it is available." DefaultValue="true" Multiplicity="1" PropertyType="Boolean" ISExpert="true"/> + <PropertyDefinition Name="Immutable" DisplayName="Is Immutable" ShortDescription="True if the source never changes." DefaultValue="false" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="ConnectorMaxThreads" DisplayName="Connector Maximum Thread Count" ShortDescription="" DefaultValue="20" Multiplicity="1" PropertyType="Integer" IsExpert="true" /> + <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" Multiplicity="1" IsExpert="true" IsHidden="true" /> + <PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" DefaultValue="com.metamatrix.server.connector.service.ConnectorService" Multiplicity="1" IsHidden="true" /> + <PropertyDefinition Name="MaxResultRows" DisplayName="Maximum Result Rows" ShortDescription="" DefaultValue="10000" Multiplicity="1" PropertyType="Integer" IsExpert="true" /> + <PropertyDefinition Name="ConnectorThreadTTL" DisplayName="Thread Time to live (milliseconds)" ShortDescription="" DefaultValue="120000" Multiplicity="1" PropertyType="Integer" IsExpert="true" /> + <PropertyDefinition Name="ResultSetCacheMaxAge" DisplayName="ResultSet Cache Maximum Age (milliseconds)" ShortDescription="" DefaultValue="0" PropertyType="Long" IsExpert="true"/> + <PropertyDefinition Name="ResultSetCacheScope" DisplayName="ResultSet Cache Scope" ShortDescription="" DefaultValue="vdb" IsExpert="true"> + <AllowedValue>vdb</AllowedValue> + <AllowedValue>session</AllowedValue> + </PropertyDefinition> + <PropertyDefinition Name="supportsAndCriteria" DisplayName="supportsAndCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsCompareCriteria" DisplayName="supportsCompareCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsCompareCriteriaEquals" DisplayName="supportsCompareCriteriaEquals" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsCompareCriteriaGreaterThan" DisplayName="supportsCompareCriteriaGreaterThan" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsCompareCriteriaGreaterThanOrEqual" DisplayName="supportsCompareCriteriaGreaterThanOrEqual" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsCompareCriteriaLessThan" DisplayName="supportsCompareCriteriaLessThan" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsCompareCriteriaLessThanOrEqual" DisplayName="supportsCompareCriteriaLessThanOrEqual" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsCompareCriteriaNotEquals" DisplayName="supportsCompareCriteriaNotEquals" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsCriteria" DisplayName="supportsCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsInCriteria" DisplayName="supportsInCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsIsNullCriteria" DisplayName="supportsIsNullCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsJoins" DisplayName="supportsJoins" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsLikeCriteria" DisplayName="supportsLikeCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsNotCriteria" DisplayName="supportsNotCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsOrCriteria" DisplayName="supportsOrCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsSelectDistinct" DisplayName="supportsSelectDistinct" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsSelectLiterals" DisplayName="supportsSelectLiterals" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsAliasedGroup" DisplayName="supportsAliasedGroup" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsSelfJoins" DisplayName="supportsSelfJoins" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsOuterJoins" DisplayName="supportsOuterJoins" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsFullOuterJoins" DisplayName="supportsFullOuterJoins" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsBetweenCriteria" DisplayName="supportsBetweenCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsLikeCriteriaEscapeCharacter" DisplayName="supportsLikeCriteriaEscapeCharacter" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsInCriteriaSubquery" DisplayName="supportsInCriteriaSubquery" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsExistsCriteria" DisplayName="supportsExistsCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsQuantifiedCompareCriteria" DisplayName="supportsQuantifiedCompareCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsQuantifiedCompareCriteriaSome" DisplayName="supportsQuantifiedCompareCriteriaSome" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsQuantifiedCompareCriteriaAll" DisplayName="supportsQuantifiedCompareCriteriaAll" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsOrderBy" DisplayName="supportsOrderBy" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsAggregates" DisplayName="supportsAggregates" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsAggregatesSum" DisplayName="supportsAggregatesSum" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsAggregatesAvg" DisplayName="supportsAggregatesAvg" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsAggregatesMin" DisplayName="supportsAggregatesMin" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsAggregatesMax" DisplayName="supportsAggregatesMax" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsAggregatesCount" DisplayName="supportsAggregatesCount" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsAggregatesCountStar" DisplayName="supportsAggregatesCountStar" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsAggregatesDistinct" DisplayName="supportsAggregatesDistinct" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsScalarSubqueries" DisplayName="supportsScalarSubqueries" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsCorrelatedSubqueries" DisplayName="supportsCorrelatedSubqueries" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsCaseExpressions" DisplayName="supportsCaseExpressions" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsSearchedCaseExpressions" DisplayName="supportsSearchedCaseExpressions" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsScalarFunctions" DisplayName="supportsScalarFunctions" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="getSupportedFunctions" DisplayName="getSupportedFunctions" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="string" IsExpert="true" /> + <PropertyDefinition Name="supportsXATransactions" DisplayName="supportsXATransactions" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsInlineViews" DisplayName="supportsInlineViews" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsOrderByInInlineViews" DisplayName="supportsOrderByInInlineViews" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsUnionOrderBy" DisplayName="supportsUnionOrderBy" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + <PropertyDefinition Name="supportsUnions" DisplayName="supportsUnions" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" /> + </ComponentType> +  +  </ComponentTypes> </ConfigurationDocument> \ No newline at end of file Modified: trunk/connectors/connector-jdbc/src/main/resources/connector-jdbc.xml =================================================================== --- trunk/connectors/connector-jdbc/src/main/resources/connector-jdbc.xml 2009-03-17 22:07:31 UTC (rev 574) +++ trunk/connectors/connector-jdbc/src/main/resources/connector-jdbc.xml 2009-03-18 18:25:16 UTC (rev 575) @@ -1,6 +1,6 @@ <ComponentType Name="JDBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.952-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.952-06:00"> <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true"/> - <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:${project.artifactId}.${project.version}.jar;${classpath}" Multiplicity="0..1" isExpert="true"/> + <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:${project.artifactId}.${project.version}.jar;${classpath}" Multiplicity="0..1" IsExpert="true"/> <PropertyDefinition Name="UseBindVariables" DisplayName="Use prepared statements and bind variables" ShortDescription="" DefaultValue="false" PropertyType="Boolean" IsExpert="true" /> <PropertyDefinition Name="Standard" DisplayName="Standard Type" ShortDescription="Standard Built-in Connector Type" DefaultValue="true" PropertyType="Boolean" IsExpert="true" IsModifiable="false" /> <PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" IsExpert="true" /> @@ -15,7 +15,7 @@ <PropertyDefinition Name="User" DisplayName="User Name" ShortDescription="" Multiplicity="0" IsConstrainedToAllowedValues="false" IsPreferred="true" /> <PropertyDefinition Name="TrimStrings" DisplayName="Trim string flag" ShortDescription="Right Trim fixed character types returned as Strings" DefaultValue="false" PropertyType="Boolean" IsExpert="true" /> <PropertyDefinition Name="IsXA" DisplayName="Is XA" ShortDescription="Is XA" DefaultValue="false" Multiplicity="1" IsConstrainedToAllowedValues="true" IsPreferred="true" /> - <PropertyDefinition Name="UseCommentsInSourceQuery" DisplayName="Use informational comments in Source Queries" ShortDescription="This will embed /*comment*/ style comment with session/request id in source SQL query for informational purposes" DefaultValue="false" PropertyType="Boolean" IsPreferred="true" /> + <PropertyDefinition Name="UseCommentsInSourceQuery" DisplayName="Use informational comments in Source Queries" ShortDescription="This will embed /*comment*/ style comment with session/request id in source SQL query for informational purposes" DefaultValue="false" PropertyType="Boolean" IsPreferred="true" IsExpert="true"/> </ComponentType> <ComponentType Name="Apache Derby Embedded Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.941-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.941-06:00"> <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="org.apache.derby.jdbc.EmbeddedDriver" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" /> Modified: trunk/connectors/connector-ldap/src/main/resources/connector-ldap.xml =================================================================== --- trunk/connectors/connector-ldap/src/main/resources/connector-ldap.xml 2009-03-17 22:07:31 UTC (rev 574) +++ trunk/connectors/connector-ldap/src/main/resources/connector-ldap.xml 2009-03-18 18:25:16 UTC (rev 575) @@ -1,6 +1,6 @@ <ComponentType Name="LDAP Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.946-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.946-06:00"> <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true"/> - <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:${project.artifactId}.${project.version}.jar;${classpath}" Multiplicity="0..1" isExpert="true"/> + <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:${project.artifactId}.${project.version}.jar;${classpath}" Multiplicity="0..1" IsExpert="true"/> <PropertyDefinition Name="SearchDefaultBaseDN" DisplayName="Default Search Base DN" ShortDescription="Default Base DN for LDAP Searches" IsExpert="true" /> <PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval (seconds)" ShortDescription="Set the interval to cleaning the pool" DefaultValue="300" PropertyType="Integer" IsExpert="true" /> <PropertyDefinition Name="LdapAdminUserDN" DisplayName="Ldap Admin User DN" ShortDescription="User DN for the LDAP admin account." DefaultValue="cn=<>,ou=<>,dc=<>" Multiplicity="1" IsPreferred="true" /> Modified: trunk/connectors/connector-loopback/src/main/resources/connector-loopback.xml =================================================================== --- trunk/connectors/connector-loopback/src/main/resources/connector-loopback.xml 2009-03-17 22:07:31 UTC (rev 574) +++ trunk/connectors/connector-loopback/src/main/resources/connector-loopback.xml 2009-03-18 18:25:16 UTC (rev 575) @@ -1,6 +1,6 @@ <ComponentType Name="Loopback Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.945-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.945-06:00"> <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true"/> - <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:${project.artifactId}.${project.version}.jar;${classpath}" Multiplicity="0..1" isExpert="true"/> + <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:${project.artifactId}.${project.version}.jar;${classpath}" Multiplicity="0..1" IsExpert="true"/> <PropertyDefinition Name="CapabilitiesClass" DisplayName="Capabilities Class" ShortDescription="" DefaultValue="com.metamatrix.connector.loopback.LoopbackCapabilities" Multiplicity="1" IsExpert="true" /> <PropertyDefinition Name="WaitTime" DisplayName="Max Random Wait Time" ShortDescription="" DefaultValue="0" Multiplicity="1" IsExpert="true" /> <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.loopback.LoopbackConnector" Multiplicity="1" IsExpert="true" /> Modified: trunk/connectors/connector-salesforce/src/main/resources/connector-salesforce.xml =================================================================== --- trunk/connectors/connector-salesforce/src/main/resources/connector-salesforce.xml 2009-03-17 22:07:31 UTC (rev 574) +++ trunk/connectors/connector-salesforce/src/main/resources/connector-salesforce.xml 2009-03-18 18:25:16 UTC (rev 575) @@ -1,6 +1,6 @@ <ComponentType Name="Salesforce Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.916-06:00" CreationDate="2008-10-31T10:26:19.916-06:00"> <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true"/> - <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:${project.artifactId}.${project.version}.jar;${classpath}" Multiplicity="0..1" isExpert="true"/> + <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:${project.artifactId}.${project.version}.jar;${classpath}" Multiplicity="0..1" IsExpert="true"/> <PropertyDefinition Name="username" DisplayName="User Name" ShortDescription="Name value for Salesforce authentication" DefaultValue="" Multiplicity="1" IsPreferred="true" /> <PropertyDefinition Name="ConnectorStateClass" DisplayName="Connector State Class" ShortDescription="" DefaultValue="com.metamatrix.connector.salesforce.ConnectorState" Multiplicity="1" IsExpert="true" /> <PropertyDefinition Name="Standard" DisplayName="Standard Type" ShortDescription="Standard Built-in Connector Type" DefaultValue="true" PropertyType="Boolean" IsExpert="true" IsModifiable="false" /> Modified: trunk/connectors/connector-text/src/main/resources/connector-text.xml =================================================================== --- trunk/connectors/connector-text/src/main/resources/connector-text.xml 2009-03-17 22:07:31 UTC (rev 574) +++ trunk/connectors/connector-text/src/main/resources/connector-text.xml 2009-03-18 18:25:16 UTC (rev 575) @@ -1,6 +1,6 @@ <ComponentType Name="Text File Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.945-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.945-06:00"> <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true"/> - <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:${project.artifactId}.${project.version}.jar;${classpath}" Multiplicity="0..1" isExpert="true"/> + <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:${project.artifactId}.${project.version}.jar;${classpath}" Multiplicity="0..1" IsExpert="true"/> <PropertyDefinition Name="PartialStartupAllowed" DisplayName="Partial Startup Allowed" ShortDescription="" DefaultValue="true" Multiplicity="1" PropertyType="Boolean" IsExpert="true" IsPreferred="true" /> <PropertyDefinition Name="Standard" DisplayName="Standard Type" ShortDescription="Standard Built-in Connector Type" DefaultValue="true" PropertyType="Boolean" IsExpert="true" IsModifiable="false" /> <PropertyDefinition Name="DescriptorFile" DisplayName="Text File Descriptor" ShortDescription="" Multiplicity="1" IsPreferred="true" /> Modified: trunk/connectors/connector-xml/src/main/resources/connector-xml.xml =================================================================== --- trunk/connectors/connector-xml/src/main/resources/connector-xml.xml 2009-03-17 22:07:31 UTC (rev 574) +++ trunk/connectors/connector-xml/src/main/resources/connector-xml.xml 2009-03-18 18:25:16 UTC (rev 575) @@ -1,6 +1,6 @@ <ComponentType Name="XML Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.917-06:00" CreationDate="2008-10-31T10:26:19.917-06:00"> <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true"/> - <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:${project.artifactId}.${project.version}.jar;${classpath}" Multiplicity="0..1" isExpert="true"/> + <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:${project.artifactId}.${project.version}.jar;${classpath}" Multiplicity="0..1" IsExpert="true"/> </ComponentType> <ComponentType Name="XML File Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="XML Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.917-06:00" CreationDate="2008-10-31T10:26:19.917-06:00">

15 years, 2 months

1
0
0 / 0

teiid SVN: r574 - trunk.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2009-03-17 18:07:31 -0400 (Tue, 17 Mar 2009) New Revision: 574 Modified: trunk/pom.xml Log: Turning back the src and binary builds. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-03-17 21:53:43 UTC (rev 573) +++ trunk/pom.xml 2009-03-17 22:07:31 UTC (rev 574) @@ -123,19 +123,15 @@ <version>2.2-beta-2</version> <configuration> <descriptors> -  <descriptor>build/assembly/embedded/embedded-client-jar.xml</descriptor> <descriptor>build/assembly/embedded/embedded-dependencies.xml</descriptor> <descriptor>build/assembly/embedded/embedded-connector-dependencies.xml</descriptor> <descriptor>build/assembly/embedded/embedded-jar.xml</descriptor> <descriptor>build/assembly/embedded/embedded-dist.xml</descriptor> -  </descriptors> <outputDirectory>target/distribution</outputDirectory> <workDirectory>target/assembly/work</workDirectory>

15 years, 2 months

1
0
0 / 0

teiid SVN: r573 - trunk/connectors/connector-jdbc/src/main/resources.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2009-03-17 17:53:43 -0400 (Tue, 17 Mar 2009) New Revision: 573 Modified: trunk/connectors/connector-jdbc/src/main/resources/connector-jdbc.xml Log: TEIID-413: Fixing the to correct super types Modified: trunk/connectors/connector-jdbc/src/main/resources/connector-jdbc.xml =================================================================== --- trunk/connectors/connector-jdbc/src/main/resources/connector-jdbc.xml 2009-03-17 21:52:17 UTC (rev 572) +++ trunk/connectors/connector-jdbc/src/main/resources/connector-jdbc.xml 2009-03-17 21:53:43 UTC (rev 573) @@ -17,12 +17,12 @@ <PropertyDefinition Name="IsXA" DisplayName="Is XA" ShortDescription="Is XA" DefaultValue="false" Multiplicity="1" IsConstrainedToAllowedValues="true" IsPreferred="true" /> <PropertyDefinition Name="UseCommentsInSourceQuery" DisplayName="Use informational comments in Source Queries" ShortDescription="This will embed /*comment*/ style comment with session/request id in source SQL query for informational purposes" DefaultValue="false" PropertyType="Boolean" IsPreferred="true" /> </ComponentType> - <ComponentType Name="Apache Derby Embedded Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.941-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.941-06:00"> + <ComponentType Name="Apache Derby Embedded Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.941-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.941-06:00"> <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="org.apache.derby.jdbc.EmbeddedDriver" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" /> <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:derby:<databaseName>" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" /> <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.derby.DerbySQLTranslator" IsExpert="true" /> </ComponentType> - <ComponentType Name="Apache Derby Network Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.942-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.942-06:00"> + <ComponentType Name="Apache Derby Network Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.942-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.942-06:00"> <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="org.apache.derby.jdbc.ClientDriver" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" /> <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:derby:<databaseName>" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" /> <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.derby.DerbySQLTranslator" IsExpert="true" /> @@ -32,7 +32,7 @@ <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:odbc:Driver={MicroSoft Access Driver (*.mdb)};DBQ=<data-source-name>" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" /> <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.access.AccessSQLTranslator" IsExpert="true" /> </ComponentType> - <ComponentType Name="MS Excel Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2006-02-08T11:02:36.029-06:00" CreatedBy="ConfigurationStartup" CreationDate="2006-02-08T11:02:36.029-06:00"> + <ComponentType Name="MS Excel Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2006-02-08T11:02:36.029-06:00" CreatedBy="ConfigurationStartup" CreationDate="2006-02-08T11:02:36.029-06:00"> <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="sun.jdbc.odbc.JdbcOdbcDriver" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" /> <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:odbc:Driver={MicroSoft Excel Driver (*.xls)};DBQ=<filePathToExcelFile>" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" /> </ComponentType>

15 years, 2 months

1
0
0 / 0

teiid SVN: r572 - trunk/embedded/src/main/java/com/metamatrix/jdbc.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2009-03-17 17:52:17 -0400 (Tue, 17 Mar 2009) New Revision: 572 Modified: trunk/embedded/src/main/java/com/metamatrix/jdbc/LogListernerProvider.java Log: Embedded should not be capturing the System streams Modified: trunk/embedded/src/main/java/com/metamatrix/jdbc/LogListernerProvider.java =================================================================== --- trunk/embedded/src/main/java/com/metamatrix/jdbc/LogListernerProvider.java 2009-03-17 20:31:08 UTC (rev 571) +++ trunk/embedded/src/main/java/com/metamatrix/jdbc/LogListernerProvider.java 2009-03-17 21:52:17 UTC (rev 572) @@ -74,7 +74,7 @@ URL logURL = URLHelper.buildURL(dqpURL, modifiedLogFileName); File file = new File(logURL.getPath()); PlatformLog log = new PlatformLog(); - log.addListener(new FileLimitSizeLogWriter(file)); + log.addListener(new FileLimitSizeLogWriter(file, false)); return log; } }

15 years, 2 months

1
0
0 / 0

teiid SVN: r571 - in trunk/connectors: connector-ldap and 5 other directories.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2009-03-17 16:31:08 -0400 (Tue, 17 Mar 2009) New Revision: 571 Modified: trunk/connectors/connector-jdbc/pom.xml trunk/connectors/connector-ldap/pom.xml trunk/connectors/connector-loopback/pom.xml trunk/connectors/connector-salesforce/pom.xml trunk/connectors/connector-text/pom.xml trunk/connectors/connector-xml-common/pom.xml trunk/connectors/connector-xml/pom.xml Log: fixing the deprecated usage of the "attached" with "single" goal for the assembly plugin Modified: trunk/connectors/connector-jdbc/pom.xml =================================================================== --- trunk/connectors/connector-jdbc/pom.xml 2009-03-17 20:29:01 UTC (rev 570) +++ trunk/connectors/connector-jdbc/pom.xml 2009-03-17 20:31:08 UTC (rev 571) @@ -72,7 +72,7 @@ <id>make-assembly</id> <phase>package</phase> <goals> - <goal>attached</goal> + <goal>single</goal> </goals> </execution> </executions> Modified: trunk/connectors/connector-ldap/pom.xml =================================================================== --- trunk/connectors/connector-ldap/pom.xml 2009-03-17 20:29:01 UTC (rev 570) +++ trunk/connectors/connector-ldap/pom.xml 2009-03-17 20:31:08 UTC (rev 571) @@ -69,7 +69,7 @@ <id>make-assembly</id> <phase>package</phase> <goals> - <goal>attached</goal> + <goal>single</goal> </goals> </execution> </executions> Modified: trunk/connectors/connector-loopback/pom.xml =================================================================== --- trunk/connectors/connector-loopback/pom.xml 2009-03-17 20:29:01 UTC (rev 570) +++ trunk/connectors/connector-loopback/pom.xml 2009-03-17 20:31:08 UTC (rev 571) @@ -72,7 +72,7 @@ <id>make-assembly</id> <phase>package</phase> <goals> - <goal>attached</goal> + <goal>single</goal> </goals> </execution> </executions> Modified: trunk/connectors/connector-salesforce/pom.xml =================================================================== --- trunk/connectors/connector-salesforce/pom.xml 2009-03-17 20:29:01 UTC (rev 570) +++ trunk/connectors/connector-salesforce/pom.xml 2009-03-17 20:31:08 UTC (rev 571) @@ -82,7 +82,7 @@ <id>make-assembly</id> <phase>package</phase> <goals> - <goal>attached</goal> + <goal>single</goal> </goals> </execution> </executions> Modified: trunk/connectors/connector-text/pom.xml =================================================================== --- trunk/connectors/connector-text/pom.xml 2009-03-17 20:29:01 UTC (rev 570) +++ trunk/connectors/connector-text/pom.xml 2009-03-17 20:31:08 UTC (rev 571) @@ -68,7 +68,7 @@ <id>make-assembly</id> <phase>package</phase> <goals> - <goal>attached</goal> + <goal>single</goal> </goals> </execution> </executions> Modified: trunk/connectors/connector-xml/pom.xml =================================================================== --- trunk/connectors/connector-xml/pom.xml 2009-03-17 20:29:01 UTC (rev 570) +++ trunk/connectors/connector-xml/pom.xml 2009-03-17 20:31:08 UTC (rev 571) @@ -83,7 +83,7 @@ <id>make-assembly</id> <phase>package</phase> <goals> - <goal>attached</goal> + <goal>single</goal> </goals> </execution> </executions> Modified: trunk/connectors/connector-xml-common/pom.xml =================================================================== --- trunk/connectors/connector-xml-common/pom.xml 2009-03-17 20:29:01 UTC (rev 570) +++ trunk/connectors/connector-xml-common/pom.xml 2009-03-17 20:31:08 UTC (rev 571) @@ -129,7 +129,7 @@ <id>make-assembly</id> <phase>package</phase> <goals> - <goal>attached</goal> + <goal>single</goal> </goals> </execution> </executions>

15 years, 2 months

1
0
0 / 0

teiid SVN: r570 - trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2009-03-17 16:29:01 -0400 (Tue, 17 Mar 2009) New Revision: 570 Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedDataService.java Log: TEIID-418: Correctly loading the extension path; using the property will exclude the default path, where it includes all the jars from the extensions, which is the mode designer uses. Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedDataService.java =================================================================== --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedDataService.java 2009-03-17 20:02:26 UTC (rev 569) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedDataService.java 2009-03-17 20:29:01 UTC (rev 570) @@ -24,6 +24,7 @@ import java.net.URL; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; @@ -53,7 +54,6 @@ import com.metamatrix.common.vdb.api.VDBDefn; import com.metamatrix.core.vdb.VDBStatus; import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; -import com.metamatrix.dqp.embedded.DQPEmbeddedProperties; import com.metamatrix.dqp.embedded.configuration.ExtensionModuleReader; import com.metamatrix.dqp.internal.datamgr.ConnectorID; import com.metamatrix.dqp.internal.datamgr.impl.ConnectorManager; @@ -566,6 +566,7 @@ // Ask the configuration if we can use the extension class loader. boolean useExtensionClassPath = (getConfigurationService().useExtensionClasspath()); String classPath = buildClasspath(connectorProperties); + if (classPath == null || classPath.length() == 0) { useExtensionClassPath = false; } @@ -573,11 +574,20 @@ if (!useExtensionClassPath) { return new ConnectorManager(); } + DQPEmbeddedPlugin.logInfo("DataService.useClassloader", new Object[] {classPath}); //$NON-NLS-1$ URL context = getConfigurationService().getExtensionPath(); - URL[] urlPath = ExtensionModuleReader.resolveExtensionClasspath(classPath, context); + + URL[] userPath = ExtensionModuleReader.resolveExtensionClasspath(classPath, context); + + // since we are using the extensions, get the common extension path + URL[] commonExtensionPath = getConfigurationService().getCommonExtensionClasspath(); + ArrayList<URL> urlPath = new ArrayList<URL>(); - ClassLoader classLoader = new URLFilteringClassLoader(urlPath, Thread.currentThread().getContextClassLoader(), new MetaMatrixURLStreamHandlerFactory()); + urlPath.addAll(Arrays.asList(userPath)); + urlPath.addAll(Arrays.asList(commonExtensionPath)); + + ClassLoader classLoader = new URLFilteringClassLoader(urlPath.toArray(new URL[urlPath.size()]), Thread.currentThread().getContextClassLoader(), new MetaMatrixURLStreamHandlerFactory()); Class cmgrImplClass = classLoader.loadClass(CONNECTOR_MGR_IMPL); ConnectorManager cm = (ConnectorManager)cmgrImplClass.newInstance(); @@ -592,7 +602,6 @@ StringBuilder sb = new StringBuilder(); appendlasspath(connectorProperties.getProperty(ConnectorPropertyNames.CONNECTOR_CLASSPATH), sb); // this is user defined, could be very specific to the binding appendlasspath(connectorProperties.getProperty(ConnectorPropertyNames.CONNECTOR_TYPE_CLASSPATH), sb); // this is system defined; type classpath - appendlasspath(connectorProperties.getProperty(DQPEmbeddedProperties.COMMON_EXTENSION_CLASPATH), sb); // this is common to whole the engine return sb.toString(); }

15 years, 2 months

1
0
0 / 0

teiid SVN: r569 - in trunk: client/src/main/java/com/metamatrix/common/comm/platform/socket/client and 4 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2009-03-17 16:02:26 -0400 (Tue, 17 Mar 2009) New Revision: 569 Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/SocketUtil.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/ObjectChannelFactory.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/OioOjbectChannelFactory.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerConnection.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerConnectionFactory.java trunk/client/src/main/resources/teiid-client-settings.properties trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerConnection.java trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerInstanceImpl.java trunk/common-core/src/main/java/com/metamatrix/common/util/PropertiesUtils.java trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/server/TestCommSockets.java Log: TEIID-424 TEIID-292, TEIID-425 updating client configuration, adding back socket pooling Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/SocketUtil.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/SocketUtil.java 2009-03-17 19:08:09 UTC (rev 568) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/SocketUtil.java 2009-03-17 20:02:26 UTC (rev 569) @@ -53,13 +53,13 @@ */ public class SocketUtil { - static final String TRUSTSTORE_PASSWORD = "com.metamatrix.ssl.trustStorePassword"; //$NON-NLS-1$ - public static final String TRUSTSTORE_FILENAME = "com.metamatrix.ssl.trustStore"; //$NON-NLS-1$ - static final String KEYSTORE_ALGORITHM = "com.metamatrix.ssl.algorithm"; //$NON-NLS-1$ - static final String PROTOCOL = "com.metamatrix.ssl.protocol"; //$NON-NLS-1$ - static final String KEYSTORE_TYPE = "com.metamatrix.ssl.keyStoreType"; //$NON-NLS-1$ - static final String KEYSTORE_PASSWORD = "com.metamatrix.ssl.keyStorePassword"; //$NON-NLS-1$ - static final String KEYSTORE_FILENAME = "com.metamatrix.ssl.keyStore"; //$NON-NLS-1$ + static final String TRUSTSTORE_PASSWORD = "org.teiid.ssl.trustStorePassword"; //$NON-NLS-1$ + public static final String TRUSTSTORE_FILENAME = "org.teiid.ssl.trustStore"; //$NON-NLS-1$ + static final String KEYSTORE_ALGORITHM = "org.teiid.ssl.algorithm"; //$NON-NLS-1$ + static final String PROTOCOL = "org.teiid.ssl.protocol"; //$NON-NLS-1$ + static final String KEYSTORE_TYPE = "org.teiid.ssl.keyStoreType"; //$NON-NLS-1$ + static final String KEYSTORE_PASSWORD = "org.teiid.ssl.keyStorePassword"; //$NON-NLS-1$ + static final String KEYSTORE_FILENAME = "org.teiid.ssl.keyStore"; //$NON-NLS-1$ static final String DEFAULT_KEYSTORE_PROTOCOL = "SSLv3"; //$NON-NLS-1$ static final String DEFAULT_KEYSTORE_TYPE = "JKS"; //$NON-NLS-1$ @@ -89,19 +89,12 @@ } public static SSLSocketFactory getSSLSocketFactory(Properties props) throws IOException, GeneralSecurityException{ - // -Dcom.metamatrix.ssl.keyStore String keystore = props.getProperty(KEYSTORE_FILENAME); - // -Dcom.metamatrix.ssl.keyStorePassword String keystorePassword = props.getProperty(KEYSTORE_PASSWORD); - // -Dcom.metamatrix.ssl.keyStoreType (default JKS) String keystoreType = props.getProperty(KEYSTORE_TYPE, DEFAULT_KEYSTORE_TYPE); - // -Dcom.metamatrix.ssl.protocol (default SSLv3) String keystoreProtocol = props.getProperty(PROTOCOL, DEFAULT_KEYSTORE_PROTOCOL); - // -Dcom.metamatrix.ssl.algorithm (default SunX509) String keystoreAlgorithm = props.getProperty(KEYSTORE_ALGORITHM); - // -Dcom.metamatrix.ssl.trustStore (if null; keystore filename used) String truststore = props.getProperty(TRUSTSTORE_FILENAME, keystore); - // -Dcom.metamatrix.ssl.trustStorePassword (if null; keystore password used) String truststorePassword = props.getProperty(TRUSTSTORE_PASSWORD, keystorePassword); boolean anon = NONE.equalsIgnoreCase(truststore); Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/ObjectChannelFactory.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/ObjectChannelFactory.java 2009-03-17 19:08:09 UTC (rev 568) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/ObjectChannelFactory.java 2009-03-17 20:02:26 UTC (rev 569) @@ -33,4 +33,6 @@ ObjectChannel createObjectChannel(SocketAddress address, boolean ssl) throws IOException, CommunicationException; + int getSoTimeout(); + } \ No newline at end of file Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/OioOjbectChannelFactory.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/OioOjbectChannelFactory.java 2009-03-17 19:08:09 UTC (rev 568) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/OioOjbectChannelFactory.java 2009-03-17 20:02:26 UTC (rev 569) @@ -44,12 +44,13 @@ import com.metamatrix.common.comm.platform.socket.ObjectChannel; import com.metamatrix.common.comm.platform.socket.SocketUtil; import com.metamatrix.common.comm.platform.socket.SocketUtil.SSLSocketFactory; +import com.metamatrix.common.util.PropertiesUtils; import com.metamatrix.dqp.client.ResultsFuture; -final class OioOjbectChannelFactory implements ObjectChannelFactory { +public final class OioOjbectChannelFactory implements ObjectChannelFactory { private final static int STREAM_BUFFER_SIZE = 1<<15; - private final static int SO_TIMEOUT = 3000; + private final static int MAX_OBJECT_SIZE = 1 << 25; private static Logger log = Logger.getLogger("org.teiid.client.sockets"); //$NON-NLS-1$ @@ -62,7 +63,6 @@ private OioObjectChannel(Socket socket) throws IOException { log.fine("creating new OioObjectChannel"); //$NON-NLS-1$ this.socket = socket; - socket.setSoTimeout(SO_TIMEOUT); BufferedOutputStream bos = new BufferedOutputStream( socket.getOutputStream(), STREAM_BUFFER_SIZE); outputStream = new ObjectEncoderOutputStream( new DataOutputStream(bos), 512); //The output stream must be flushed on creation in order to write some initialization data @@ -70,7 +70,7 @@ outputStream.flush(); final ClassLoader cl = Thread.currentThread().getContextClassLoader(); BufferedInputStream bis = new BufferedInputStream(socket.getInputStream(), STREAM_BUFFER_SIZE); - inputStream = new ObjectDecoderInputStream(new DataInputStream(bis), cl, 1 << 25); + inputStream = new ObjectDecoderInputStream(new DataInputStream(bis), cl, MAX_OBJECT_SIZE); } @Override @@ -141,17 +141,15 @@ } private Properties props; - private int inputBufferSize; - private int outputBufferSize; + private int receiveBufferSize = 0; + private int sendBufferSize = 0; private boolean conserveBandwidth; + private int soTimeout = 3000; private volatile SSLSocketFactory sslSocketFactory; - public OioOjbectChannelFactory(boolean conserveBandwidth, - int inputBufferSize, int outputBufferSize, Properties props) { - this.conserveBandwidth = conserveBandwidth; - this.inputBufferSize = inputBufferSize; - this.outputBufferSize = outputBufferSize; + public OioOjbectChannelFactory(Properties props) { this.props = props; + PropertiesUtils.setBeanProperties(this, props, "org.teiid.sockets"); //$NON-NLS-1$ } @Override @@ -170,14 +168,47 @@ } else { socket = new Socket(); } - if (inputBufferSize > 0) { - socket.setReceiveBufferSize(inputBufferSize); + if (receiveBufferSize > 0) { + socket.setReceiveBufferSize(receiveBufferSize); } - if (outputBufferSize > 0) { - socket.setSendBufferSize(outputBufferSize); + if (sendBufferSize > 0) { + socket.setSendBufferSize(sendBufferSize); } socket.setTcpNoDelay(!conserveBandwidth); // enable Nagle's algorithm to conserve bandwidth socket.connect(address); + socket.setSoTimeout(soTimeout); return new OioObjectChannel(socket); } + + public int getSendBufferSize() { + return sendBufferSize; + } + + public void setSendBufferSize(int sendBufferSize) { + this.sendBufferSize = sendBufferSize; + } + + public int getReceiveBufferSize() { + return receiveBufferSize; + } + + public void setReceiveBufferSize(int receiveBufferSize) { + this.receiveBufferSize = receiveBufferSize; + } + + public boolean isConserveBandwidth() { + return conserveBandwidth; + } + + public void setConserveBandwidth(boolean conserveBandwidth) { + this.conserveBandwidth = conserveBandwidth; + } + + public void setSoTimeout(int soTimeout) { + this.soTimeout = soTimeout; + } + + public int getSoTimeout() { + return soTimeout; + } } \ No newline at end of file Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerConnection.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerConnection.java 2009-03-17 19:08:09 UTC (rev 568) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerConnection.java 2009-03-17 20:02:26 UTC (rev 569) @@ -32,9 +32,7 @@ import java.lang.reflect.Proxy; import java.net.UnknownHostException; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Properties; import java.util.Timer; import java.util.TimerTask; @@ -68,7 +66,6 @@ private static final int RETRY_COUNT = 3; - private Map<HostInfo, SocketServerInstance> existingConnections = new HashMap<HostInfo, SocketServerInstance>(); private SocketServerInstanceFactory connectionFactory; private ServerDiscovery serverDiscovery; private static Logger log = Logger.getLogger("org.teiid.client.sockets"); //$NON-NLS-1$ @@ -122,23 +119,13 @@ while (hostKeys.size() > 0) { HostInfo hostInfo = hostKeys.remove((int) (Math.random() * hostKeys.size())); - SocketServerInstance instance = existingConnections.get(hostInfo); - if (instance != null) { - if (instance.isOpen()) { - this.serverInstance = instance; - return this.serverInstance; - } - existingConnections.remove(hostInfo); - hostKeys.add(hostInfo); - } Exception ex = null; try { - instance = connectionFactory.getServerInstance(hostInfo, secure); + SocketServerInstance instance = connectionFactory.getServerInstance(hostInfo, secure); if (this.logonResult != null) { ILogon newLogon = instance.getService(ILogon.class); newLogon.assertIdentity(logonResult.getSessionID()); } - this.existingConnections.put(hostInfo, instance); this.serverDiscovery.connectionSuccessful(hostInfo, instance); this.serverInstance = instance; return this.serverInstance; @@ -286,11 +273,12 @@ } catch (TimeoutException e) { //ignore } - - for (SocketServerInstance instance : existingConnections.values()) { - instance.shutdown(); + + if (this.serverInstance != null) { + this.serverInstance.shutdown(); + this.serverInstance = null; } - existingConnections.clear(); + this.closed = true; this.serverDiscovery.shutdown(); } @@ -318,9 +306,11 @@ try { ServerConnectionInvocationHandler handler = (ServerConnectionInvocationHandler)Proxy.getInvocationHandler(service); ServerConnectionInvocationHandler otherHandler = (ServerConnectionInvocationHandler)Proxy.getInvocationHandler(otherService); - return handler.getInstance().getHostInfo().equals(otherHandler.getInstance().getHostInfo()); + return handler.getInstance().getHostInfo().getInetAddress().equals(otherHandler.getInstance().getHostInfo().getInetAddress()); } catch (IllegalArgumentException e) { return false; + } catch (UnknownHostException e) { + throw new CommunicationException(e); } } Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerConnectionFactory.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerConnectionFactory.java 2009-03-17 19:08:09 UTC (rev 568) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerConnectionFactory.java 2009-03-17 20:02:26 UTC (rev 569) @@ -24,14 +24,25 @@ import java.io.IOException; import java.io.InputStream; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; import java.net.InetAddress; import java.net.UnknownHostException; -import java.util.HashMap; -import java.util.List; +import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Properties; import java.util.Timer; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicInteger; +import com.metamatrix.admin.api.exception.security.InvalidSessionException; +import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.common.api.HostInfo; import com.metamatrix.common.api.MMURL; import com.metamatrix.common.comm.api.ServerConnectionFactory; @@ -41,38 +52,97 @@ import com.metamatrix.common.util.PropertiesUtils; import com.metamatrix.core.MetaMatrixCoreException; import com.metamatrix.core.util.ReflectionHelper; +import com.metamatrix.platform.security.api.ILogon; public class SocketServerConnectionFactory implements ServerConnectionFactory, SocketServerInstanceFactory { - /**Java system property. The loglevel that SocketLog will use. Should be a String value {NONE|CRITICAL|ERROR|WARNING|INFO|DETAIL|TRACE}*/ - public static final String SOCKET_LOG_LEVEL = "metamatrix.sockets.log.level"; //$NON-NLS-1$ - /**Java system property. Maximum number of threads used to read sockets*/ - public static final String SOCKET_MAX_THREADS = "metamatrix.sockets.max.threads"; //$NON-NLS-1$ - /**Java system property. Maximum time to live for a socket reader thread asynchronous calls. If it times out, it will be removed, and recreated later when needed.*/ - public static final String SOCKET_TTL = "metamatrix.sockets.ttl"; //$NON-NLS-1$ - /**Java system property. Maximum time to live for a socket reader thread synchronous calls. If it times out, it will be removed, and recreated later when needed.*/ - public static final String SYNCH_SOCKET_TTL = "metamatrix.synchronous.sockets.ttl"; //$NON-NLS-1$ - /**Java system property. Input buffer size of the physical sockets.*/ - public static final String SOCKET_INPUT_BUFFER_SIZE = "metamatrix.sockets.inputBufferSize"; //$NON-NLS-1$ - /**Java system property. Output buffer size of the physical sockets.*/ - public static final String SOCKET_OUTPUT_BUFFER_SIZE = "metamatrix.sockets.outputBufferSize"; //$NON-NLS-1$ - /**Java system property. Value of the conserve-bandwidth flag of the physical sockets.*/ - public static final String SOCKET_CONSERVE_BANDWIDTH = "metamatrix.sockets.conserveBandwidth"; //$NON-NLS-1$ - public static final String DEFAULT_SOCKET_LOG_LEVEL = "ERROR"; //$NON-NLS-1$ - public static final int DEFAULT_MAX_THREADS = 15; - public static final long DEFAULT_TTL = 120000L; - public static final long DEFAULT_SYNCH_TTL = 120000L; - public static final int DEFAULT_SOCKET_INPUT_BUFFER_SIZE = 0; - public static final int DEFAULT_SOCKET_OUTPUT_BUFFER_SIZE = 0; - private static final String URL = "URL"; //$NON-NLS-1$ private static SocketServerConnectionFactory INSTANCE; + private final class ShutdownHandler implements InvocationHandler { + private final CachedInstance key; + + private ShutdownHandler(CachedInstance key) { + this.key = key; + } + + @Override + public Object invoke(Object arg0, Method arg1, Object[] arg2) + throws Throwable { + if (arg1.getName().equals("shutdown")) { //$NON-NLS-1$ + CachedInstance purge = null; + if (!key.actual.isOpen()) { + return null; //nothing to do + } + synchronized (instancePool) { + instancePool.put(key, key); + if (instancePool.size() > maxCachedInstances) { + Iterator<CachedInstance> iter = instancePool.keySet().iterator(); + purge = iter.next(); + iter.remove(); + } + } + if (purge != null) { + purge.actual.shutdown(); + } + return null; + } + try { + return arg1.invoke(key.actual, arg2); + } catch (InvocationTargetException e) { + throw e.getTargetException(); + } + } + } + + private static class CachedInstance { + HostInfo info; + Integer instance; + boolean ssl; + SocketServerInstance actual; + SocketServerInstance proxy; + + public CachedInstance(HostInfo info, boolean ssl) { + this.info = info; + this.ssl = ssl; + } + + @Override + public int hashCode() { + return info.hashCode(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof CachedInstance)) { + return false; + } + CachedInstance other = (CachedInstance) obj; + if (!info.equals(other.info) || ssl != other.ssl) { + return false; + } + if (instance == null || other.instance == null) { + return true; + } + return instance.equals(other.instance); + } + } + private ObjectChannelFactory channelFactory; private Timer pingTimer; - private Properties props; + //instance pooling + private AtomicInteger instanceCount = new AtomicInteger(); + private Map<CachedInstance, CachedInstance> instancePool = new LinkedHashMap<CachedInstance, CachedInstance>(); + + //config properties + private long synchronousTtl = 120000l; + private int maxCachedInstances=16; + public static synchronized SocketServerConnectionFactory getInstance() { if (INSTANCE == null) { INSTANCE = new SocketServerConnectionFactory(); @@ -99,16 +169,61 @@ public SocketServerConnectionFactory() { } - + public void init(final Properties props) { - this.props = props; + PropertiesUtils.setBeanProperties(this, props, "org.teiid.sockets"); //$NON-NLS-1$ this.pingTimer = new Timer("SocketPing", true); //$NON-NLS-1$ - this.channelFactory = new OioOjbectChannelFactory(getConserveBandwidth(), getInputBufferSize(), getOutputBufferSize(), props); + this.channelFactory = new OioOjbectChannelFactory(props); } public SocketServerInstance getServerInstance(HostInfo info, boolean ssl) throws CommunicationException, IOException { - SocketServerInstanceImpl ssii = new SocketServerInstanceImpl(info, ssl, getSynchronousTTL()); + CachedInstance key = null; + CachedInstance instance = null; + boolean useCache = this.maxCachedInstances > 0; + if (useCache) { + key = new CachedInstance(info, ssl); + synchronized (instancePool) { + instance = instancePool.remove(key); + } + if (instance != null) { + ILogon logon = instance.actual.getService(ILogon.class); + boolean valid = false; + try { + Future<?> success = logon.ping(); + success.get(this.channelFactory.getSoTimeout(), TimeUnit.MICROSECONDS); + valid = true; + } catch (MetaMatrixComponentException e) { + } catch (InvalidSessionException e) { + } catch (InterruptedException e) { + } catch (ExecutionException e) { + } catch (TimeoutException e) { + } + if (valid) { + return instance.proxy; + } + instance.actual.shutdown(); + //technically we only want to remove instances with the same inetaddress + while (true) { + CachedInstance invalid = null; + synchronized (instancePool) { + invalid = instancePool.remove(key); + } + if (invalid == null) { + break; + } + invalid.actual.shutdown(); + } + } + } + SocketServerInstanceImpl ssii = new SocketServerInstanceImpl(info, ssl, getSynchronousTtl()); ssii.connect(this.channelFactory); + if (useCache) { + key.actual = ssii; + key.instance = instanceCount.getAndIncrement(); + //create a proxied socketserverinstance that will pool itself on shutdown + key.proxy = (SocketServerInstance)Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class[] {SocketServerInstance.class}, new ShutdownHandler(key)); + return key.proxy; + } return ssii; } @@ -140,48 +255,6 @@ return new SocketServerConnection(this, url.isUsingSSL(), discovery, connectionProperties, pingTimer); } - /* - * Retrieve the asynchronous call Time-To-Live - * - * @return number of ms - * @since 4.2 - */ - public long getTTL() { - return PropertiesUtils.getLongProperty(props, SOCKET_TTL, DEFAULT_TTL); - } - - /* - * Retrieve the synchronous call Time-To-Live - * - * @return number of ms - * @since 4.2 - */ - public long getSynchronousTTL() { - return PropertiesUtils.getLongProperty(props, SYNCH_SOCKET_TTL, DEFAULT_SYNCH_TTL); - } - - /* - * Get the max number of threads - * - * @return max number - * @since 4.2 - */ - public int getMaxThreads() { - return PropertiesUtils.getIntProperty(props, SOCKET_MAX_THREADS, DEFAULT_MAX_THREADS); - } - - public int getInputBufferSize() { - return PropertiesUtils.getIntProperty(props, SOCKET_INPUT_BUFFER_SIZE, DEFAULT_SOCKET_INPUT_BUFFER_SIZE); - } - - public int getOutputBufferSize() { - return PropertiesUtils.getIntProperty(props, SOCKET_OUTPUT_BUFFER_SIZE, DEFAULT_SOCKET_OUTPUT_BUFFER_SIZE); - } - - public boolean getConserveBandwidth() { - return PropertiesUtils.getBooleanProperty(props, SOCKET_CONSERVE_BANDWIDTH, false); - } - static void updateConnectionProperties(Properties connectionProperties) { try { InetAddress addr = NetUtils.getInstance().getInetAddress(); @@ -192,4 +265,20 @@ } } + public long getSynchronousTtl() { + return synchronousTtl; + } + + public void setSynchronousTtl(long synchronousTTL) { + this.synchronousTtl = synchronousTTL; + } + + public int getMaxCachedInstances() { + return maxCachedInstances; + } + + public void setMaxCachedInstances(int maxCachedInstances) { + this.maxCachedInstances = maxCachedInstances; + } + } Modified: trunk/client/src/main/resources/teiid-client-settings.properties =================================================================== --- trunk/client/src/main/resources/teiid-client-settings.properties 2009-03-17 19:08:09 UTC (rev 568) +++ trunk/client/src/main/resources/teiid-client-settings.properties 2009-03-17 20:02:26 UTC (rev 569) @@ -7,20 +7,20 @@ ######################################## # -# Set the key store type. Defaults to JKS +# The key store type. Defaults to JKS # -com.metamatrix.ssl.keyStoreType=JKS +org.teiid.ssl.keyStoreType=JKS # -# Set the key store algorithm, defaults to +# The key store algorithm, defaults to # the system property "ssl.TrustManagerFactory.algorithm" # -#com.metamatrix.ssl.algorithm= +#org.teiid.ssl.algorithm= # -# Set to the classpath or filesystem location of the +# The classpath or filesystem location of the # key store. # # This property is required only if performing 2-way @@ -28,16 +28,16 @@ # key. # -#com.metamatrix.ssl.keyStore= +#org.teiid.ssl.keyStore= # -# Set the key store password (not required) +# The key store password (not required) # -#com.metamatrix.ssl.keyStorePassword= +#org.teiid.ssl.keyStorePassword= # -# Set to the classpath or filesystem location of the +# The classpath or filesystem location of the # trust store. # # This property is required if performing 1-way @@ -48,58 +48,77 @@ # the TLS_DH_anon_WITH_AES_128_CBC_SHA cipher suite # -#com.metamatrix.ssl.trustStore= +#org.teiid.ssl.trustStore= # -# Set the trust store password (not required) +# The trust store password (not required) # -#com.metamatrix.ssl.trustStorePassword= +#org.teiid.ssl.trustStorePassword= # -# Set the cipher protocol, defaults to SSLv3 +# The cipher protocol, defaults to SSLv3 # -com.metamatrix.ssl.protocol=SSLv3 +org.teiid.ssl.protocol=SSLv3 - ######################################## # Misc Socket Configuration ######################################## # -# Set the max number of NIO worker threads +# The time in milliseconds for socket timeouts. +# A timeout during the initialization, handshake, or +# a server ping will be treated as an error. # -metamatrix.sockets.max.threads=15 +# Setting this value too low may cause read errors. +# +org.teiid.sockets.soTimeout=3000 + # -# Set the max time to live for an NIO worker thread +# 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. # -metamatrix.sockets.ttl=120000 +org.teiid.sockets.maxCachedInstances=16 # -# Set the max time to live for non-execution synchrnous -# calls. +# Set the max time to live (in milliseconds) for non-execution +# synchronous calls. # -metamatrix.synchronous.sockets.ttl=120000 +org.teiid.sockets.synchronousttl=120000 # -# Set the socket receive buffer size +# Set the socket receive buffer size (in bytes) +# 0 indicates that the default socket setting will be used. # -metamatrix.sockets.inputBufferSize=0 +org.teiid.sockets.receiveBufferSize=0 # -# Set the socket send buffer size +# Set the socket send buffer size (in bytes) +# 0 indicates that the default socket setting will be used. # -metamatrix.sockets.outputBufferSize=0 +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. # -metamatrix.sockets.conserveBandwidth=false +org.teiid.sockets.conserveBandwidth=false Modified: trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerConnection.java =================================================================== --- trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerConnection.java 2009-03-17 19:08:09 UTC (rev 568) +++ trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerConnection.java 2009-03-17 20:02:26 UTC (rev 569) @@ -188,8 +188,8 @@ } public void testIsSameInstance() throws Exception { - SocketServerConnection conn = createConnection(null, new HostInfo("foo", 1)); //$NON-NLS-1$ - SocketServerConnection conn1 = createConnection(null, new HostInfo("bar", 1)); //$NON-NLS-1$ + SocketServerConnection conn = createConnection(null, new HostInfo("0.0.0.0", 1)); //$NON-NLS-1$ + SocketServerConnection conn1 = createConnection(null, new HostInfo("0.0.0.1", 1)); //$NON-NLS-1$ ClientSideDQP dqp = conn.getService(ClientSideDQP.class); ClientSideDQP dqp1 = conn1.getService(ClientSideDQP.class); Modified: trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerInstanceImpl.java =================================================================== --- trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerInstanceImpl.java 2009-03-17 19:08:09 UTC (rev 568) +++ trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerInstanceImpl.java 2009-03-17 20:02:26 UTC (rev 569) @@ -98,6 +98,11 @@ return this; } + @Override + public int getSoTimeout() { + return 1; + } + } public void testHandshakeTimeout() throws Exception { Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/PropertiesUtils.java =================================================================== --- trunk/common-core/src/main/java/com/metamatrix/common/util/PropertiesUtils.java 2009-03-17 19:08:09 UTC (rev 568) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/PropertiesUtils.java 2009-03-17 20:02:26 UTC (rev 569) @@ -956,7 +956,7 @@ String shortName = propertyName.toLowerCase(); String propertyValue = null; if (prefix != null) { - propertyValue = connProps.getProperty(prefix + "." + shortName); + propertyValue = connProps.getProperty(prefix + "." + shortName); //$NON-NLS-1$ } else { propertyValue = connProps.getProperty(shortName); } Modified: trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/server/TestCommSockets.java =================================================================== --- trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/server/TestCommSockets.java 2009-03-17 19:08:09 UTC (rev 568) +++ trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/server/TestCommSockets.java 2009-03-17 20:02:26 UTC (rev 569) @@ -32,6 +32,7 @@ import javax.net.ssl.SSLEngine; +import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -44,7 +45,6 @@ import com.metamatrix.common.comm.platform.socket.SocketUtil; import com.metamatrix.common.comm.platform.socket.client.SocketServerConnection; import com.metamatrix.common.comm.platform.socket.client.SocketServerConnectionFactory; -import com.metamatrix.common.comm.platform.socket.client.SocketServerInstanceImpl; import com.metamatrix.common.comm.platform.socket.client.UrlServerDiscovery; import com.metamatrix.common.queue.WorkerPoolFactory; import com.metamatrix.common.util.crypto.NullCryptor; @@ -56,15 +56,20 @@ public class TestCommSockets { SocketListener listener; + private SocketServerConnectionFactory sscf; + private InetSocketAddress addr; - @Before public void tearDown() throws Exception { + @Before public void setUp() { + addr = new InetSocketAddress(0); + } + + @After public void tearDown() throws Exception { if (listener != null) { listener.stop(); } } @Test public void testFailedConnect() throws Exception { - InetSocketAddress addr = new InetSocketAddress(0); ClientServiceRegistry csr = new ClientServiceRegistry(); SessionServiceInterface sessionService = mock(SessionServiceInterface.class); csr.registerClientService(ILogon.class, new LogonImpl(sessionService, "fakeCluster"), "foo"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -83,8 +88,10 @@ } } - @Test public void testConnect() throws Exception { - SocketServerConnection conn = helpEstablishConnection(false, null); + @Test public void testConnectWithoutPooling() throws Exception { + Properties p = new Properties(); + p.setProperty("org.teiid.sockets.maxCachedInstances", String.valueOf(0)); //$NON-NLS-1$ + SocketServerConnection conn = helpEstablishConnection(false, null, true, p); SocketListenerStats stats = listener.getStats(); assertEquals(2, stats.objectsRead); // handshake response, logon, assertEquals(1, stats.sockets); @@ -100,11 +107,29 @@ stats = listener.getStats(); assertEquals(0, stats.sockets); } + + @Test public void testConnectWithPooling() throws Exception { + SocketServerConnection conn = helpEstablishConnection(false, null); + SocketListenerStats stats = listener.getStats(); + assertEquals(2, stats.objectsRead); // handshake response, logon, + assertEquals(1, stats.sockets); + conn.shutdown(); + stats = listener.getStats(); + assertEquals(1, stats.maxSockets); + assertEquals(3, stats.objectsRead); // handshake response, logon, logoff + stats = listener.getStats(); + assertEquals(1, stats.sockets); + conn = helpEstablishConnection(false, null); + conn.shutdown(); + stats = listener.getStats(); + assertEquals(1, stats.sockets); + assertEquals(1, stats.maxSockets); + } + @Test public void testConnectWithoutClientEncryption() throws Exception { SocketServerConnection conn = helpEstablishConnection(false, null, false, new Properties()); - assertTrue(((SocketServerInstanceImpl) conn - .selectServerInstance()).getCryptor() instanceof NullCryptor); + assertTrue(conn.selectServerInstance().getCryptor() instanceof NullCryptor); conn.shutdown(); } @@ -116,32 +141,34 @@ private SocketServerConnection helpEstablishConnection(boolean secure, SSLEngine serverSSL, boolean isClientEncryptionEnabled, Properties socketConfig) throws CommunicationException, ConnectionException { - InetSocketAddress addr = new InetSocketAddress(0); - SessionServiceInterface sessionService = mock(SessionServiceInterface.class); - ClientServiceRegistry csr = new ClientServiceRegistry(); - csr.registerClientService(ILogon.class, new LogonImpl(sessionService, "fakeCluster") { //$NON-NLS-1$ - @Override - public LogonResult logon(Properties connProps) - throws LogonException, ComponentNotFoundException { - return new LogonResult(); - } - }, "foo"); //$NON-NLS-1$ - listener = new SocketListener(addr.getPort(), addr.getAddress().getHostAddress(), - csr, 1024, 1024, WorkerPoolFactory.newWorkerPool( - "testIO", 1, 120000), serverSSL, isClientEncryptionEnabled, sessionService); //$NON-NLS-1$ + if (listener == null) { + SessionServiceInterface sessionService = mock(SessionServiceInterface.class); + ClientServiceRegistry csr = new ClientServiceRegistry(); + csr.registerClientService(ILogon.class, new LogonImpl(sessionService, "fakeCluster") { //$NON-NLS-1$ + @Override + public LogonResult logon(Properties connProps) + throws LogonException, ComponentNotFoundException { + return new LogonResult(); + } + }, "foo"); //$NON-NLS-1$ + listener = new SocketListener(addr.getPort(), addr.getAddress().getHostAddress(), + csr, 1024, 1024, WorkerPoolFactory.newWorkerPool( + "testIO", 1, 120000), serverSSL, isClientEncryptionEnabled, sessionService); //$NON-NLS-1$ + SocketListenerStats stats = listener.getStats(); + assertEquals(0, stats.maxSockets); + assertEquals(0, stats.objectsRead); + assertEquals(0, stats.objectsWritten); + assertEquals(0, stats.sockets); + } - SocketListenerStats stats = listener.getStats(); - assertEquals(0, stats.maxSockets); - assertEquals(0, stats.objectsRead); - assertEquals(0, stats.objectsWritten); - assertEquals(0, stats.sockets); - Properties p = new Properties(); p.setProperty(MMURL.CONNECTION.SERVER_URL, new MMURL(addr.getHostName(), listener.getPort(), secure).getAppServerURL()); p.setProperty(MMURL.CONNECTION.DISCOVERY_STRATEGY, UrlServerDiscovery.class.getName()); - SocketServerConnectionFactory sscf = new SocketServerConnectionFactory(); - sscf.init(socketConfig); + if (sscf == null) { + sscf = new SocketServerConnectionFactory(); + sscf.init(socketConfig); + } return sscf.createConnection(p); }

15 years, 2 months

1
0
0 / 0

teiid SVN: r568 - in trunk: common-internal/src/main/java/com/metamatrix/platform/security/api and 3 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2009-03-17 15:08:09 -0400 (Tue, 17 Mar 2009) New Revision: 568 Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDataSource.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/StandardAuthorizationActions.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/ExtensionModuleReader.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/RelationalPlanExecutor.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/XMLContext.java trunk/soap/src/main/java/com/metamatrix/soap/service/DataServiceWebServiceImpl.java Log: removing warnings with bundleutil and string arrays Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDataSource.java =================================================================== --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDataSource.java 2009-03-17 16:26:29 UTC (rev 567) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDataSource.java 2009-03-17 19:08:09 UTC (rev 568) @@ -458,7 +458,7 @@ } } if ( reasonCount < 1 ) return null; - return JDBCPlugin.Util.getString("MMDataSource.alternateServer_is_invalid", new String[] { "" + reasonCount, reason }); //$NON-NLS-1$ //$NON-NLS-2$ + return JDBCPlugin.Util.getString("MMDataSource.alternateServer_is_invalid", String.valueOf(reasonCount), reason); //$NON-NLS-1$ } /** Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/StandardAuthorizationActions.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/StandardAuthorizationActions.java 2009-03-17 16:26:29 UTC (rev 567) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/StandardAuthorizationActions.java 2009-03-17 19:08:09 UTC (rev 568) @@ -143,7 +143,7 @@ */ public static AuthorizationActions getAuthorizationActions(String[] labels) { if (labels == null || labels.length == 0 || labels.length > LABELS_COUNT ) { - throw new IllegalArgumentException(SecurityPlugin.Util.getString(SecurityMessagesKeys.SEC_API_0068, labels)); + throw new IllegalArgumentException(SecurityPlugin.Util.getString(SecurityMessagesKeys.SEC_API_0068, (Object[])labels)); } Iterator iter = actionSet.values().iterator(); while ( iter.hasNext() ) { Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/ExtensionModuleReader.java =================================================================== --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/ExtensionModuleReader.java 2009-03-17 16:26:29 UTC (rev 567) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/ExtensionModuleReader.java 2009-03-17 19:08:09 UTC (rev 568) @@ -60,9 +60,9 @@ in = extModuleURL.openStream(); contents = ByteArrayHelper.toByteArray(in); } catch (FileNotFoundException e) { - throw new MetaMatrixComponentException(DQPEmbeddedPlugin.Util.getString("ExtensionModuleReader.ext_module_does_not_exist", new String[] {extModuleName})); //$NON-NLS-1$ + throw new MetaMatrixComponentException(DQPEmbeddedPlugin.Util.getString("ExtensionModuleReader.ext_module_does_not_exist", extModuleName)); //$NON-NLS-1$ } catch (IOException e) { - throw new MetaMatrixComponentException(e, DQPEmbeddedPlugin.Util.getString("ExtensionModuleReader.ext_module_failed_to_read", new String[] {extModuleName})); //$NON-NLS-1$ + throw new MetaMatrixComponentException(e, DQPEmbeddedPlugin.Util.getString("ExtensionModuleReader.ext_module_failed_to_read", extModuleName)); //$NON-NLS-1$ } finally { if (in != null) { try{in.close();}catch(IOException e) {} Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/xml/RelationalPlanExecutor.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/query/processor/xml/RelationalPlanExecutor.java 2009-03-17 16:26:29 UTC (rev 567) +++ trunk/engine/src/main/java/com/metamatrix/query/processor/xml/RelationalPlanExecutor.java 2009-03-17 19:08:09 UTC (rev 568) @@ -155,7 +155,7 @@ try { this.tupleSource = this.bufferMgr.getTupleSource(this.internalResultID); } catch (TupleSourceNotFoundException e) { - throw new MetaMatrixComponentException(e, QueryExecPlugin.Util.getString("tuple_not_found", new String[] {this.resultInfo.getResultSetName()})); //$NON-NLS-1$ + throw new MetaMatrixComponentException(e, QueryExecPlugin.Util.getString("tuple_not_found", this.resultInfo.getResultSetName())); //$NON-NLS-1$ } } Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/xml/XMLContext.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/query/processor/xml/XMLContext.java 2009-03-17 16:26:29 UTC (rev 567) +++ trunk/engine/src/main/java/com/metamatrix/query/processor/xml/XMLContext.java 2009-03-17 19:08:09 UTC (rev 568) @@ -82,7 +82,7 @@ if (this.parentContext != null) { return this.parentContext.getCurrentRow(aliasResultName); } - throw new MetaMatrixComponentException(QueryExecPlugin.Util.getString("results_not_found", new String[] {aliasResultName})); //$NON-NLS-1$ + throw new MetaMatrixComponentException(QueryExecPlugin.Util.getString("results_not_found", aliasResultName)); //$NON-NLS-1$ } return executor.currentRow(); } @@ -99,7 +99,7 @@ if (this.parentContext != null) { return this.parentContext.getNextRow(aliasResultName); } - throw new MetaMatrixComponentException(QueryExecPlugin.Util.getString("results_not_found", new String[] {aliasResultName})); //$NON-NLS-1$ + throw new MetaMatrixComponentException(QueryExecPlugin.Util.getString("results_not_found", aliasResultName)); //$NON-NLS-1$ } return executor.nextRow(); } @@ -137,7 +137,7 @@ if (this.parentContext != null) { return this.parentContext.getOutputElements(resultName); } - throw new MetaMatrixComponentException(QueryExecPlugin.Util.getString("results_not_found", new String[] {resultName})); //$NON-NLS-1$ + throw new MetaMatrixComponentException(QueryExecPlugin.Util.getString("results_not_found", resultName)); //$NON-NLS-1$ } return executor.getOutputElements(); } Modified: trunk/soap/src/main/java/com/metamatrix/soap/service/DataServiceWebServiceImpl.java =================================================================== --- trunk/soap/src/main/java/com/metamatrix/soap/service/DataServiceWebServiceImpl.java 2009-03-17 16:26:29 UTC (rev 567) +++ trunk/soap/src/main/java/com/metamatrix/soap/service/DataServiceWebServiceImpl.java 2009-03-17 19:08:09 UTC (rev 568) @@ -184,7 +184,7 @@ returnFragment = set.getString(1); } else { - final String[] params = { procedure }; + final String params = procedure; LogUtil.log(LogConfiguration.ERROR, SOAPPlugin.Util.getString("DataServiceWebServiceImpl.8")); //$NON-NLS-1$ createSOAPFaultMessage(new Exception(SOAPPlugin.Util .getString("DataServiceWebServiceImpl.7", params)), //$NON-NLS-1$ @@ -194,7 +194,7 @@ } if (set.next()) { - final String[] params = { procedure }; + final String params = procedure; String message = SOAPPlugin.Util.getString( "DataServiceWebServiceImpl.1", params); //$NON-NLS-1$ createSOAPFaultMessage(new SQLException(message), message, @@ -307,9 +307,8 @@ connection = connectionSource.getConnection(connectionProperties); } catch (Exception e) { - final String[] param = { userName, e.getMessage() }; throw new SOAPException(SOAPPlugin.Util.getString( - "DataServiceWebServiceImpl.12", param) //$NON-NLS-1$ + "DataServiceWebServiceImpl.12", userName, e.getMessage()) //$NON-NLS-1$ , e); } return connection;

15 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

teiid-commits March 2009