February 2010 - teiid-commits - Jboss List Archives

teiid SVN: r1810 - in trunk/engine/src: test/java/org/teiid/dqp/internal/process and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-02-09 17:10:39 -0500 (Tue, 09 Feb 2010) New Revision: 1810 Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/CodeTableCache.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestCodeTableCache.java Log: TEIID-829 adding fix for case sensitivity Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/CodeTableCache.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/CodeTableCache.java 2010-02-09 20:03:49 UTC (rev 1809) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/CodeTableCache.java 2010-02-09 22:10:39 UTC (rev 1810) @@ -37,6 +37,7 @@ import com.metamatrix.dqp.embedded.DQPEmbeddedProperties; import com.metamatrix.dqp.util.LogConstants; import com.metamatrix.query.util.CommandContext; +import com.metamatrix.vdb.runtime.VDBKey; /** * Code table cache. Heavily synchronized in-memory cache of code tables. There is no purging policy for this cache. Once the limits have been reached exceptions will occur. @@ -189,32 +190,13 @@ } return table.codeMap.get(keyValue); } - - /** - * Places the lookup results in the cache and marks the cache loaded - * @param requestID - * @param nodeID - * @return the set of waiting requests - * @since 4.2 - */ - public Set<Object> markCacheLoaded(CacheKey requestKey) { - return markCacheDone(requestKey, false); - } - - /** - * Notifies the CodeTableCache that this code table had an error. Removes any existing cached results and clears any state - * for this CacheKey. - * @param requestID - * @param nodeID - * @return the set of waiting requests - * @since 4.2 - */ - public Set<Object> errorLoadingCache(CacheKey requestKey) { - return markCacheDone(requestKey, true); - } - private synchronized Set<Object> markCacheDone(CacheKey cacheKey, boolean errorOccurred) { - if (errorOccurred) { + /** + * Notifies the CodeTableCache that this code is done. If the table had an error, it removes any temporary results. + * @return the set of waiting requests + */ + public synchronized Set<Object> markCacheDone(CacheKey cacheKey, boolean success) { + if (!success) { // Remove any results already cached CodeTable table = codeTableCache.remove(cacheKey); if (table != null) { @@ -224,7 +206,7 @@ } CodeTable table = codeTableCache.get(cacheKey); if (table == null || table.codeMap == null) { - return null; + return null; //can only happen if cache was cleared between load and now } rowCount += table.codeMap.size(); Set<Object> waiting = table.waitingRequests; @@ -264,8 +246,7 @@ private String codeTable; private String returnElement; private String keyElement; - private String vdbName; - private String vdbVersion; + private VDBKey vdbKey; private int hashCode; @@ -273,15 +254,11 @@ this.codeTable = codeTable; this.returnElement = returnElement; this.keyElement = keyElement; - this.vdbName = vdbName; - this.vdbVersion = vdbVersion; + this.vdbKey = new VDBKey(vdbName, vdbVersion); // Compute hash code and cache it - hashCode = HashCodeUtil.hashCode(0, codeTable); - hashCode = HashCodeUtil.hashCode(hashCode, returnElement); - hashCode = HashCodeUtil.hashCode(hashCode, keyElement); - hashCode = HashCodeUtil.hashCode(hashCode, vdbName); - hashCode = HashCodeUtil.hashCode(hashCode, vdbVersion); + hashCode = HashCodeUtil.hashCode(codeTable.toUpperCase().hashCode(), returnElement.toUpperCase(), + keyElement.toUpperCase(), vdbKey); } public String getCodeTable() { @@ -304,11 +281,10 @@ CacheKey other = (CacheKey) obj; return (other.hashCode() == hashCode() && - this.codeTable.equals(other.codeTable) && - this.returnElement.equals(other.returnElement) && - this.keyElement.equals(other.keyElement) && - this.vdbName.equals(other.vdbName) && - this.vdbVersion.equals(other.vdbVersion)); + this.codeTable.equalsIgnoreCase(other.codeTable) && + this.returnElement.equalsIgnoreCase(other.returnElement) && + this.keyElement.equalsIgnoreCase(other.keyElement) && + this.vdbKey.equals(other.vdbKey)); } return false; } Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2010-02-09 20:03:49 UTC (rev 1809) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2010-02-09 22:10:39 UTC (rev 1810) @@ -446,12 +446,7 @@ } success = true; } finally { - Collection requests = null; - if (success) { - requests = codeTableCache.markCacheLoaded(codeRequestId); - } else { - requests = codeTableCache.errorLoadingCache(codeRequestId); - } + Collection requests = codeTableCache.markCacheDone(codeRequestId, success); notifyWaitingCodeTableRequests(requests); } } Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestCodeTableCache.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestCodeTableCache.java 2010-02-09 20:03:49 UTC (rev 1809) +++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestCodeTableCache.java 2010-02-09 22:10:39 UTC (rev 1810) @@ -73,11 +73,7 @@ } catch (MetaMatrixProcessingException e) { throw new RuntimeException(e); } - if(setDone) { - ctc.markCacheLoaded(nodeId); - } else { - ctc.errorLoadingCache(nodeId); - } + ctc.markCacheDone(nodeId, setDone); return ctc; } @@ -98,7 +94,7 @@ } catch (MetaMatrixProcessingException e) { throw new RuntimeException(e); } - ctc.markCacheLoaded(nodeId); + ctc.markCacheDone(nodeId, true); return ctc; } @@ -115,6 +111,10 @@ CacheState actualState = ctc.cacheExists("countrycode", "code", "country", TEST_CONTEXT); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ assertEquals("Actual cache state doesn't match with expected: ", CacheState.CACHE_EXISTS, actualState); //$NON-NLS-1$ + + //test case insensitive + actualState = ctc.cacheExists("countryCODE", "code", "Country", TEST_CONTEXT); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + assertEquals("Actual cache state doesn't match with expected: ", CacheState.CACHE_EXISTS, actualState); //$NON-NLS-1$ } /** state = 1; loading state */

15 years, 10 months

1
0
0 / 0

teiid SVN: r1809 - in trunk/engine/src: test/java/com/metamatrix/query/resolver and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-02-09 15:03:49 -0500 (Tue, 09 Feb 2010) New Revision: 1809 Modified: trunk/engine/src/main/java/com/metamatrix/query/sql/lang/SetQuery.java trunk/engine/src/test/java/com/metamatrix/query/resolver/TestResolver.java Log: TEIID-947 metadata calls against cloned set queries may return the wrong type Modified: trunk/engine/src/main/java/com/metamatrix/query/sql/lang/SetQuery.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/query/sql/lang/SetQuery.java 2010-02-09 16:38:09 UTC (rev 1808) +++ trunk/engine/src/main/java/com/metamatrix/query/sql/lang/SetQuery.java 2010-02-09 20:03:49 UTC (rev 1809) @@ -180,6 +180,10 @@ if(this.getLimit() != null) { copy.setLimit( (Limit) this.getLimit().clone() ); } + + if (this.projectedTypes != null) { + copy.setProjectedTypes(new ArrayList<Class<?>>(projectedTypes)); + } return copy; } Modified: trunk/engine/src/test/java/com/metamatrix/query/resolver/TestResolver.java =================================================================== --- trunk/engine/src/test/java/com/metamatrix/query/resolver/TestResolver.java 2010-02-09 16:38:09 UTC (rev 1808) +++ trunk/engine/src/test/java/com/metamatrix/query/resolver/TestResolver.java 2010-02-09 20:03:49 UTC (rev 1809) @@ -2079,6 +2079,16 @@ assertEquals(DataTypeManager.DefaultDataClasses.INTEGER, ((SingleElementSymbol)command.getProjectedSymbols().get(0)).getType()); } + @Test public void testUnionQueryClone() throws Exception{ + SetQuery command = (SetQuery)helpResolve("SELECT e2, e3 FROM pm1.g1 UNION SELECT e3, e2 from pm1.g1"); //$NON-NLS-1$ + + assertEquals(DataTypeManager.DefaultDataClasses.INTEGER, ((SingleElementSymbol)command.getProjectedSymbols().get(1)).getType()); + + command = (SetQuery)command.clone(); + + assertEquals(DataTypeManager.DefaultDataClasses.INTEGER, ((SingleElementSymbol)command.getProjectedSymbols().get(1)).getType()); + } + @Test public void testSelectIntoNoFrom() { helpResolve("SELECT 'a', 19, {b'true'}, 13.999 INTO pm1.g1"); //$NON-NLS-1$ }

15 years, 10 months

1
0
0 / 0

teiid SVN: r1808 - in trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results: TestInvalidQueries and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: vhalbert(a)redhat.com Date: 2010-02-09 11:38:09 -0500 (Tue, 09 Feb 2010) New Revision: 1808 Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestInvalidQueries/ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestInvalidQueries/TestInvalidQueries_TestQuery1.txt Log: Teiid-773 - Added TestResultSetUtil so that when writing out a generated file for an exception, changed so that the line terminator was not being appended to the file. This was causing, in comparison mode, the expected exceptions to fail Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestInvalidQueries/TestInvalidQueries_TestQuery1.txt =================================================================== --- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestInvalidQueries/TestInvalidQueries_TestQuery1.txt (rev 0) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestInvalidQueries/TestInvalidQueries_TestQuery1.txt 2010-02-09 16:38:09 UTC (rev 1808) @@ -0,0 +1,13 @@ +com.metamatrix.jdbc.MMSQLException : Parsing error: Encountered "pm1.g1" at line 1, column 11. +Was expecting one of: + <EOF> + "from" ... + "intersect" ... + "into" ... + "limit" ... + "order" ... + ";" ... + "union" ... + "except" ... + "option" ... + \ No newline at end of file Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestInvalidQueries/TestInvalidQueries_TestQuery1.txt ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 10 months

1
0
0 / 0

teiid SVN: r1807 - trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestInvalidQueries.

by teiid-commits＠lists.jboss.org

Author: vhalbert(a)redhat.com Date: 2010-02-09 11:29:25 -0500 (Tue, 09 Feb 2010) New Revision: 1807 Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestInvalidQueries/TestInvalidQueries_TestQuery1.txt Log: Teiid-773 - Added TestResultSetUtil so that when writing out a generated file for an exception, changed so that the line terminator was not being appended to the file. This was causing, in comparison mode, the expected exceptions to fail Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestInvalidQueries/TestInvalidQueries_TestQuery1.txt =================================================================== --- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestInvalidQueries/TestInvalidQueries_TestQuery1.txt (rev 0) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestInvalidQueries/TestInvalidQueries_TestQuery1.txt 2010-02-09 16:29:25 UTC (rev 1807) @@ -0,0 +1,13 @@ +com.metamatrix.jdbc.MMSQLException : Parsing error: Encountered "pm1.g1" at line 1, column 11. +Was expecting one of: + <EOF> + "from" ... + "intersect" ... + "into" ... + "limit" ... + "order" ... + ";" ... + "union" ... + "except" ... + "option" ... + \ No newline at end of file Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestInvalidQueries/TestInvalidQueries_TestQuery1.txt ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 10 months

1
0
0 / 0

teiid SVN: r1806 - in trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms: test_queries and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: vhalbert(a)redhat.com Date: 2010-02-09 11:29:06 -0500 (Tue, 09 Feb 2010) New Revision: 1806 Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestInvalidQueries/ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/TestInvalidQueries.xml Modified: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/TestPhysicalQueries.xml Log: Teiid-773 - Added TestResultSetUtil so that when writing out a generated file for an exception, changed so that the line terminator was not being appended to the file. This was causing, in comparison mode, the expected exceptions to fail Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/TestInvalidQueries.xml =================================================================== --- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/TestInvalidQueries.xml (rev 0) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/TestInvalidQueries.xml 2010-02-09 16:29:06 UTC (rev 1806) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<root> + + + + + + +<query name="TestQuery1">select * pm1.g1 order by e1</query> + +</root> + Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/TestInvalidQueries.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/TestPhysicalQueries.xml =================================================================== --- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/TestPhysicalQueries.xml 2010-02-09 16:27:21 UTC (rev 1805) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/TestPhysicalQueries.xml 2010-02-09 16:29:06 UTC (rev 1806) @@ -5,7 +5,7 @@   -<query name="TestQuery1">select * from pm1.g1 where e1 >= 0 order by e1 +<query name="TestQuery1">select * from pm1.g1 order by e1 </query> <query name="TestQuery2">select * from pm1.g2 where e1 >= 0 order by e1</query>

15 years, 10 months

1
0
0 / 0

teiid SVN: r1805 - in trunk/test-integration/db/src/main/java/org/teiid/test: client/impl and 2 other directories.

by teiid-commits＠lists.jboss.org

Author: vhalbert(a)redhat.com Date: 2010-02-09 11:27:21 -0500 (Tue, 09 Feb 2010) New Revision: 1805 Added: trunk/test-integration/db/src/main/java/org/teiid/test/util/TestResultSetUtil.java Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResult.java trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ExpectedResultsImpl.java trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/QueryScenarioImpl.java trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ResultsGeneratorImpl.java trunk/test-integration/db/src/main/java/org/teiid/test/client/results/TestResultStat.java Log: Teiid-773 - Added TestResultSetUtil so that when writing out a generated file for an exception, changed so that the line terminator was not being appended to the file. This was causing, in comparison mode, the expected exceptions to fail Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResult.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResult.java 2010-02-08 19:45:46 UTC (rev 1804) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResult.java 2010-02-09 16:27:21 UTC (rev 1805) @@ -142,7 +142,20 @@ Throwable getException(); + /** + * Set the exception that indicates the reason why there is a problem + * with the results. Call {@link #setExceptionMessage(String)} to display + * a different message in the summary file. + * @param error + */ void setException(Throwable error); + + /** + * Set the error message relating to the reason why there is a problem + * with the results. + * @param errorMsg + */ + void setExceptionMessage(String errorMsg); /** * Return the time (in a long value) that this query started. Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ExpectedResultsImpl.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ExpectedResultsImpl.java 2010-02-08 19:45:46 UTC (rev 1804) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ExpectedResultsImpl.java 2010-02-09 16:27:21 UTC (rev 1805) @@ -33,7 +33,7 @@ import org.teiid.test.client.ctc.ResultsHolder; import org.teiid.test.framework.TestLogger; import org.teiid.test.framework.exception.QueryTestFailedException; -import org.teiid.test.framework.exception.TransactionRuntimeException; +import org.teiid.test.util.TestResultSetUtil; import com.metamatrix.common.util.SqlUtil; import com.metamatrix.jdbc.util.ResultSetUtil; @@ -116,13 +116,12 @@ List<?> results = null; if (actualException != null) { - try { - results = ResultSetUtil.writeAndCompareThrowable( - actualException, null, expectedResultsFile, false); + results = TestResultSetUtil.compareThrowable( + actualException, expectedResultsFile, false); } catch (Throwable e) { - TransactionRuntimeException t = new TransactionRuntimeException( + QueryTestFailedException t = new QueryTestFailedException( e.getMessage()); t.initCause(e); throw t; @@ -177,7 +176,7 @@ } catch (QueryTestFailedException qe) { throw qe; } catch (Throwable e) { - TransactionRuntimeException t = new TransactionRuntimeException( + QueryTestFailedException t = new QueryTestFailedException( e.getMessage()); t.initCause(e); throw t; Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/QueryScenarioImpl.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/QueryScenarioImpl.java 2010-02-08 19:45:46 UTC (rev 1804) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/QueryScenarioImpl.java 2010-02-09 16:27:21 UTC (rev 1805) @@ -55,18 +55,19 @@ if (getResultsMode().equalsIgnoreCase( TestProperties.RESULT_MODES.COMPARE)) { - Object error_results = null; + Object results = null; try { - error_results = this.getExpectedResults(tr.getQuerySetID()).compareResults(tr.getQueryID(), + results = this.getExpectedResults(tr.getQuerySetID()).compareResults(tr.getQueryID(), sql, resultSet, resultException, tr.getStatus(), isOrdered(sql), updateCnt, resultFromQuery); - if (error_results == null) { + if (results == null) { tr.setStatus(TestResult.RESULT_STATE.TEST_SUCCESS); } else { tr.setStatus(TestResult.RESULT_STATE.TEST_EXCEPTION); + tr.setExceptionMessage("Results did not compare to expected results"); } @@ -82,7 +83,7 @@ try { this.getResultsGenerator().generateErrorFile(tr.getQuerySetID(), tr.getQueryID(), sql, resultSet, resultException, - error_results ); + results ); } catch (QueryTestFailedException qtfe) { throw new TransactionRuntimeException(qtfe.getMessage()); Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ResultsGeneratorImpl.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ResultsGeneratorImpl.java 2010-02-08 19:45:46 UTC (rev 1804) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ResultsGeneratorImpl.java 2010-02-09 16:27:21 UTC (rev 1805) @@ -37,7 +37,7 @@ import org.teiid.test.client.ResultsGenerator; import org.teiid.test.client.TestProperties; import org.teiid.test.framework.exception.QueryTestFailedException; -import org.teiid.test.framework.exception.TransactionRuntimeException; +import org.teiid.test.util.TestResultSetUtil; import com.metamatrix.core.util.FileUtils; import com.metamatrix.jdbc.util.ResultSetUtil; @@ -128,7 +128,7 @@ PrintStream filePrintStream = new PrintStream(actualOut); if (ex != null) { - ResultSetUtil.printThrowable(ex, filePrintStream); + TestResultSetUtil.printThrowable(ex, filePrintStream); } else if (result != null ){ result.beforeFirst(); ResultSetUtil.printResultSet(result, MAX_COL_WIDTH, true, filePrintStream); @@ -136,7 +136,7 @@ } catch (Exception e) { e.printStackTrace(); - throw new TransactionRuntimeException(e); + throw new QueryTestFailedException(e); } finally { if (actualOut != null) { try { @@ -172,11 +172,13 @@ PrintStream filePrintStream = new PrintStream(actualOut); - ResultSetUtil.printThrowable(queryError, filePrintStream); + TestResultSetUtil.printThrowable(queryError, filePrintStream); + + filePrintStream.flush(); } catch (Exception e) { e.printStackTrace(); - throw new TransactionRuntimeException(e); + throw new QueryTestFailedException(e); } finally { if (actualOut != null) { try { @@ -265,7 +267,7 @@ } catch (Exception e) { e.printStackTrace(); - throw new TransactionRuntimeException(e); + throw new QueryTestFailedException(e); } finally { if (actualOut != null) { try { Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/results/TestResultStat.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/results/TestResultStat.java 2010-02-08 19:45:46 UTC (rev 1804) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/results/TestResultStat.java 2010-02-09 16:27:21 UTC (rev 1805) @@ -114,13 +114,18 @@ } public String getExceptionMsg() { - return (error != null ? error.getMessage() : ""); + return (this.errorMsg != null ? this.errorMsg : ( error != null ? error.getMessage() : "")); } public void setException(Throwable error){ this.error = error; } + public void setExceptionMessage(String errorMsg) { + this.errorMsg = errorMsg; + + } + public Throwable getException() { return this.error; } Added: trunk/test-integration/db/src/main/java/org/teiid/test/util/TestResultSetUtil.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/util/TestResultSetUtil.java (rev 0) +++ trunk/test-integration/db/src/main/java/org/teiid/test/util/TestResultSetUtil.java 2010-02-09 16:27:21 UTC (rev 1805) @@ -0,0 +1,67 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.test.util; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.io.PrintStream; +import java.sql.SQLException; +import java.util.List; + +import com.metamatrix.jdbc.util.ResultSetUtil; + + +/** + * TestResultSetUtil was built in order to override the {@link #printThrowable(Throwable, PrintStream)} method + * in order to call out.print instead of out.println + * This is because the println adds a line terminator, and when the result file is in turn used for + * comparison it fails because of the line terminator. + * + * @since + */ +public class TestResultSetUtil { + + public static final int DEFAULT_MAX_COL_WIDTH = ResultSetUtil.DEFAULT_MAX_COL_WIDTH; + + public static List compareThrowable(Throwable t, File expectedResultsFile, boolean printToConsole) throws IOException, SQLException { + BufferedReader expectedResultsReader = null; + if (expectedResultsFile != null && expectedResultsFile.exists() && expectedResultsFile.canRead()) { + expectedResultsReader = new BufferedReader(new FileReader(expectedResultsFile)); + } + + PrintStream out = ResultSetUtil.getPrintStream(null,expectedResultsReader, printToConsole ? System.out : null); + + printThrowable(t, out); + return ResultSetUtil.getUnequalLines(out); + } + + + public static void printThrowable(Throwable t, PrintStream out) { + + out.print(t.getClass().getName() + " : " + t.getMessage()); //$NON-NLS-1$ + + } + +} Property changes on: trunk/test-integration/db/src/main/java/org/teiid/test/util/TestResultSetUtil.java ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 10 months

1
0
0 / 0

teiid SVN: r1804 - in trunk/test-integration/db/src/main/java/org/teiid/test/client: impl and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: vhalbert(a)redhat.com Date: 2010-02-08 14:45:46 -0500 (Mon, 08 Feb 2010) New Revision: 1804 Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/QueryScenarioImpl.java Log: Teiid-773 - the error files were being created, but the status wasnt being set so that the summary indicated the number of errors Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java 2010-02-06 02:00:21 UTC (rev 1803) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java 2010-02-08 19:45:46 UTC (rev 1804) @@ -154,7 +154,7 @@ .println("Number Passed : " + passFailGenMap.get("pass")); //$NON-NLS-1$ //$NON-NLS-2$ outputStream .println("Number Failed : " + passFailGenMap.get("fail")); //$NON-NLS-1$ //$NON-NLS-2$ - outputStream.println("Number Generated : " + passFailGenMap.get("gen")); //$NON-NLS-1$ //$NON-NLS-2$ +// outputStream.println("Number Generated : " + passFailGenMap.get("gen")); //$NON-NLS-1$ //$NON-NLS-2$ ResponseTimes responseTimes = calcQueryResponseTimes(results); outputStream.println("QPS : " + responseTimes.qps); //$NON-NLS-1$ Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/QueryScenarioImpl.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/QueryScenarioImpl.java 2010-02-06 02:00:21 UTC (rev 1803) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/QueryScenarioImpl.java 2010-02-08 19:45:46 UTC (rev 1804) @@ -54,30 +54,36 @@ Throwable resultException = tr.getException(); if (getResultsMode().equalsIgnoreCase( TestProperties.RESULT_MODES.COMPARE)) { - Object results = null; + + Object error_results = null; try { - results = this.getExpectedResults(tr.getQuerySetID()).compareResults(tr.getQueryID(), + error_results = this.getExpectedResults(tr.getQuerySetID()).compareResults(tr.getQueryID(), sql, resultSet, resultException, tr.getStatus(), isOrdered(sql), updateCnt, resultFromQuery); - tr.setStatus(TestResult.RESULT_STATE.TEST_SUCCESS); - + if (error_results == null) { + tr.setStatus(TestResult.RESULT_STATE.TEST_SUCCESS); + } else { + tr.setStatus(TestResult.RESULT_STATE.TEST_EXCEPTION); + } + + } catch (QueryTestFailedException qtf) { resultException = (resultException != null ? resultException : qtf); tr.setException(resultException); tr.setStatus(TestResult.RESULT_STATE.TEST_EXCEPTION); - } - if (results != null || tr.getStatus() == TestResult.RESULT_STATE.TEST_EXCEPTION) { + if (tr.getStatus() == TestResult.RESULT_STATE.TEST_EXCEPTION) { try { this.getResultsGenerator().generateErrorFile(tr.getQuerySetID(), tr.getQueryID(), sql, resultSet, resultException, - results ); + error_results ); + } catch (QueryTestFailedException qtfe) { throw new TransactionRuntimeException(qtfe.getMessage()); } @@ -99,6 +105,7 @@ } else { // just create the error file for any failures if (tr.getException() != null) { + tr.setStatus(TestResult.RESULT_STATE.TEST_EXCEPTION); try { this.getResultsGenerator().generateErrorFile(tr.getQuerySetID(), tr.getQueryID(), sql, resultSet, resultException, null);

15 years, 10 months

1
0
0 / 0

teiid SVN: r1803 - in branches/JCA: build/kit-jboss-container/deployers and 2 other directories.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2010-02-05 21:00:21 -0500 (Fri, 05 Feb 2010) New Revision: 1803 Added: branches/JCA/build/kit-jboss-container/deployers/teiid.deployer/ branches/JCA/build/kit-jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml Removed: branches/JCA/build/kit-jboss-container/deployers/teiid-deployer-jboss-beans.xml Modified: branches/JCA/build/assembly/jboss-container/dist.xml branches/JCA/jboss-integration/pom.xml Log: TEIID-833: moving teiid dependencies under deployer directory; only client, hibernate will be in the lib directory Modified: branches/JCA/build/assembly/jboss-container/dist.xml =================================================================== --- branches/JCA/build/assembly/jboss-container/dist.xml 2010-02-04 23:51:45 UTC (rev 1802) +++ branches/JCA/build/assembly/jboss-container/dist.xml 2010-02-06 02:00:21 UTC (rev 1803) @@ -33,7 +33,6 @@ <moduleSet> <includes> <include>org.jboss.teiid:teiid-hibernate-dialect</include> - <include>org.jboss.teiid:teiid-connector-api</include> </includes> <binaries> <includeDependencies>false</includeDependencies> @@ -61,7 +60,7 @@ <useDefaultExcludes>true</useDefaultExcludes> </dependencySet> </dependencySets> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deployers/teiid.deployer</outputDirectory> </binaries> </moduleSet> Deleted: branches/JCA/build/kit-jboss-container/deployers/teiid-deployer-jboss-beans.xml =================================================================== --- branches/JCA/build/kit-jboss-container/deployers/teiid-deployer-jboss-beans.xml 2010-02-04 23:51:45 UTC (rev 1802) +++ branches/JCA/build/kit-jboss-container/deployers/teiid-deployer-jboss-beans.xml 2010-02-06 02:00:21 UTC (rev 1803) @@ -1,136 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - -  - <bean name="VDBStructure" class="org.teiid.deployers.VDBStructure" /> - <bean name="VDBRepository" class="org.teiid.deployers.VDBRepository"/> - <bean name="ConnectorManagerRepository" class="org.teiid.dqp.internal.datamgr.impl.ConnectorManagerRepository"/> - - <bean name="VDBParserDeployer" class="org.teiid.deployers.VDBParserDeployer"> - <property name="objectSerializer"><inject bean="ObjectSerializer"/></property> - </bean> - - - <bean name="DynamicVDBDeployer" class="org.teiid.deployers.DynamicVDBDeployer"> - <property name="objectSerializer"><inject bean="ObjectSerializer"/></property> - <property name="VDBRepository"><inject bean="VDBRepository"/></property> - <property name="connectorManagerRepository"><inject bean="ConnectorManagerRepository"/></property> - </bean> - - - <bean name="ObjectSerializer" class="org.teiid.deployers.ObjectSerializer"> - <property name="attachmentStoreRoot">${jboss.server.data.dir}/teiid</property> - </bean> - - <bean name="VDBDeployer" class="org.teiid.deployers.VDBDeployer"> - <install bean="ManagedDeploymentCreator" method="addAttachmentType"> - <parameter> - <value>org.teiid.adminapi.impl.VDBMetaData</value> - </parameter> - <parameter> - <value>teiid-vdb</value> - </parameter> - </install> - <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType"> - <parameter> - <value>org.teiid.adminapi.impl.VDBMetaData</value> - </parameter> - </uninstall> - <property name="managedObjectFactory"><inject bean="ManagedObjectFactory"/></property> - <property name="VDBRepository"><inject bean="VDBRepository"/></property> - <property name="contextCache"><inject bean="ContextCache"/></property> - <depends>SystemVDBDeployer</depends> - </bean> - - - - <bean name="SystemVDBDeployer" class="org.teiid.deployers.SystemVDBDeployer"> - <property name="VDBRepository"><inject bean="VDBRepository"/></property> - </bean> - - <bean name="ConnectorBindingDeployer" class="org.teiid.jboss.deployers.ConnectorBindingDeployer"> - <property name="connectorManagerRepository"><inject bean="ConnectorManagerRepository"/></property> - <property name="managedObjectFactory"><inject bean="ManagedObjectFactory"/></property> - </bean> - - <bean name="DQPManager" class="org.teiid.dqp.internal.process.DQPManagementView"> - <property name="connectorManagerRepository"><inject bean="ConnectorManagerRepository"/></property> - </bean> - -  -  -  - - <bean name="TeiidCache" class="org.teiid.cache.DefaultCacheFactory"> - </bean> - - <bean name="ContextCache" class="org.teiid.dqp.internal.cache.DQPContextCache"> - <property name="cacheFactory"><inject bean="TeiidCache"/></property> - <property name="processName">localhost</property> - </bean> -</deployment> \ No newline at end of file Copied: branches/JCA/build/kit-jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml (from rev 1769, branches/JCA/build/kit-jboss-container/deployers/teiid-deployer-jboss-beans.xml) =================================================================== --- branches/JCA/build/kit-jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml (rev 0) +++ branches/JCA/build/kit-jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml 2010-02-06 02:00:21 UTC (rev 1803) @@ -0,0 +1,136 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + +  + <bean name="VDBStructure" class="org.teiid.deployers.VDBStructure" /> + <bean name="VDBRepository" class="org.teiid.deployers.VDBRepository"/> + <bean name="ConnectorManagerRepository" class="org.teiid.dqp.internal.datamgr.impl.ConnectorManagerRepository"/> + + <bean name="VDBParserDeployer" class="org.teiid.deployers.VDBParserDeployer"> + <property name="objectSerializer"><inject bean="ObjectSerializer"/></property> + </bean> + + + <bean name="DynamicVDBDeployer" class="org.teiid.deployers.DynamicVDBDeployer"> + <property name="objectSerializer"><inject bean="ObjectSerializer"/></property> + <property name="VDBRepository"><inject bean="VDBRepository"/></property> + <property name="connectorManagerRepository"><inject bean="ConnectorManagerRepository"/></property> + </bean> + + + <bean name="ObjectSerializer" class="org.teiid.deployers.ObjectSerializer"> + <property name="attachmentStoreRoot">${jboss.server.data.dir}/teiid</property> + </bean> + + <bean name="VDBDeployer" class="org.teiid.deployers.VDBDeployer"> + <install bean="ManagedDeploymentCreator" method="addAttachmentType"> + <parameter> + <value>org.teiid.adminapi.impl.VDBMetaData</value> + </parameter> + <parameter> + <value>teiid-vdb</value> + </parameter> + </install> + <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType"> + <parameter> + <value>org.teiid.adminapi.impl.VDBMetaData</value> + </parameter> + </uninstall> + <property name="managedObjectFactory"><inject bean="ManagedObjectFactory"/></property> + <property name="VDBRepository"><inject bean="VDBRepository"/></property> + <property name="contextCache"><inject bean="ContextCache"/></property> + <depends>SystemVDBDeployer</depends> + </bean> + + + + <bean name="SystemVDBDeployer" class="org.teiid.deployers.SystemVDBDeployer"> + <property name="VDBRepository"><inject bean="VDBRepository"/></property> + </bean> + + <bean name="ConnectorBindingDeployer" class="org.teiid.jboss.deployers.ConnectorBindingDeployer"> + <property name="connectorManagerRepository"><inject bean="ConnectorManagerRepository"/></property> + <property name="managedObjectFactory"><inject bean="ManagedObjectFactory"/></property> + </bean> + + <bean name="DQPManager" class="org.teiid.dqp.internal.process.DQPManagementView"> + <property name="connectorManagerRepository"><inject bean="ConnectorManagerRepository"/></property> + </bean> + +  +  +  + + <bean name="TeiidCache" class="org.teiid.cache.DefaultCacheFactory"> + </bean> + + <bean name="ContextCache" class="org.teiid.dqp.internal.cache.DQPContextCache"> + <property name="cacheFactory"><inject bean="TeiidCache"/></property> + <property name="processName">localhost</property> + </bean> +</deployment> \ No newline at end of file Property changes on: branches/JCA/build/kit-jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/JCA/jboss-integration/pom.xml =================================================================== --- branches/JCA/jboss-integration/pom.xml 2010-02-04 23:51:45 UTC (rev 1802) +++ branches/JCA/jboss-integration/pom.xml 2010-02-06 02:00:21 UTC (rev 1803) @@ -55,7 +55,6 @@ <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-connector-api</artifactId> - <scope>provided</scope> </dependency> <dependency>

15 years, 10 months

1
0
0 / 0

teiid SVN: r1802 - branches/JCA/runtime/src/main/java/org/teiid/deployers.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2010-02-04 18:51:45 -0500 (Thu, 04 Feb 2010) New Revision: 1802 Modified: branches/JCA/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java branches/JCA/runtime/src/main/java/org/teiid/deployers/VDBParserDeployer.java Log: TEIID-502: Fixing the error deploying the UDF Modified: branches/JCA/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java =================================================================== --- branches/JCA/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-02-04 23:09:58 UTC (rev 1801) +++ branches/JCA/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-02-04 23:51:45 UTC (rev 1802) @@ -77,7 +77,7 @@ // check if this is a VDB with index files, if there are then build the TransformationMetadata IndexMetadataFactory indexFactory = unit.getAttachment(IndexMetadataFactory.class); - UDFMetaData udf = unit.removeAttachment(UDFMetaData.class); + UDFMetaData udf = unit.getAttachment(UDFMetaData.class); if (indexFactory != null) { Map<VirtualFile, Visibility> visibilityMap = indexFactory.getEntriesPlusVisibilities(); metadata = buildTransformationMetaData(deployment, visibilityMap, store, udf); @@ -89,6 +89,7 @@ // add the metadata objects as attachments deployment.removeAttachment(IndexMetadataFactory.class); + deployment.removeAttachment(UDFMetaData.class); deployment.addAttchment(QueryMetadataInterface.class, metadata); deployment.addAttchment(CompositeMetadataStore.class, metadata.getMetadataStore()); Modified: branches/JCA/runtime/src/main/java/org/teiid/deployers/VDBParserDeployer.java =================================================================== --- branches/JCA/runtime/src/main/java/org/teiid/deployers/VDBParserDeployer.java 2010-02-04 23:09:58 UTC (rev 1801) +++ branches/JCA/runtime/src/main/java/org/teiid/deployers/VDBParserDeployer.java 2010-02-04 23:51:45 UTC (rev 1802) @@ -141,7 +141,7 @@ // If the UDF file is enclosed then attach it to the deployment artifact if (udf != null) { - def.addAttchment(UDFMetaData.class, udf); + unit.addAttachment(UDFMetaData.class, udf); } log.debug("VDB "+unit.getRoot().getName()+" has been parsed.");

15 years, 10 months

1
0
0 / 0

teiid SVN: r1801 - in branches/JCA: build/assembly/jboss-container and 12 other directories.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2010-02-04 18:09:58 -0500 (Thu, 04 Feb 2010) New Revision: 1801 Added: branches/JCA/build/kit-jboss-container/deploy/teiid-engine.rar/ branches/JCA/build/kit-jboss-container/deploy/teiid-engine.rar/META-INF/ branches/JCA/build/kit-jboss-container/deploy/teiid-engine.rar/META-INF/ra.xml Removed: branches/JCA/build/assembly/jboss-container/connectors.xml branches/JCA/build/assembly/jboss-container/dependencies.xml branches/JCA/build/kit-jboss-container/deploy/teiid-runtime.rar Modified: branches/JCA/build/assembly/jboss-container/dist.xml branches/JCA/cache-jbosscache/pom.xml branches/JCA/common-internal/pom.xml branches/JCA/connector-api/pom.xml branches/JCA/connector-sdk/pom.xml branches/JCA/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectConnection.java branches/JCA/engine/pom.xml branches/JCA/jboss-integration/pom.xml branches/JCA/metadata/pom.xml branches/JCA/pom.xml branches/JCA/runtime/pom.xml Log: TEIID-833: Fixing some dependencies such that client/connector-api are provided rest have dependent each other Deleted: branches/JCA/build/assembly/jboss-container/connectors.xml =================================================================== --- branches/JCA/build/assembly/jboss-container/connectors.xml 2010-02-04 18:44:39 UTC (rev 1800) +++ branches/JCA/build/assembly/jboss-container/connectors.xml 2010-02-04 23:09:58 UTC (rev 1801) @@ -1,34 +0,0 @@ - -<assembly> - - <id>connector-rar</id> - - <formats> - <format>dir</format> - </formats> - - <includeBaseDirectory>false</includeBaseDirectory> - <baseDirectory>teiid</baseDirectory> - - <moduleSets> - <moduleSet> - <includeSubModules>true</includeSubModules> - - <includes> - <include>org.jboss.teiid.connectors:connector-jdbc:rar</include> - <include>org.jboss.teiid.connectors:connector-loopback</include> - <include>org.jboss.teiid.connectors:connector-text</include> - <include>org.jboss.teiid.connectors:connector-ldap</include> - <include>org.jboss.teiid.connectors:connector-salesforce</include> - </includes> - - <binaries> - <includeDependencies>false</includeDependencies> - <unpack>false</unpack> - </binaries> - - </moduleSet> - - </moduleSets> - -</assembly> \ No newline at end of file Deleted: branches/JCA/build/assembly/jboss-container/dependencies.xml =================================================================== --- branches/JCA/build/assembly/jboss-container/dependencies.xml 2010-02-04 18:44:39 UTC (rev 1800) +++ branches/JCA/build/assembly/jboss-container/dependencies.xml 2010-02-04 23:09:58 UTC (rev 1801) @@ -1,59 +0,0 @@ - -<assembly> - - <id>runtime-dependencies</id> - - <formats> - <format>dir</format> - </formats> - - <includeBaseDirectory>false</includeBaseDirectory> - <baseDirectory>teiid</baseDirectory> - - <moduleSets> - <moduleSet> - <includeSubModules>true</includeSubModules> - - <includes> - <include>org.jboss.teiid:teiid-cache-jbosscache</include> - <include>org.jboss.teiid:teiid-common-internal</include> - - <include>org.jboss.teiid:teiid-connector-api</include> - <include>org.jboss.teiid:teiid-connector-metadata</include> - <include>org.jboss.teiid:teiid-runtime</include> - <include>org.jboss.teiid:teiid-engine</include> - <include>org.jboss.teiid:teiid-metadata</include> - </includes> - - <binaries> - <includeDependencies>true</includeDependencies> - <unpack>false</unpack> - - <dependencySets> - <dependencySet> - <useProjectArtifact>true</useProjectArtifact> - <unpack>false</unpack> - <useTransitiveDependencies>true</useTransitiveDependencies> - <useDefaultExcludes>true</useDefaultExcludes> - <excludes> - <exclude>teiid*</exclude> - </excludes> - </dependencySet> - </dependencySets> - - </binaries> - - </moduleSet> - <moduleSet> - <includes> - <include>org.jboss.teiid:teiid-hibernate-dialect</include> - <include>org.jboss.teiid:teiid-jboss-integration</include> - </includes> - <binaries> - <includeDependencies>false</includeDependencies> - <unpack>false</unpack> - </binaries> - </moduleSet> - </moduleSets> - -</assembly> \ No newline at end of file Modified: branches/JCA/build/assembly/jboss-container/dist.xml =================================================================== --- branches/JCA/build/assembly/jboss-container/dist.xml 2010-02-04 18:44:39 UTC (rev 1800) +++ branches/JCA/build/assembly/jboss-container/dist.xml 2010-02-04 23:09:58 UTC (rev 1801) @@ -11,36 +11,79 @@ <baseDirectory>teiid-${version}</baseDirectory> <fileSets> - + <fileSet> + <directory>build/kit-jboss-container</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + +  + <fileSet> <directory>target/distribution</directory> <includes> <include>teiid-${version}-client.jar</include> </includes> <outputDirectory>lib</outputDirectory> </fileSet> - - <fileSet> - <directory>target/distribution/teiid-${version}-runtime-dependencies.dir</directory> + + </fileSets> + +  + <moduleSets> + <moduleSet> <includes> - <include>*.jar</include> + <include>org.jboss.teiid:teiid-hibernate-dialect</include> + <include>org.jboss.teiid:teiid-connector-api</include> </includes> - <outputDirectory>lib</outputDirectory> - </fileSet> - - <fileSet> - <directory>target/distribution/teiid-${version}-connector-rar.dir</directory> - <includes> - <include>*.rar</include> - </includes> - <outputDirectory>deploy</outputDirectory> - </fileSet> + <binaries> + <includeDependencies>false</includeDependencies> + <unpack>false</unpack> + <outputDirectory>lib</outputDirectory> + </binaries> + </moduleSet> + +  + <moduleSet> + <includeSubModules>true</includeSubModules> + + <includes> + <include>org.jboss.teiid:teiid-jboss-integration</include> + </includes> + + <binaries> + <includeDependencies>true</includeDependencies> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <useProjectArtifact>true</useProjectArtifact> + <unpack>false</unpack> + <useTransitiveDependencies>true</useTransitiveDependencies> + <useDefaultExcludes>true</useDefaultExcludes> + </dependencySet> + </dependencySets> + <outputDirectory>lib</outputDirectory> + </binaries> + </moduleSet> + +  + <moduleSet> + <includeSubModules>true</includeSubModules> + + <includes> + <include>org.jboss.teiid.connectors:connector-jdbc:rar</include> + <include>org.jboss.teiid.connectors:connector-loopback:rar</include> + <include>org.jboss.teiid.connectors:connector-text:rar</include> + <include>org.jboss.teiid.connectors:connector-ldap:rar</include> + <include>org.jboss.teiid.connectors:connector-salesforce:rar</include> + </includes> + + <binaries> + <includeDependencies>false</includeDependencies> + <unpack>false</unpack> + <outputDirectory>deploy</outputDirectory> + </binaries> + + </moduleSet> - <fileSet> - <directory>build/kit-jboss-container</directory> - <outputDirectory>/</outputDirectory> - </fileSet> - - </fileSets> - + </moduleSets> </assembly> \ No newline at end of file Added: branches/JCA/build/kit-jboss-container/deploy/teiid-engine.rar/META-INF/ra.xml =================================================================== --- branches/JCA/build/kit-jboss-container/deploy/teiid-engine.rar/META-INF/ra.xml (rev 0) +++ branches/JCA/build/kit-jboss-container/deploy/teiid-engine.rar/META-INF/ra.xml 2010-02-04 23:09:58 UTC (rev 1801) @@ -0,0 +1,144 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<connector xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee + http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd" + version="1.5"> + + <vendor-name>Red Hat Middleware LLC</vendor-name> + <eis-type>Teiid Runtime Engine</eis-type> + <resourceadapter-version>1.0</resourceadapter-version> + <license> + <description> + JBoss, Home of Professional Open Source. + Copyright 2006, Red Hat Middleware LLC, and individual contributors + as indicated by the @author tags. See the copyright.txt file in the + distribution for a full listing of individual contributors. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. + </description> + <license-required>true</license-required> + </license> + + <resourceadapter> + <resourceadapter-class>org.teiid.TeiidResourceAdapter</resourceadapter-class> + + <outbound-resourceadapter> + <connection-definition> + <managedconnectionfactory-class>org.teiid.TeiidManagedConnectionFactory</managedconnectionfactory-class> + <config-property> + <description>Name of the process that uniquely identifies this process </description> + <config-property-name>ProcessName</config-property-name> + <config-property-type>java.lang.String</config-property-type> + <config-property-value>localhost</config-property-value> + </config-property> + <config-property> + <description>Process pool maximum thread count. (default 64)</description> + <config-property-name>MaxThreads</config-property-name> + <config-property-type>java.lang.Integer</config-property-type> + <config-property-value>64</config-property-value> + </config-property> + <config-property> + <description>Query processor time slice, in milliseconds. (default 2000)</description> + <config-property-name>TimeSliceInMilli</config-property-name> + <config-property-type>java.lang.Integer</config-property-type> + <config-property-value>2000</config-property-value> + </config-property> + <config-property> + <description>Plan debug messages allowed. see option debug.</description> + <config-property-name>OptionDebugAllowed</config-property-name> + <config-property-type>java.lang.Boolean</config-property-type> + <config-property-value>true</config-property-value> + </config-property> + <config-property> + <description>Maximum allowed fetch size, set via JDBC. User requested value ignored above this value. (default 20000)</description> + <config-property-name>MaxRowsFetchSize</config-property-name> + <config-property-type>java.lang.Integer</config-property-type> + <config-property-value>2000</config-property-value> + </config-property> + <config-property> + <description>The max lob chunk size transferred each time when processing blobs, clobs(10KB default)</description> + <config-property-name>LobChunkSizeInKB</config-property-name> + <config-property-type>java.lang.Integer</config-property-type> + <config-property-value>10</config-property-value> + </config-property> + <config-property> + <description>The maximum number of query plans that are cached. Note: this is a memory based cache. (default 250) </description> + <config-property-name>PreparedPlanCacheMaxCount</config-property-name> + <config-property-type>java.lang.Integer</config-property-type> + <config-property-value>250</config-property-value> + </config-property> + <config-property> + <description>Maximum number of cached lookup tables. Note: this is a memory based cache and should be set to a value of at least 10 to accomidate system usage. (default 200)</description> + <config-property-name>CodeTablesMaxCount</config-property-name> + <config-property-type>java.lang.Integer</config-property-type> + <config-property-value>200</config-property-value> + </config-property> + <config-property> + <description>Maximum number of records in a single lookup table (default 10000)</description> + <config-property-name>CodeTablesMaxRowsPerTable</config-property-name> + <config-property-type>java.lang.Integer</config-property-type> + <config-property-value>10000</config-property-value> + </config-property> + <config-property> + <description>Maximum number of records in all lookup tables (default 200000)</description> + <config-property-name>CodeTablesMaxRows</config-property-name> + <config-property-type>java.lang.Integer</config-property-type> + <config-property-value>200000</config-property-value> + </config-property> + <config-property> + <description>Server Bind address</description> + <config-property-name>BindAddress</config-property-name> + <config-property-type>java.lang.String</config-property-type> + <config-property-value>localhost</config-property-value> + </config-property> + <config-property> + <description>Server Port Number</description> + <config-property-name>portNumber</config-property-name> + <config-property-type>java.lang.Integer</config-property-type> + <config-property-value>31000</config-property-value> + </config-property> + <config-property> + <description>Max Entries allowed for ResultSet Cache</description> + <config-property-name>ResultSetCacheMaxEntries</config-property-name> + <config-property-type>java.lang.Integer</config-property-type> + <config-property-value>1024</config-property-value> + </config-property> + <config-property> + <description>Enable Resultset Caching</description> + <config-property-name>ResultSetCacheEnabled</config-property-name> + <config-property-type>java.lang.Boolean</config-property-type> + <config-property-value>true</config-property-value> + </config-property> + + <connectionfactory-interface>com.metamatrix.common.comm.api.ServerConnectionFactory</connectionfactory-interface> + <connectionfactory-impl-class>org.teiid.TeiidConnectionFactory</connectionfactory-impl-class> + <connection-interface>com.metamatrix.common.comm.api.ServerConnection</connection-interface> + <connection-impl-class>org.teiid.WrappedConnection</connection-impl-class> + + </connection-definition> + + <transaction-support>NoTransaction</transaction-support> + + <authentication-mechanism> + <authentication-mechanism-type>BasicPassword</authentication-mechanism-type> + <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface> + </authentication-mechanism> + <reauthentication-support>false</reauthentication-support> + </outbound-resourceadapter> + </resourceadapter> +</connector> Deleted: branches/JCA/build/kit-jboss-container/deploy/teiid-runtime.rar =================================================================== (Binary files differ) Modified: branches/JCA/cache-jbosscache/pom.xml =================================================================== --- branches/JCA/cache-jbosscache/pom.xml 2010-02-04 18:44:39 UTC (rev 1800) +++ branches/JCA/cache-jbosscache/pom.xml 2010-02-04 23:09:58 UTC (rev 1801) @@ -11,9 +11,15 @@ <name>JBoss Cache</name> <description>JBossCache provider.</description> <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-engine</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.cache</groupId> Modified: branches/JCA/common-internal/pom.xml =================================================================== --- branches/JCA/common-internal/pom.xml 2010-02-04 18:44:39 UTC (rev 1800) +++ branches/JCA/common-internal/pom.xml 2010-02-04 23:09:58 UTC (rev 1801) @@ -16,6 +16,7 @@ <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> </dependency> <dependency> @@ -27,6 +28,7 @@ <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-client</artifactId> + <scope>provided</scope> </dependency> <dependency> Modified: branches/JCA/connector-api/pom.xml =================================================================== --- branches/JCA/connector-api/pom.xml 2010-02-04 18:44:39 UTC (rev 1800) +++ branches/JCA/connector-api/pom.xml 2010-02-04 23:09:58 UTC (rev 1801) @@ -16,6 +16,7 @@ <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> </dependency> <dependency> Modified: branches/JCA/connector-sdk/pom.xml =================================================================== --- branches/JCA/connector-sdk/pom.xml 2010-02-04 18:44:39 UTC (rev 1800) +++ branches/JCA/connector-sdk/pom.xml 2010-02-04 23:09:58 UTC (rev 1801) @@ -53,6 +53,10 @@ </resources> </build> <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + </dependency> <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-connector-api</artifactId> Modified: branches/JCA/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectConnection.java =================================================================== --- branches/JCA/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectConnection.java 2010-02-04 18:44:39 UTC (rev 1800) +++ branches/JCA/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectConnection.java 2010-02-04 23:09:58 UTC (rev 1801) @@ -23,10 +23,7 @@ package com.metamatrix.connector.object; -import org.teiid.adminapi.AdminException; -import org.teiid.connector.api.ConnectorEnvironment; import org.teiid.connector.api.ConnectorException; -import org.teiid.connector.api.ConnectorLogger; import org.teiid.connector.api.ExecutionContext; import org.teiid.connector.api.ProcedureExecution; import org.teiid.connector.basic.BasicConnection; @@ -35,7 +32,6 @@ import com.metamatrix.connector.object.extension.IObjectSource; import com.metamatrix.connector.object.extension.ISourceTranslator; -import com.metamatrix.connector.object.util.ObjectConnectorUtil; import com.metamatrix.core.util.ArgCheck; /** Modified: branches/JCA/engine/pom.xml =================================================================== --- branches/JCA/engine/pom.xml 2010-02-04 18:44:39 UTC (rev 1800) +++ branches/JCA/engine/pom.xml 2010-02-04 23:09:58 UTC (rev 1801) @@ -50,11 +50,13 @@ <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-connector-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-client</artifactId> + <scope>provided</scope> </dependency> <dependency> Modified: branches/JCA/jboss-integration/pom.xml =================================================================== --- branches/JCA/jboss-integration/pom.xml 2010-02-04 18:44:39 UTC (rev 1800) +++ branches/JCA/jboss-integration/pom.xml 2010-02-04 23:09:58 UTC (rev 1801) @@ -46,30 +46,19 @@ </build> <dependencies> + <dependency> <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <scope>provided</scope> + <artifactId>teiid-runtime</artifactId> </dependency> + <dependency> <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> + <artifactId>teiid-connector-api</artifactId> <scope>provided</scope> </dependency> + <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-runtime</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.jboss.man</groupId> <artifactId>jboss-managed</artifactId> <scope>provided</scope> @@ -96,6 +85,19 @@  <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client-jdbc</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.jboss.naming</groupId> <artifactId>jnp-client</artifactId> <version>5.0.3.GA</version> Modified: branches/JCA/metadata/pom.xml =================================================================== --- branches/JCA/metadata/pom.xml 2010-02-04 18:44:39 UTC (rev 1800) +++ branches/JCA/metadata/pom.xml 2010-02-04 23:09:58 UTC (rev 1801) @@ -15,6 +15,7 @@ <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> </dependency> <dependency> @@ -37,9 +38,16 @@ <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-client</artifactId> + <scope>provided</scope> </dependency> <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-connector-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>javax.resource</groupId> <artifactId>connector-api</artifactId> <scope>provided</scope> Modified: branches/JCA/pom.xml =================================================================== --- branches/JCA/pom.xml 2010-02-04 18:44:39 UTC (rev 1800) +++ branches/JCA/pom.xml 2010-02-04 23:09:58 UTC (rev 1801) @@ -83,8 +83,6 @@ <descriptor>build/assembly/src.xml</descriptor> --> <descriptor>build/assembly/client-jar.xml</descriptor> - <descriptor>build/assembly/jboss-container/dependencies.xml</descriptor> - <descriptor>build/assembly/jboss-container/connectors.xml</descriptor> <descriptor>build/assembly/jboss-container/dist.xml</descriptor> <descriptor>build/assembly/adminshell/adminshell-dependencies.xml</descriptor> <descriptor>build/assembly/adminshell/adminshell-dist.xml</descriptor> Modified: branches/JCA/runtime/pom.xml =================================================================== --- branches/JCA/runtime/pom.xml 2010-02-04 18:44:39 UTC (rev 1800) +++ branches/JCA/runtime/pom.xml 2010-02-04 23:09:58 UTC (rev 1801) @@ -14,6 +14,7 @@ <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.teiid</groupId> @@ -27,10 +28,12 @@ <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-connector-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-client</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.teiid</groupId> @@ -48,6 +51,7 @@ <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-client-jdbc</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.teiid</groupId>

15 years, 10 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

teiid-commits February 2010