teiid SVN: r4058 - in trunk: build/kits/jboss-as7/docs/teiid and 5 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-05-05 19:32:41 -0400 (Sat, 05 May 2012)
New Revision: 4058
Modified:
trunk/api/src/main/java/org/teiid/metadata/Schema.java
trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html
trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java
trunk/engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java
trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj
trunk/engine/src/main/resources/org/teiid/query/i18n.properties
trunk/engine/src/test/java/org/teiid/query/parser/TestDDLParser.java
trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
Log:
TEIID-2031 allowing multiple functions of the same name
Modified: trunk/api/src/main/java/org/teiid/metadata/Schema.java
===================================================================
--- trunk/api/src/main/java/org/teiid/metadata/Schema.java 2012-05-04 18:29:47 UTC (rev 4057)
+++ trunk/api/src/main/java/org/teiid/metadata/Schema.java 2012-05-05 23:32:41 UTC (rev 4058)
@@ -23,7 +23,6 @@
package org.teiid.metadata;
import java.io.IOException;
-import java.util.LinkedHashMap;
import java.util.Map;
import java.util.TreeMap;
@@ -56,13 +55,10 @@
}
public void addFunction(FunctionMethod function) {
- addFunction(function.getName(), function);
- }
-
- public void addFunction(String uniqueName, FunctionMethod function) {
function.setParent(this);
- if (this.functions.put(uniqueName, function) != null) {
- throw new DuplicateRecordException(DataPlugin.Util.gs(DataPlugin.Event.TEIID60015, function.getName()));
+ //TODO: ensure that all uuids are unique
+ if (this.functions.put(function.getUUID(), function) != null) {
+ throw new DuplicateRecordException(DataPlugin.Util.gs(DataPlugin.Event.TEIID60015, function.getUUID()));
}
}
@@ -91,13 +87,18 @@
}
/**
- * Get the functions defined in this schema
+ * Get the functions defined in this schema in a map of uuid to {@link FunctionMethod}
* @return
*/
public Map<String, FunctionMethod> getFunctions() {
return functions;
}
+ /**
+ * Get a funciton by uuid
+ * @param funcName
+ * @return
+ */
public FunctionMethod getFunction(String funcName) {
return functions.get(funcName);
}
@@ -139,7 +140,7 @@
throws IOException, ClassNotFoundException {
in.defaultReadObject();
if (this.functions == null) {
- this.functions = new LinkedHashMap<String, FunctionMethod>();
+ this.functions = new TreeMap<String, FunctionMethod>(String.CASE_INSENSITIVE_ORDER);
}
}
Modified: trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-05-04 18:29:47 UTC (rev 4057)
+++ trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-05-05 23:32:41 UTC (rev 4058)
@@ -60,6 +60,11 @@
<li>allowCreateTemporaryTablesByDefault and allowFunctionCallsByDefault are now set to false. When data roles are in use the user must explicitly grant these options to the user on VDB
</ul>
+<h4>from 8.0</h4>
+<ul>
+ <li>org.teiid.metadata.Schema holds FunctionMethods by uuid rather than name to accommodate overriden method signatures.
+<ul>
+
<h4>from 7.x</h4>
<ul>
<li>TRANSLATE/HAS CRITERIA has been removed. INSTEAD OF trigger actions should be used instead. ROWS_UPDATED, INPUTS, and INPUT are no longer procedure reserved words.
Modified: trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java 2012-05-04 18:29:47 UTC (rev 4057)
+++ trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java 2012-05-05 23:32:41 UTC (rev 4058)
@@ -30,6 +30,9 @@
import java.util.List;
import org.teiid.api.exception.query.QueryParserException;
+import org.teiid.connector.DataPlugin;
+import org.teiid.metadata.DuplicateRecordException;
+import org.teiid.metadata.FunctionMethod;
import org.teiid.metadata.MetadataFactory;
import org.teiid.query.QueryPlugin;
import org.teiid.query.sql.lang.CacheHint;
@@ -347,7 +350,12 @@
public void parseDDL(MetadataFactory factory, String ddl) throws ParseException {
getSqlParser(ddl).parseMetadata(factory);
- SQLParserUtil.replaceProceduresWithFunctions(factory);
+ HashSet<FunctionMethod> functions = new HashSet<FunctionMethod>();
+ for (FunctionMethod functionMethod : factory.getFunctions().values()) {
+ if (!functions.add(functionMethod)) {
+ throw new DuplicateRecordException(DataPlugin.Util.gs(DataPlugin.Event.TEIID60015, functionMethod.getName()));
+ }
+ }
}
}
Modified: trunk/engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java 2012-05-04 18:29:47 UTC (rev 4057)
+++ trunk/engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java 2012-05-05 23:32:41 UTC (rev 4058)
@@ -445,77 +445,63 @@
}
}
- static void replaceProceduresWithFunctions(MetadataFactory factory) throws ParseException {
- ArrayList<String> procs = new ArrayList<String>();
-
- for (Procedure proc: factory.getProcedures().values()) {
- if (!proc.isFunction()) {
- continue;
- }
-
- procs.add(proc.getName());
-
- FunctionMethod method = new FunctionMethod();
- method.setName(proc.getName());
- method.setPushdown(proc.isVirtual()?FunctionMethod.PushDown.CAN_PUSHDOWN:FunctionMethod.PushDown.MUST_PUSHDOWN);
-
- ArrayList<FunctionParameter> ins = new ArrayList<FunctionParameter>();
- for (ProcedureParameter pp:proc.getParameters()) {
- if (pp.getType() != ProcedureParameter.Type.In) {
- throw new ParseException("Functions can only support 'In' parameters"); //$NON-NLS-1$
- }
-
- FunctionParameter fp = new FunctionParameter(pp.getName(), pp.getDatatype().getName());
- fp.setVarArg(pp.isVarArg());
- ins.add(fp);
- }
- method.setInputParameters(ins);
-
- List<Column> returnCols = proc.getResultSet().getColumns();
- if (returnCols != null && !returnCols.isEmpty()) {
- if (returnCols.size() > 1) {
- throw new ParseException("Functions can only return single parameter"); //$NON-NLS-1$
- }
- Column c = returnCols.get(0);
- FunctionParameter fp = new FunctionParameter(c.getName(), c.getDatatype().getName());
- method.setOutputParameter(fp);
- }
-
- method.setAnnotation(proc.getAnnotation());
- method.setNameInSource(proc.getNameInSource());
- method.setUUID(proc.getUUID());
-
- Map<String, String> props = proc.getProperties();
-
- String value = props.remove("CATEGORY"); //$NON-NLS-1$
- method.setCategory(value);
-
- value = props.remove("DETERMINISM"); //$NON-NLS-1$
- if (value != null) {
- method.setDeterminism(FunctionMethod.Determinism.valueOf(value.toUpperCase()));
+ static void replaceProcedureWithFunction(MetadataFactory factory,
+ Procedure proc) throws ParseException {
+ FunctionMethod method = new FunctionMethod();
+ method.setName(proc.getName());
+ method.setPushdown(proc.isVirtual()?FunctionMethod.PushDown.CAN_PUSHDOWN:FunctionMethod.PushDown.MUST_PUSHDOWN);
+
+ ArrayList<FunctionParameter> ins = new ArrayList<FunctionParameter>();
+ for (ProcedureParameter pp:proc.getParameters()) {
+ if (pp.getType() != ProcedureParameter.Type.In) {
+ throw new ParseException(QueryPlugin.Util.getString("SQLParser.function_in", proc.getName())); //$NON-NLS-1$
}
-
- value = props.remove("JAVA_CLASS"); //$NON-NLS-1$
- method.setInvocationClass(value);
- value = props.remove("JAVA_METHOD"); //$NON-NLS-1$
- method.setInvocationMethod(value);
-
- for (String key:props.keySet()) {
- value = props.get(key);
- method.setProperty(key, value);
- }
-
- FunctionMethod.convertExtensionMetadata(proc, method);
-
- factory.addFunction(method);
- }
-
- // remove the old procs
- for (String name:procs) {
- factory.getProcedures().remove(name);
- }
- }
+ FunctionParameter fp = new FunctionParameter(pp.getName(), pp.getDatatype().getName());
+ fp.setVarArg(pp.isVarArg());
+ ins.add(fp);
+ }
+ method.setInputParameters(ins);
+
+ List<Column> returnCols = proc.getResultSet().getColumns();
+ if (returnCols != null && !returnCols.isEmpty()) {
+ if (returnCols.size() > 1) {
+ throw new ParseException(QueryPlugin.Util.getString("SQLParser.function_return", proc.getName())); //$NON-NLS-1$
+ }
+ Column c = returnCols.get(0);
+ FunctionParameter fp = new FunctionParameter(c.getName(), c.getDatatype().getName());
+ method.setOutputParameter(fp);
+ }
+
+ method.setAnnotation(proc.getAnnotation());
+ method.setNameInSource(proc.getNameInSource());
+ method.setUUID(proc.getUUID());
+
+ Map<String, String> props = proc.getProperties();
+
+ String value = props.remove("CATEGORY"); //$NON-NLS-1$
+ method.setCategory(value);
+
+ value = props.remove("DETERMINISM"); //$NON-NLS-1$
+ if (value != null) {
+ method.setDeterminism(FunctionMethod.Determinism.valueOf(value.toUpperCase()));
+ }
+
+ value = props.remove("JAVA_CLASS"); //$NON-NLS-1$
+ method.setInvocationClass(value);
+
+ value = props.remove("JAVA_METHOD"); //$NON-NLS-1$
+ method.setInvocationMethod(value);
+
+ for (String key:props.keySet()) {
+ value = props.get(key);
+ method.setProperty(key, value);
+ }
+
+ FunctionMethod.convertExtensionMetadata(proc, method);
+ factory.addFunction(method);
+ factory.getProcedures().remove(proc.getName());
+ }
void setProcedureOptions(Procedure proc) {
Map<String, String> props = proc.getProperties();
Modified: trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj
===================================================================
--- trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj 2012-05-04 18:29:47 UTC (rev 4057)
+++ trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj 2012-05-05 23:32:41 UTC (rev 4058)
@@ -4158,6 +4158,9 @@
if (returnDataType != null){
addProcReturnColumn(factory, proc, "return", returnDataType);
}
+ if (function) {
+ replaceProcedureWithFunction(factory, proc);
+ }
return procCmd;
}
}
Modified: trunk/engine/src/main/resources/org/teiid/query/i18n.properties
===================================================================
--- trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2012-05-04 18:29:47 UTC (rev 4057)
+++ trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2012-05-05 23:32:41 UTC (rev 4058)
@@ -272,6 +272,8 @@
SQLParser.view_def=Virtual view {0} must be defined with a query expression.
SQLParser.pk_exists=Primary Key is already defined on {0}
SQLParser.no_column=Column name {0} not found on table {1}
+SQLParser.function_return=Function {0} is not valid. Functions can only return a single parameter.
+SQLParser.function_in=Functions {0} is not valid. Functions can only support 'In' parameters.
SystemSource.array_length_desc=Get the length of the given array value
SystemSource.array_param1=Array
SystemSource.array_length_result=The array length
Modified: trunk/engine/src/test/java/org/teiid/query/parser/TestDDLParser.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/parser/TestDDLParser.java 2012-05-04 18:29:47 UTC (rev 4057)
+++ trunk/engine/src/test/java/org/teiid/query/parser/TestDDLParser.java 2012-05-05 23:32:41 UTC (rev 4058)
@@ -390,25 +390,43 @@
@Test
public void testPushdownFunctionNoArgs() throws Exception {
- String ddl = "CREATE FUNCTION SourceFunc() RETURNS integer";
+ String ddl = "CREATE FUNCTION SourceFunc() RETURNS integer OPTIONS (UUID 'hello world')";
Schema s = helpParse(ddl, "model");
- FunctionMethod fm = s.getFunction("SourceFunc");
+ FunctionMethod fm = s.getFunction("hello world");
assertNotNull(fm);
assertEquals("integer", fm.getOutputParameter().getType());
assertEquals(FunctionMethod.PushDown.MUST_PUSHDOWN, fm.getPushdown());
}
+ @Test(expected=DuplicateRecordException.class)
+ public void testDuplicateFunctions() throws Exception {
+ String ddl = "CREATE FUNCTION SourceFunc() RETURNS integer; CREATE FUNCTION SourceFunc() RETURNS string";
+ helpParse(ddl, "model");
+ }
+
+ @Test(expected=DuplicateRecordException.class)
+ public void testDuplicateFunctions1() throws Exception {
+ String ddl = "CREATE FUNCTION SourceFunc() RETURNS string OPTIONS (UUID 'a'); CREATE FUNCTION SourceFunc1() RETURNS string OPTIONS (UUID 'a')";
+ helpParse(ddl, "model");
+ }
+
+ @Test()
+ public void testDuplicateFunctions2() throws Exception {
+ String ddl = "CREATE FUNCTION SourceFunc() RETURNS string; CREATE FUNCTION SourceFunc(param string) RETURNS string";
+ helpParse(ddl, "model");
+ }
+
@Test
public void testUDF() throws Exception {
String ddl = "CREATE VIRTUAL FUNCTION SourceFunc(flag boolean, msg varchar) RETURNS varchar " +
"OPTIONS(CATEGORY 'misc', DETERMINISM 'DETERMINISTIC', " +
- "\"NULL-ON-NULL\" 'true', JAVA_CLASS 'foo', JAVA_METHOD 'bar', RANDOM 'any')";
+ "\"NULL-ON-NULL\" 'true', JAVA_CLASS 'foo', JAVA_METHOD 'bar', RANDOM 'any', UUID 'x')";
Schema s = helpParse(ddl, "model");
- FunctionMethod fm = s.getFunction("SourceFunc");
+ FunctionMethod fm = s.getFunction("x");
assertNotNull(fm);
assertEquals("string", fm.getOutputParameter().getType());
assertEquals(FunctionMethod.PushDown.CAN_PUSHDOWN, fm.getPushdown());
@@ -430,11 +448,11 @@
@Test
public void testUDAggregate() throws Exception {
String ddl = "CREATE VIRTUAL FUNCTION SourceFunc(flag boolean, msg varchar) RETURNS varchar " +
- "OPTIONS(CATEGORY 'misc', AGGREGATE 'true', \"allows-distinct\" 'true')";
+ "OPTIONS(CATEGORY 'misc', AGGREGATE 'true', \"allows-distinct\" 'true', UUID 'y')";
Schema s = helpParse(ddl, "model");
- FunctionMethod fm = s.getFunction("SourceFunc");
+ FunctionMethod fm = s.getFunction("y");
assertNotNull(fm);
assertEquals("string", fm.getOutputParameter().getType());
assertEquals(FunctionMethod.PushDown.CAN_PUSHDOWN, fm.getPushdown());
@@ -453,11 +471,11 @@
@Test
public void testVarArgs() throws Exception {
- String ddl = "CREATE FUNCTION SourceFunc(flag boolean) RETURNS varchar options (varargs 'true')";
+ String ddl = "CREATE FUNCTION SourceFunc(flag boolean) RETURNS varchar options (varargs 'true', UUID 'z')";
Schema s = helpParse(ddl, "model");
- FunctionMethod fm = s.getFunction("SourceFunc");
+ FunctionMethod fm = s.getFunction("z");
assertTrue( fm.getInputParameters().get(0).isVarArg());
}
Modified: trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java 2012-05-04 18:29:47 UTC (rev 4057)
+++ trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java 2012-05-05 23:32:41 UTC (rev 4058)
@@ -537,7 +537,7 @@
}
FunctionMethod func = FunctionMethod.createFunctionMethod(name, name, "pg", returnType, paramTypes); //$NON-NLS-1$
setUUID(func);
- addFunction(javaFunction, func);
+ addFunction(func);
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
func.setInvocationMethod(javaFunction);
func.setPushdown(PushDown.CANNOT_PUSHDOWN);
13 years, 8 months
- 1
- 0
Teiid-WeeklyBuild - Build # 22 - Failure!
by jboss-qa-internal＠redhat.com
Teiid-WeeklyBuild - Build # 22 - Failure:
Check console output at http://hudson.qa.jboss.com/hudson/job/Teiid-WeeklyBuild/22/ to view the results.
13 years, 8 months
- 1
- 2
teiid SVN: r4057 - trunk/jboss-integration/src/main/java/org/teiid/replication/jboss.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-05-04 14:29:47 -0400 (Fri, 04 May 2012)
New Revision: 4057
Modified:
trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java
Log:
TEIID-2028 fix for npe during a merge
Modified: trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java 2012-05-04 18:06:14 UTC (rev 4056)
+++ trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java 2012-05-04 18:29:47 UTC (rev 4057)
@@ -494,7 +494,7 @@
}
public void stop(Object object) {
- if (!Proxy.isProxyClass(object.getClass())) {
+ if (object == null || !Proxy.isProxyClass(object.getClass())) {
return;
}
ReplicatedInvocationHandler<?> handler = (ReplicatedInvocationHandler<?>) Proxy.getInvocationHandler(object);
13 years, 8 months
- 1
- 0
teiid SVN: r4056 - in trunk: api/src/main/java/org/teiid/translator and 15 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-05-04 14:06:14 -0400 (Fri, 04 May 2012)
New Revision: 4056
Added:
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected
trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/
trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected
Modified:
trunk/api/src/main/java/org/teiid/metadata/FunctionMethod.java
trunk/api/src/main/java/org/teiid/metadata/Schema.java
trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java
trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java
trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java
trunk/runtime/src/main/java/org/teiid/transport/ODBCSocketListener.java
trunk/runtime/src/main/java/org/teiid/transport/PGCharsetConverter.java
trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
trunk/runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java
trunk/test-integration/common/pom.xml
trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java
trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestVirtualDocWithVirtualProc.java
trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java
trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
Log:
TEIID-1977 fix for using a later driver with teiid odbc
Modified: trunk/api/src/main/java/org/teiid/metadata/FunctionMethod.java
===================================================================
--- trunk/api/src/main/java/org/teiid/metadata/FunctionMethod.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/api/src/main/java/org/teiid/metadata/FunctionMethod.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -482,6 +482,17 @@
this.aggregateAttributes = aggregateAttributes;
}
+ public static FunctionMethod createFunctionMethod(String name, String description, String category,
+ String returnType, String... paramTypes) {
+ FunctionParameter[] params = new FunctionParameter[paramTypes.length];
+ for (int i = 0; i < paramTypes.length; i++) {
+ params[i] = new FunctionParameter("param" + (i+1), paramTypes[i]); //$NON-NLS-1$
+ }
+ FunctionMethod method = new FunctionMethod(name, description, category, params, new FunctionParameter("result", returnType)); //$NON-NLS-1$
+ method.setNameInSource(name);
+ return method;
+ }
+
public static void convertExtensionMetadata(Procedure procedureRecord,
FunctionMethod function) {
String deterministic = procedureRecord.getProperty(AbstractMetadataRecord.RELATIONAL_URI + "deterministic", true); //$NON-NLS-1$
Modified: trunk/api/src/main/java/org/teiid/metadata/Schema.java
===================================================================
--- trunk/api/src/main/java/org/teiid/metadata/Schema.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/api/src/main/java/org/teiid/metadata/Schema.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -56,8 +56,12 @@
}
public void addFunction(FunctionMethod function) {
+ addFunction(function.getName(), function);
+ }
+
+ public void addFunction(String uniqueName, FunctionMethod function) {
function.setParent(this);
- if (this.functions.put(function.getName(), function) != null) {
+ if (this.functions.put(uniqueName, function) != null) {
throw new DuplicateRecordException(DataPlugin.Util.gs(DataPlugin.Event.TEIID60015, function.getName()));
}
}
Modified: trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java
===================================================================
--- trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -688,12 +688,9 @@
}
protected FunctionMethod addPushDownFunction(String qualifier, String name, String returnType, String...paramTypes) {
- FunctionParameter[] params = new FunctionParameter[paramTypes.length];
- for (int i = 0; i < paramTypes.length; i++) {
- params[i] = new FunctionParameter("param" + (i+1), paramTypes[i]); //$NON-NLS-1$
- }
- FunctionMethod method = new FunctionMethod(qualifier + '.' + name, name, qualifier, params, new FunctionParameter("result", returnType)); //$NON-NLS-1$
- method.setNameInSource(name);
+ FunctionMethod method = FunctionMethod.createFunctionMethod(qualifier + '.' + name, name, qualifier,
+ returnType, paramTypes);
+ method.setNameInSource(name);
pushdownFunctionMethods.add(method);
return method;
}
Modified: trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -36,6 +36,7 @@
import java.util.Map;
import java.util.TimeZone;
import java.util.TreeMap;
+import java.util.regex.Matcher;
import org.teiid.client.RequestMessage;
import org.teiid.client.RequestMessage.ResultsMode;
@@ -248,6 +249,13 @@
} else if(resultSet != null) {
metadata = resultSet.getMetaData();
} else {
+ Matcher matcher = StatementImpl.SHOW_STATEMENT.matcher(prepareSql);
+ if (matcher.matches()) {
+ this.executeShow(matcher);
+ metadata = this.resultSet.getMetaData();
+ this.resultSet = null;
+ return metadata;
+ }
if (getMetadataResults().getColumnMetadata() == null) {
return null;
}
@@ -259,9 +267,9 @@
return metadata;
}
- private MetadataResult getMetadataResults() throws TeiidSQLException {
+ private MetadataResult getMetadataResults() throws SQLException {
if (metadataResults == null) {
- if (StatementImpl.SET_STATEMENT.matcher(prepareSql).matches() || StatementImpl.TRANSACTION_STATEMENT.matcher(prepareSql).matches() || StatementImpl.SHOW_STATEMENT.matcher(prepareSql).matches()) {
+ if (StatementImpl.SET_STATEMENT.matcher(prepareSql).matches() || StatementImpl.TRANSACTION_STATEMENT.matcher(prepareSql).matches()) {
metadataResults = new MetadataResult();
} else {
try {
Modified: trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -506,51 +506,7 @@
if (resultsMode == ResultsMode.UPDATECOUNT) {
throw new TeiidSQLException(JDBCPlugin.Util.getString("StatementImpl.show_update_count")); //$NON-NLS-1$
}
- String show = match.group(1);
- if (show.equalsIgnoreCase("PLAN")) { //$NON-NLS-1$
- List<ArrayList<Object>> records = new ArrayList<ArrayList<Object>>(1);
- PlanNode plan = driverConnection.getCurrentPlanDescription();
- if (plan != null) {
- ArrayList<Object> row = new ArrayList<Object>(3);
- row.add(DataTypeTransformer.getClob(plan.toString()));
- row.add(new SQLXMLImpl(plan.toXml()));
- row.add(DataTypeTransformer.getClob(driverConnection.getDebugLog()));
- records.add(row);
- }
- createResultSet(records, new String[] {"PLAN_TEXT", "PLAN_XML", "DEBUG_LOG"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- new String[] {DataTypeManager.DefaultDataTypes.CLOB, DataTypeManager.DefaultDataTypes.XML, DataTypeManager.DefaultDataTypes.CLOB});
- return booleanFuture(true);
- }
- if (show.equalsIgnoreCase("ANNOTATIONS")) { //$NON-NLS-1$
- List<ArrayList<Object>> records = new ArrayList<ArrayList<Object>>(1);
- Collection<Annotation> annos = driverConnection.getAnnotations();
- for (Annotation annotation : annos) {
- ArrayList<Object> row = new ArrayList<Object>(4);
- row.add(annotation.getCategory());
- row.add(annotation.getPriority().name());
- row.add(annotation.getAnnotation());
- row.add(annotation.getResolution());
- records.add(row);
- }
- createResultSet(records, new String[] {"CATEGORY", "PRIORITY", "ANNOTATION", "RESOLUTION"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- new String[] {DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING});
- return booleanFuture(true);
- }
- if (show.equalsIgnoreCase("ALL")) { //$NON-NLS-1$
- List<ArrayList<Object>> records = new ArrayList<ArrayList<Object>>(1);
- for (String key : driverConnection.getExecutionProperties().stringPropertyNames()) {
- ArrayList<Object> row = new ArrayList<Object>(4);
- row.add(key);
- row.add(driverConnection.getExecutionProperties().get(key));
- records.add(row);
- }
- createResultSet(records, new String[] {"NAME", "VALUE"}, //$NON-NLS-1$ //$NON-NLS-2$
- new String[] {DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING});
- return booleanFuture(true);
- }
- List<List<String>> records = Collections.singletonList(Collections.singletonList(driverConnection.getExecutionProperties().getProperty(JDBCURL.getValidKey(show))));
- createResultSet(records, new String[] {show}, new String[] {DataTypeManager.DefaultDataTypes.STRING});
- return booleanFuture(true);
+ return executeShow(match);
}
}
@@ -592,6 +548,55 @@
return result;
}
+ ResultsFuture<Boolean> executeShow(Matcher match)
+ throws SQLException {
+ String show = match.group(1);
+ if (show.equalsIgnoreCase("PLAN")) { //$NON-NLS-1$
+ List<ArrayList<Object>> records = new ArrayList<ArrayList<Object>>(1);
+ PlanNode plan = driverConnection.getCurrentPlanDescription();
+ if (plan != null) {
+ ArrayList<Object> row = new ArrayList<Object>(3);
+ row.add(DataTypeTransformer.getClob(plan.toString()));
+ row.add(new SQLXMLImpl(plan.toXml()));
+ row.add(DataTypeTransformer.getClob(driverConnection.getDebugLog()));
+ records.add(row);
+ }
+ createResultSet(records, new String[] {"PLAN_TEXT", "PLAN_XML", "DEBUG_LOG"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ new String[] {DataTypeManager.DefaultDataTypes.CLOB, DataTypeManager.DefaultDataTypes.XML, DataTypeManager.DefaultDataTypes.CLOB});
+ return booleanFuture(true);
+ }
+ if (show.equalsIgnoreCase("ANNOTATIONS")) { //$NON-NLS-1$
+ List<ArrayList<Object>> records = new ArrayList<ArrayList<Object>>(1);
+ Collection<Annotation> annos = driverConnection.getAnnotations();
+ for (Annotation annotation : annos) {
+ ArrayList<Object> row = new ArrayList<Object>(4);
+ row.add(annotation.getCategory());
+ row.add(annotation.getPriority().name());
+ row.add(annotation.getAnnotation());
+ row.add(annotation.getResolution());
+ records.add(row);
+ }
+ createResultSet(records, new String[] {"CATEGORY", "PRIORITY", "ANNOTATION", "RESOLUTION"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ new String[] {DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING});
+ return booleanFuture(true);
+ }
+ if (show.equalsIgnoreCase("ALL")) { //$NON-NLS-1$
+ List<ArrayList<Object>> records = new ArrayList<ArrayList<Object>>(1);
+ for (String key : driverConnection.getExecutionProperties().stringPropertyNames()) {
+ ArrayList<Object> row = new ArrayList<Object>(4);
+ row.add(key);
+ row.add(driverConnection.getExecutionProperties().get(key));
+ records.add(row);
+ }
+ createResultSet(records, new String[] {"NAME", "VALUE"}, //$NON-NLS-1$ //$NON-NLS-2$
+ new String[] {DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING});
+ return booleanFuture(true);
+ }
+ List<List<String>> records = Collections.singletonList(Collections.singletonList(driverConnection.getExecutionProperties().getProperty(JDBCURL.getValidKey(show))));
+ createResultSet(records, new String[] {show}, new String[] {DataTypeManager.DefaultDataTypes.STRING});
+ return booleanFuture(true);
+ }
+
private ResultsFuture<ResultsMessage> execute(final RequestMessage reqMsg, boolean synch) throws SQLException,
TeiidSQLException {
this.getConnection().beginLocalTxnIfNeeded();
Modified: trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -21,8 +21,8 @@
*/
package org.teiid.deployers;
+import java.lang.reflect.Method;
import java.math.BigInteger;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Map;
import java.util.Properties;
@@ -34,11 +34,11 @@
import org.teiid.metadata.Column;
import org.teiid.metadata.Datatype;
import org.teiid.metadata.FunctionMethod;
-import org.teiid.metadata.FunctionMethod.PushDown;
-import org.teiid.metadata.FunctionParameter;
import org.teiid.metadata.MetadataFactory;
import org.teiid.metadata.Table;
+import org.teiid.metadata.FunctionMethod.PushDown;
import org.teiid.metadata.Table.Type;
+import org.teiid.odbc.ODBCServerRemoteImpl;
import org.teiid.translator.TranslatorException;
public class PgCatalogMetadataStore extends MetadataFactory {
@@ -66,7 +66,9 @@
add_pg_user();
add_matpg_relatt();
add_matpg_datatype();
- addHasFunctionPrivilage();
+ addFunction("hasPerm", "has_function_privilege"); //$NON-NLS-1$ //$NON-NLS-2$
+ addFunction("getExpr2", "pg_get_expr"); //$NON-NLS-1$ //$NON-NLS-2$
+ addFunction("getExpr3", "pg_get_expr"); //$NON-NLS-1$ //$NON-NLS-2$
}
@Override
@@ -107,21 +109,27 @@
return t;
}
- // column defaul values
+ // column default values
private Table add_pg_attrdef() throws TranslatorException {
Table t = createView("pg_attrdef"); //$NON-NLS-1$
addColumn("adrelid", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
- addColumn("adnum", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
+ addColumn("adnum", DataTypeManager.DefaultDataTypes.SHORT, t); //$NON-NLS-1$
addColumn("adbin", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$
addColumn("adsrc", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$
- String transformation = "SELECT null as oid, null as adsrc, null as adrelid, null as adnum from sys.tables where 1 = 0"; //$NON-NLS-1$
+ String transformation = "SELECT st.oid as adrelid, convert(t1.Position, short) as adnum, " + //$NON-NLS-1$
+ "case when t1.IsAutoIncremented then 'nextval(' else t1.DefaultValue end as adbin, " + //$NON-NLS-1$
+ "case when t1.IsAutoIncremented then 'nextval(' else t1.DefaultValue end as adsrc " + //$NON-NLS-1$
+ "FROM SYS.Columns as t1 LEFT OUTER JOIN SYS.Tables st ON (st.Name = t1.TableName AND st.SchemaName = t1.SchemaName)"; //$NON-NLS-1$
t.setSelectTransformation(transformation);
return t;
}
- // table columns ("attributes")
+ /**
+ * table columns ("attributes")
+ * see also {@link ODBCServerRemoteImpl} getPGColInfo for the mod calculation
+ */
private Table add_pg_attribute() throws TranslatorException {
Table t = createView("pg_attribute"); //$NON-NLS-1$
@@ -375,18 +383,20 @@
addColumn("typlen", DataTypeManager.DefaultDataTypes.SHORT, t); //$NON-NLS-1$
// typtype is b for a base type, c for a composite type (e.g., a table's row type), d for a domain,
// e for an enum type, or p for a pseudo-type. See also typrelid and typbasetype
- addColumn("typtype", DataTypeManager.DefaultDataTypes.CHAR, t); //$NON-NLS-1$
+ addColumn("typtype", DataTypeManager.DefaultDataTypes.CHAR, t); //$NON-NLS-1$
+ // typnotnull represents a not-null constraint on a type. Used for domains only.
+ addColumn("typnotnull", DataTypeManager.DefaultDataTypes.BOOLEAN, t); //$NON-NLS-1$
// if this is a domain (see typtype), then typbasetype identifies the type that this one is based on.
// Zero if this type is not a domain
addColumn("typbasetype", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
// Domains use typtypmod to record the typmod to be applied to their base type
// (-1 if base type does not use a typmod). -1 if this type is not a domain
addColumn("typtypmod", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
-
+ addColumn("typdelim", DataTypeManager.DefaultDataTypes.CHAR, t); //$NON-NLS-1$
addColumn("typrelid", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
addColumn("typelem", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
String transformation =
- "select oid, typname, (SELECT OID FROM SYS.Schemas where Name = 'SYS') as typnamespace, typlen, typtype, typbasetype, typtypmod, typrelid, typelem from texttable('" + //$NON-NLS-1$
+ "select oid, typname, (SELECT OID FROM SYS.Schemas where Name = 'SYS') as typnamespace, typlen, typtype, false as typnotnull, typbasetype, typtypmod, cast(',' as char) as typdelim, typrelid, typelem from texttable('" + //$NON-NLS-1$
"16,boolean,1,b,0,-1,0,0\n" + //$NON-NLS-1$
"1043,string,-1,b,0,-1,0,0\n" + //$NON-NLS-1$
"25,text,-1,b,0,-1,0,0\n" + //$NON-NLS-1$
@@ -513,29 +523,46 @@
return t;
}
- private FunctionMethod addHasFunctionPrivilage() throws TranslatorException {
- FunctionMethod func = addFunction("has_function_privilege"); //$NON-NLS-1$
-
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-
- ArrayList<FunctionParameter> inParams = new ArrayList<FunctionParameter>();
- inParams.add(new FunctionParameter("oid", DataTypeManager.DefaultDataTypes.INTEGER, ""));//$NON-NLS-1$ //$NON-NLS-2$
- inParams.add(new FunctionParameter("permission", DataTypeManager.DefaultDataTypes.STRING, "")); //$NON-NLS-1$ //$NON-NLS-2$
-
- func.setInputParameters(inParams);
- func.setOutputParameter(new FunctionParameter("result", DataTypeManager.DefaultDataTypes.BOOLEAN, "")); //$NON-NLS-1$ //$NON-NLS-2$
-
- func.setInvocationClass(ReturnTrue.class.getName());
- func.setInvocationMethod("result"); //$NON-NLS-1$
- func.setPushdown(PushDown.CANNOT_PUSHDOWN);
- func.setClassloader(classLoader);
-
- return func;
+ private FunctionMethod addFunction(String javaFunction, String name) {
+ Method[] methods = FunctionMethods.class.getMethods();
+ for (Method method : methods) {
+ if (!method.getName().equals(javaFunction)) {
+ continue;
+ }
+ String returnType = DataTypeManager.getDataTypeName(method.getReturnType());
+ Class<?>[] params = method.getParameterTypes();
+ String[] paramTypes = new String[params.length];
+ for (int i = 0; i < params.length; i++) {
+ paramTypes[i] = DataTypeManager.getDataTypeName(params[i]);
+ }
+ FunctionMethod func = FunctionMethod.createFunctionMethod(name, name, "pg", returnType, paramTypes); //$NON-NLS-1$
+ setUUID(func);
+ addFunction(javaFunction, func);
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ func.setInvocationMethod(javaFunction);
+ func.setPushdown(PushDown.CANNOT_PUSHDOWN);
+ func.setClassloader(classLoader);
+ func.setInvocationClass(FunctionMethods.class.getName());
+ return func;
+ }
+ throw new AssertionError("Could not find function"); //$NON-NLS-1$
}
- public static class ReturnTrue{
- public static boolean result(@SuppressWarnings("unused")int oid, @SuppressWarnings("unused") String permission) {
+ public static class FunctionMethods {
+ public static Boolean hasPerm(@SuppressWarnings("unused") Integer oid,
+ @SuppressWarnings("unused") String permission) {
return true;
}
+
+ public static String getExpr2(String text,
+ @SuppressWarnings("unused") Integer oid) {
+ return text;
+ }
+
+ public static String getExpr3(String text,
+ @SuppressWarnings("unused") Integer oid,
+ @SuppressWarnings("unused") Boolean prettyPrint) {
+ return text;
+ }
}
}
Modified: trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -47,6 +47,7 @@
import org.teiid.client.util.ResultsFuture;
import org.teiid.core.util.ApplicationInfo;
import org.teiid.core.util.StringUtil;
+import org.teiid.deployers.PgCatalogMetadataStore;
import org.teiid.jdbc.ConnectionImpl;
import org.teiid.jdbc.PreparedStatementImpl;
import org.teiid.jdbc.ResultSetImpl;
@@ -144,9 +145,6 @@
"\\s+and cn.contype = 'p'\\)" + //$NON-NLS-1$
"\\s+order by ref.oid, ref.i", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
- private static Pattern preparedAutoIncrement = Pattern.compile("select 1 \\s*from pg_catalog.pg_attrdef \\s*where adrelid = \\$1 AND adnum = \\$2 " + //$NON-NLS-1$
- "\\s*and pg_catalog.pg_get_expr\\(adbin, adrelid\\) \\s*like '%nextval\\(%'", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
-
private static Pattern cursorSelectPattern = Pattern.compile("DECLARE \"(\\w+)\" CURSOR(\\s(WITH HOLD|SCROLL))? FOR (.*)", Pattern.CASE_INSENSITIVE|Pattern.DOTALL); //$NON-NLS-1$
private static Pattern fetchPattern = Pattern.compile("FETCH (\\d+) IN \"(\\w+)\".*", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
private static Pattern movePattern = Pattern.compile("MOVE (\\d+) IN \"(\\w+)\".*", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
@@ -490,7 +488,7 @@
ResultsFuture<Integer> result = new ResultsFuture<Integer>();
if (future.get()) {
List<PgColInfo> cols = getPgColInfo(stmt.getResultSet().getMetaData());
- client.sendResults(query.sql, stmt.getResultSet(), cols, result, true);
+ client.sendResults(query.sql, stmt.getResultSet(), cols, result, false);
} else {
client.sendUpdateCount(query.sql, stmt.getUpdateCount());
setEncoding();
@@ -594,15 +592,10 @@
else if (modified.equalsIgnoreCase("select db_name() dbname")) { //$NON-NLS-1$
return "SELECT current_database()"; //$NON-NLS-1$
}
- else if (preparedAutoIncrement.matcher(modified).matches()) {
- return "SELECT 1 from matpg_relatt where attrelid = ? and attnum = ? and autoinc = true"; //$NON-NLS-1$
- }
- else {
+ else if (sql.equalsIgnoreCase("select current_schema()")) { //$NON-NLS-1$
// since teiid can work with multiple schemas at a given time
// this call resolution is ambiguous
- if (sql.equalsIgnoreCase("select current_schema()")) { //$NON-NLS-1$
- return "SELECT ''"; //$NON-NLS-1$
- }
+ return "SELECT ''"; //$NON-NLS-1$
}
}
@@ -850,19 +843,33 @@
}
private void setEncoding() {
+ String encoding = getEncoding();
+ if (encoding != null) {
+ //this may be unnecessary
+ this.client.setEncoding(encoding);
+ }
+ }
+
+ private String getEncoding() {
+ StatementImpl t = null;
try {
- StatementImpl t = connection.createStatement();
+ t = connection.createStatement();
ResultSet rs = t.executeQuery("show client_encoding"); //$NON-NLS-1$
if (rs.next()) {
- String encoding = rs.getString(1);
- if (encoding != null) {
- //this may be unnecessary
- this.client.setEncoding(encoding);
- }
+ return rs.getString(1);
}
} catch (Exception e) {
//don't care
+ } finally {
+ try {
+ if (t != null) {
+ t.close();
+ }
+ } catch (SQLException e) {
+
+ }
}
+ return null;
}
private final class QueryWorkItem implements Runnable {
@@ -958,7 +965,10 @@
done(null);
}
}
-
+
+ /**
+ * @see PgCatalogMetadataStore add_pg_attribute for mod calculation
+ */
private List<PgColInfo> getPgColInfo(ResultSetMetaData meta)
throws SQLException {
if (meta == null) {
@@ -966,12 +976,17 @@
}
int columns = meta.getColumnCount();
final ArrayList<PgColInfo> result = new ArrayList<PgColInfo>(columns);
- for (int i = 1; i < columns + 1; i++) {
+ for (int i = 1; i <= columns; i++) {
final PgColInfo info = new PgColInfo();
info.name = meta.getColumnLabel(i).toLowerCase();
info.type = meta.getColumnType(i);
info.type = convertType(info.type);
info.precision = meta.getColumnDisplaySize(i);
+ if (info.type == PG_TYPE_NUMERIC || info.type == PG_TYPE_FLOAT4 || info.type == PG_TYPE_FLOAT8) {
+ info.mod = (int) Math.min(Integer.MAX_VALUE, (4+(65536*(long)meta.getPrecision(i))+meta.getScale(i)));
+ } else {
+ info.mod = (int) Math.min(Integer.MAX_VALUE, 4+(long)meta.getColumnDisplaySize(i));
+ }
String name = meta.getColumnName(i);
String table = meta.getTableName(i);
String schema = meta.getSchemaName(i);
Modified: trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -58,6 +58,7 @@
public short attnum;
public int type;
public int precision;
+ public int mod = -1;
}
/**
Modified: trunk/runtime/src/main/java/org/teiid/transport/ODBCSocketListener.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/transport/ODBCSocketListener.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/runtime/src/main/java/org/teiid/transport/ODBCSocketListener.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -59,9 +59,9 @@
return new SSLAwareChannelHandler(this, config, Thread.currentThread().getContextClassLoader(), storageManager) {
public ChannelPipeline getPipeline() throws Exception {
ChannelPipeline pipeline = new DefaultChannelPipeline();
-
- pipeline.addLast("odbcFrontendProtocol", new PgFrontendProtocol(1 << 20)); //$NON-NLS-1$
- pipeline.addLast("odbcBackendProtocol", new PgBackendProtocol(maxLobSize, maxBufferSize, config)); //$NON-NLS-1$
+ PgBackendProtocol pgBackendProtocol = new PgBackendProtocol(maxLobSize, maxBufferSize, config);
+ pipeline.addLast("odbcFrontendProtocol", new PgFrontendProtocol(pgBackendProtocol, 1 << 20)); //$NON-NLS-1$
+ pipeline.addLast("odbcBackendProtocol", pgBackendProtocol); //$NON-NLS-1$
pipeline.addLast("handler", this); //$NON-NLS-1$
return pipeline;
}
Modified: trunk/runtime/src/main/java/org/teiid/transport/PGCharsetConverter.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/transport/PGCharsetConverter.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/runtime/src/main/java/org/teiid/transport/PGCharsetConverter.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -29,7 +29,6 @@
*/
public class PGCharsetConverter {
private static HashMap<String, Charset> charSetMap = new HashMap<String, Charset>();
- private static HashMap<Charset, String> inverseCharSetMap = new HashMap<Charset, String>();
static {
mapCharset("BIG5", Charset.forName("Big5")); //$NON-NLS-1$ //$NON-NLS-2$
@@ -70,14 +69,10 @@
private static void mapCharset(String name, Charset cs) {
charSetMap.put(name, cs);
- inverseCharSetMap.put(cs, name);
}
public static Charset getCharset(String name) {
return charSetMap.get(name);
}
- public static String getEncoding(Charset cs) {
- return inverseCharSetMap.get(cs);
- }
}
Modified: trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -182,6 +182,7 @@
private Properties props;
private Charset encoding = Charset.forName("UTF-8");
+ private String clientEncoding = "UTF8";
private ReflectionHelper clientProxy = new ReflectionHelper(ODBCClientRemote.class);
private ChannelHandlerContext ctx;
private MessageEvent message;
@@ -229,7 +230,7 @@
@Override
public void initialized(Properties props) {
this.props = props;
- setEncoding(props.getProperty("client_encoding", "UTF-8"));
+ setEncoding(props.getProperty("client_encoding", "UTF8"));
}
@Override
@@ -258,7 +259,7 @@
// releases before 8.1; IntervalStyle was not reported by releases before 8.4;
// application_name was not reported by releases before 9.0.)
- sendParameterStatus("client_encoding", PGCharsetConverter.getEncoding(this.encoding));
+ sendParameterStatus("client_encoding", clientEncoding);
sendParameterStatus("DateStyle", this.props.getProperty("DateStyle", "ISO"));
sendParameterStatus("integer_datetimes", "off");
sendParameterStatus("is_superuser", "off");
@@ -303,8 +304,14 @@
Charset cs = PGCharsetConverter.getCharset(value);
if (cs != null) {
this.encoding = cs;
+ this.clientEncoding = value;
+ //TODO: for non-init this should send a parameter status
}
}
+
+ public Charset getEncoding() {
+ return encoding;
+ }
@Override
public void sendParameterDescription(ParameterMetaData meta, int[] paramType) {
@@ -634,7 +641,7 @@
// pg_type.typlen
writeShort(getTypeSize(info.type, info.precision));
// pg_attribute.atttypmod
- writeInt(-1);
+ writeInt(info.mod);
// text
writeShort(0);
}
@@ -663,16 +670,6 @@
sendMessage();
}
- private void sendNoticeResponse(String message) {
- trace("notice:", message);
- startMessage('N');
- write('S');
- writeString("ERROR");
- write('M');
- writeString(message);
- sendMessage();
- }
-
private void sendParseComplete() {
startMessage('1');
sendMessage();
Modified: trunk/runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -64,20 +64,20 @@
private Byte messageType;
private Integer dataLength;
private boolean initialized = false;
- private Charset encoding = Charset.forName("UTF-8"); // client can override this
private ODBCServerRemote odbcProxy;
private PGRequest message;
private String user;
private String databaseName;
+ private PgBackendProtocol pgBackendProtocol;
- public PgFrontendProtocol(int maxObjectSize) {
+ public PgFrontendProtocol(PgBackendProtocol pgBackendProtocol, int maxObjectSize) {
if (maxObjectSize <= 0) {
throw new IllegalArgumentException("maxObjectSize: " + maxObjectSize); //$NON-NLS-1$
}
this.maxObjectSize = maxObjectSize;
-
+ this.pgBackendProtocol = pgBackendProtocol;
// the proxy is used for generating the object based message based on ServiceInvocationStruct class.
this.odbcProxy = (ODBCServerRemote)Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] {ODBCServerRemote.class}, new InvocationHandler() {
@Override
@@ -131,7 +131,7 @@
byte[] data = createByteArray(this.dataLength - 4);
buffer.readBytes(data);
- createRequestMessage(this.messageType, new NullTerminatedStringDataInputStream(data, new DataInputStream(new ByteArrayInputStream(data, 0, this.dataLength-4)), this.encoding));
+ createRequestMessage(this.messageType, new NullTerminatedStringDataInputStream(data, new DataInputStream(new ByteArrayInputStream(data, 0, this.dataLength-4)), this.pgBackendProtocol.getEncoding()));
this.dataLength = null;
this.messageType = null;
return message;
@@ -209,20 +209,16 @@
}
this.user = props.getProperty("user");
this.databaseName = props.getProperty("database");
- String clientEncoding = props.getProperty("client_encoding", "UTF-8");
+ String clientEncoding = props.getProperty("client_encoding", "UTF8");
props.setProperty("client_encoding", clientEncoding);
props.setProperty("default_transaction_isolation", "read committed");
props.setProperty("DateStyle", "ISO");
props.setProperty("TimeZone", Calendar.getInstance().getTimeZone().getDisplayName());
- Charset cs = PGCharsetConverter.getCharset(clientEncoding);
- if (cs != null) {
- this.encoding = cs;
- }
this.odbcProxy.initialize(props);
return message;
}
- private Object buildLogin(NullTerminatedStringDataInputStream data) throws IOException{
+ private Object buildLogin(NullTerminatedStringDataInputStream data) {
this.odbcProxy.logon(this.databaseName, this.user, data);
return message;
}
@@ -263,7 +259,7 @@
// the params can be either text or binary
if (formatCodeCount == 0 || (formatCodeCount == 1 && formatCodes[0] == 0) || formatCodes[i] == 0) {
- params[i] = new String(paramdata, this.encoding);
+ params[i] = new String(paramdata, this.pgBackendProtocol.getEncoding());
}
else {
params[i] = paramdata;
Modified: trunk/test-integration/common/pom.xml
===================================================================
--- trunk/test-integration/common/pom.xml 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/pom.xml 2012-05-04 18:06:14 UTC (rev 4056)
@@ -13,7 +13,7 @@
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>8.3-606.jdbc3</version>
+ <version>9.1-901.jdbc4</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -93,14 +93,7 @@
}
@Test public void testProperties() throws Exception {
- String[] expected = { "Name[string] Value[string] UID[string] OID[integer] ClobValue[clob]",
- "pg_type:oid 30 mmuid:ffa4ac73-b549-470e-931f-dc36330cb8c4 1 30",
- "pg_type:oid 1009 mmuid:d9f36bdc-7b25-4af0-b9f5-a96aac6d3094 2 1009",
- "pg_type:oid 1002 mmuid:bcbed548-176c-4116-a5d6-7638cb0206e1 3 1002",
- "pg_type:oid 1028 mmuid:a385751f-a31a-4d5d-9197-3fbd390b0251 4 1028"
-
- }; //$NON-NLS-1$
- executeAndAssertResults("select* from SYS.Properties", expected); //$NON-NLS-1$
+ checkResult("testProperties", "select* from SYS.Properties"); //$NON-NLS-1$
}
@Test public void testVirtualDatabase() throws Exception {
Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestVirtualDocWithVirtualProc.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestVirtualDocWithVirtualProc.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestVirtualDocWithVirtualProc.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -30,6 +30,7 @@
import org.teiid.core.util.UnitTestUtil;
import org.teiid.jdbc.AbstractMMQueryTestCase;
import org.teiid.jdbc.FakeServer;
+import org.teiid.jdbc.TestMMDatabaseMetaData;
/**
@@ -94,18 +95,9 @@
}
@Test public void testDefect15241b() throws Exception {
-
String sql = "SELECT p.Name, p.Value, UID FROM SYS.Properties p order by p.Name"; //$NON-NLS-1$
- String[] expected ={
- "Name[string] Value[string] UID[string]", //$NON-NLS-1$
- "NugentXAttribute Nuuuuuge22222 mmuuid:4789b280-841c-1f15-9526-ebd0cace03e1", //$NON-NLS-1$
- "NugentYAttribute Nuuuuuge44444 mmuuid:4789b280-841c-1f15-9526-ebd0cace03e1",
- "pg_type:oid 30 mmuid:ffa4ac73-b549-470e-931f-dc36330cb8c4" ,
- "pg_type:oid 1009 mmuid:d9f36bdc-7b25-4af0-b9f5-a96aac6d3094" ,
- "pg_type:oid 1002 mmuid:bcbed548-176c-4116-a5d6-7638cb0206e1",
- "pg_type:oid 1028 mmuid:a385751f-a31a-4d5d-9197-3fbd390b0251"
- };
- executeAndAssertResults(sql, expected);
+ execute(sql);
+ TestMMDatabaseMetaData.compareResultSet(this.internalResultSet);
}
}
Modified: trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -137,13 +137,13 @@
@Test public void testXmlTableScrollable() throws Exception {
Statement s = conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
- assertTrue(s.execute("select * from xmltable('/root/row' passing (select xmlelement(name \"root\", xmlagg(xmlelement(name \"row\", xmlforest(t.name)) order by t.name)) from tables as t, columns as t1) columns \"Name\" string) as x"));
+ assertTrue(s.execute("select * from xmltable('/root/row' passing (select xmlelement(name \"root\", xmlagg(xmlelement(name \"row\", xmlforest(t.name)) order by t.name)) from (select t.* from tables as t, columns as t1 limit 7000) as t) columns \"Name\" string) as x"));
ResultSet rs = s.getResultSet();
int count = 0;
while (rs.next()) {
count++;
}
- assertEquals(7812, count);
+ assertEquals(7000, count);
rs.beforeFirst();
while (rs.next()) {
count--;
Modified: trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -55,6 +55,7 @@
import org.teiid.jdbc.FakeServer;
import org.teiid.jdbc.TeiidDriver;
import org.teiid.jdbc.TestMMDatabaseMetaData;
+import org.teiid.jdbc.util.ResultSetUtil;
import org.teiid.net.socket.SocketUtil;
@SuppressWarnings("nls")
@@ -195,14 +196,14 @@
@Test public void testMultibatchSelect() throws Exception {
Statement s = conn.createStatement();
- assertTrue(s.execute("select * from tables, columns"));
+ assertTrue(s.execute("select * from tables, columns limit 7000"));
ResultSet rs = s.getResultSet();
int i = 0;
while (rs.next()) {
i++;
rs.getString(1);
}
- assertEquals(7812, i);
+ assertEquals(7000, i);
}
@Test public void testBlob() throws Exception {
@@ -364,6 +365,6 @@
ResultSet rs = s.getResultSet();
assertTrue(rs.next());
String str = rs.getString(1);
- assertEquals("ProjectNode\n + Output Columns:expr1 (integer)\n + Statistics:\n 0: Node Output Rows: 1\n 1: Node Process Time: 0\n 2: Node Cumulative Process Time: 0\n 3: Node Cumulative Next Batch Process Time: 0\n 4: Node Next Batch Calls: 1\n 5: Node Blocks: 0\n + Cost Estimates:Estimated Node Cardinality: 1.0\n + Select Columns:1\n", str);
+ assertTrue(str.startsWith("ProjectNode\n + Output Columns:expr1 (integer)\n + Statistics:\n 0: Node Output Rows: 1"));
}
}
Modified: trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -18,19 +18,19 @@
parts SYS Tables Table <null> true false mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7 -1 <null> true false 17
parts SYSADMIN VDBResources Table <null> true false mmuuid:1785804d-beaf-4831-9531-e59164fedd49 -1 <null> true false 7
parts SYS VirtualDatabases Table <null> true false mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489 -1 <null> true false 18
-parts pg_catalog matpg_datatype Table <null> false false mmuid:17448311-6679-4dfd-aeb6-4aabbd894729 -1 <null> true true 19
-parts pg_catalog matpg_relatt Table <null> false false mmuid:8c0714d6-1c72-40b4-8528-3b2c63059107 -1 <null> true true 20
-parts pg_catalog pg_am Table <null> false false mmuid:f6517a63-8c14-4b73-a18d-afaa5dfb35d9 -1 <null> true false 21
-parts pg_catalog pg_attrdef Table <null> false false mmuid:76a7dd05-9a7d-4243-b561-f3056500dcaf -1 <null> true false 22
+parts pg_catalog matpg_datatype Table <null> false false mmuid:0f312b3c-98ca-4a09-81fa-f1ff83f0a6c1 -1 <null> true true 19
+parts pg_catalog matpg_relatt Table <null> false false mmuid:0b0894ba-e1ea-4eaf-bcd2-ea9ebd05e47d -1 <null> true true 20
+parts pg_catalog pg_am Table <null> false false mmuid:da4b747e-7d87-403a-8309-2cdf1399031b -1 <null> true false 21
+parts pg_catalog pg_attrdef Table <null> false false mmuid:e9b278d4-49af-442f-9a5a-b699fe3b102b -1 <null> true false 22
parts pg_catalog pg_attribute Table <null> false false mmuid:fa463d98-365f-489a-a707-025193cb51eb -1 <null> true true 23
parts pg_catalog pg_class Table <null> false false mmuid:7e21f2e6-06e3-4bca-9b01-72ea47821560 -1 <null> true true 24
-parts pg_catalog pg_database Table <null> false false mmuid:382f9fc9-8c96-4df7-ab5d-04dfb47ee142 -1 <null> true false 25
-parts pg_catalog pg_index Table <null> false false mmuid:09daed8d-b0b8-4552-a261-2b6c775b46b0 -1 <null> true true 26
+parts pg_catalog pg_database Table <null> false false mmuid:1aedd02c-5801-41e7-accd-da1f257c26e8 -1 <null> true false 25
+parts pg_catalog pg_index Table <null> false false mmuid:8709e084-48df-417d-b3f8-f4e9b7d8802b -1 <null> true true 26
parts pg_catalog pg_namespace Table <null> false false mmuid:6609866a-3d7b-4f4b-95fe-ebfac769d699 -1 <null> true false 27
-parts pg_catalog pg_proc Table <null> false false mmuid:f20c9489-10ca-4596-8a37-24218b67f764 -1 <null> true true 28
-parts pg_catalog pg_trigger Table <null> false false mmuid:2b75f0b1-7475-4ed5-9da3-d37a8a25f26a -1 <null> true false 29
+parts pg_catalog pg_proc Table <null> false false mmuid:b288b3aa-37f2-4a8e-8b1b-e932a2ce3e25 -1 <null> true true 28
+parts pg_catalog pg_trigger Table <null> false false mmuid:64977f3e-f2a0-466e-a5d1-80bb058cbe08 -1 <null> true false 29
parts pg_catalog pg_type Table <null> false false mmuid:9462e3f8-cd3c-414f-a570-f6f33c40e36a -1 <null> true false 30
-parts pg_catalog pg_user Table <null> false false mmuid:e63613cb-01ee-4b37-8b91-99d1aac4dfcb -1 <null> true false 31
+parts pg_catalog pg_user Table <null> false false mmuid:236445e1-408c-40a1-a61c-40e96fb5dc9f -1 <null> true false 31
Row Count : 31
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
VDBName 12 parts java.lang.String VDBName string SYS Tables 255 255 0 false true false true 1 false true true true
Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -792,7 +792,7 @@
QT_Ora9DS pg_catalog pg_am oid 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 1 <null> <null> <null> !
<null> NO
QT_Ora9DS pg_catalog pg_am amname 12 string 4000 <null> 0 0 2 <null> <null> <null> <null> 0 2 <null> <null> <null> !
<null> NO
QT_Ora9DS pg_catalog pg_attrdef adrelid 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 1 <null> <null> <null> !
<null> NO
-QT_Ora9DS pg_catalog pg_attrdef adnum 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 2 <null> <null> <null> !
<null> NO
+QT_Ora9DS pg_catalog pg_attrdef adnum 5 short 5 <null> 0 0 2 <null> <null> <null> <null> 0 2 <null> <null> <null> !
<null> NO
QT_Ora9DS pg_catalog pg_attrdef adbin 12 string 4000 <null> 0 0 2 <null> <null> <null> <null> 0 3 <null> <null> <null> !
<null> NO
QT_Ora9DS pg_catalog pg_attrdef adsrc 12 string 4000 <null> 0 0 2 <null> <null> <null> <null> 0 4 <null> <null> <null> !
<null> NO
QT_Ora9DS pg_catalog pg_attribute oid 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 1 <null> <null> <null> !
<null> NO
@@ -857,10 +857,12 @@
QT_Ora9DS pg_catalog pg_type typnamespace 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 3 <null> <null> <null> !
<null> NO
QT_Ora9DS pg_catalog pg_type typlen 5 short 5 <null> 0 0 2 <null> <null> <null> <null> 0 4 <null> <null> <null> !
<null> NO
QT_Ora9DS pg_catalog pg_type typtype 1 char 1 <null> 0 0 2 <null> <null> <null> <null> 0 5 <null> <null> <null> !
<null> NO
-QT_Ora9DS pg_catalog pg_type typbasetype 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 6 <null> <null> <null> !
<null> NO
-QT_Ora9DS pg_catalog pg_type typtypmod 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 7 <null> <null> <null> !
<null> NO
-QT_Ora9DS pg_catalog pg_type typrelid 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 8 <null> <null> <null> !
<null> NO
-QT_Ora9DS pg_catalog pg_type typelem 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 9 <null> <null> <null> !
<null> NO
+QT_Ora9DS pg_catalog pg_type typnotnull -7 boolean 1 <null> 0 0 2 <null> <null> <null> <null> 0 6 <null> <null> <null> !
<null> NO
+QT_Ora9DS pg_catalog pg_type typbasetype 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 7 <null> <null> <null> !
<null> NO
+QT_Ora9DS pg_catalog pg_type typtypmod 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 8 <null> <null> <null> !
<null> NO
+QT_Ora9DS pg_catalog pg_type typdelim 1 char 1 <null> 0 0 2 <null> <null> <null> <null> 0 9 <null> <null> <null> !
<null> NO
+QT_Ora9DS pg_catalog pg_type typrelid 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 10 <null> <null> <null> !
<null> NO
+QT_Ora9DS pg_catalog pg_type typelem 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 11 <null> <null> <null> !
<null> NO
QT_Ora9DS pg_catalog pg_user oid 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 1 <null> <null> <null> !
<null> NO
QT_Ora9DS pg_catalog pg_user usename 12 string 4000 <null> 0 0 2 <null> <null> <null> <null> 0 2 <null> <null> <null> !
<null> NO
QT_Ora9DS pg_catalog pg_user usecreatedb -7 boolean 1 <null> 0 0 2 <null> <null> <null> <null> 0 3 <null> <null> <null> !
<null> NO
@@ -1084,7 +1086,7 @@
QT_Ora9DS XQT xqtFullData BigIntegerValue 2 biginteger 19 <null> 0 10 1 <null> <null> <null> <null> 28 15 YES <null> <null> <null> !
<null> NO
QT_Ora9DS XQT xqtFullData BigDecimalValue 2 bigdecimal 20 <null> 0 10 1 <null> <null> <null> <null> 126 16 YES <null> <null> <null> !
<null> NO
QT_Ora9DS XQT xqtFullData ObjectValue 2000 object 2048 <null> 0 10 1 <null> <null> <null> <null> 2048 17 YES <null> <null> <null> !
<null> NO
-Row Count : 1084
+Row Count : 1086
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
VDBName 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Columns 255 255 0 false false false false 0 true true false false
SchemaName 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false true 1 false true true true
Modified: trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -1,8 +1,262 @@
-integer integer string string
-adrelid adnum adbin adsrc
-Row Count : 0
+integer short string string
+adrelid adnum adbin adsrc
+8 1 <null> <null>
+8 2 <null> <null>
+8 3 <null> <null>
+8 4 <null> <null>
+8 5 <null> <null>
+8 6 <null> <null>
+8 7 <null> <null>
+8 8 <null> <null>
+8 9 <null> <null>
+8 10 <null> <null>
+8 11 <null> <null>
+8 12 <null> <null>
+8 13 <null> <null>
+8 14 <null> <null>
+8 15 <null> <null>
+8 16 <null> <null>
+8 17 <null> <null>
+8 18 <null> <null>
+8 19 <null> <null>
+8 20 <null> <null>
+8 21 <null> <null>
+8 22 <null> <null>
+8 23 <null> <null>
+8 24 <null> <null>
+8 25 <null> <null>
+8 26 <null> <null>
+8 27 <null> <null>
+8 28 <null> <null>
+8 29 <null> <null>
+8 30 <null> <null>
+8 31 <null> <null>
+9 1 <null> <null>
+9 2 <null> <null>
+9 3 <null> <null>
+9 4 <null> <null>
+9 5 <null> <null>
+9 6 (0) (0)
+9 7 (0) (0)
+9 8 <null> <null>
+9 9 ('0') ('0')
+9 10 ('0') ('0')
+9 11 ('0') ('0')
+9 12 <null> <null>
+9 13 <null> <null>
+9 14 <null> <null>
+9 15 <null> <null>
+9 16 <null> <null>
+9 17 <null> <null>
+9 18 <null> <null>
+9 19 <null> <null>
+10 1 <null> <null>
+10 2 <null> <null>
+10 3 <null> <null>
+10 4 <null> <null>
+10 5 <null> <null>
+10 6 <null> <null>
+10 7 <null> <null>
+10 8 <null> <null>
+10 9 <null> <null>
+10 10 <null> <null>
+11 1 <null> <null>
+11 2 <null> <null>
+11 3 <null> <null>
+11 4 <null> <null>
+11 5 <null> <null>
+11 6 <null> <null>
+11 7 <null> <null>
+11 8 <null> <null>
+11 9 <null> <null>
+11 10 <null> <null>
+11 11 <null> <null>
+6 1 <null> <null>
+6 2 <null> <null>
+6 3 <null> <null>
+6 4 <null> <null>
+6 5 <null> <null>
+6 6 <null> <null>
+6 7 <null> <null>
+6 8 <null> <null>
+6 9 <null> <null>
+1 1 <null> <null>
+1 2 <null> <null>
+1 3 <null> <null>
+1 4 <null> <null>
+2 1 <null> <null>
+2 2 <null> <null>
+3 1 <null> <null>
+3 2 <null> <null>
+4 1 <null> <null>
+4 2 <null> <null>
+4 3 <null> <null>
+4 4 <null> <null>
+4 5 <null> <null>
+5 1 <null> <null>
+5 2 <null> <null>
+5 3 <null> <null>
+5 4 <null> <null>
+12 1 <null> <null>
+12 2 <null> <null>
+12 3 <null> <null>
+12 4 <null> <null>
+12 5 <null> <null>
+12 6 <null> <null>
+12 7 <null> <null>
+12 8 <null> <null>
+12 9 <null> <null>
+12 10 (0) (0)
+12 11 (0) (0)
+12 12 <null> <null>
+12 13 <null> <null>
+12 14 <null> <null>
+12 15 <null> <null>
+12 16 <null> <null>
+13 1 <null> <null>
+13 2 <null> <null>
+13 3 <null> <null>
+13 4 <null> <null>
+13 5 <null> <null>
+13 6 <null> <null>
+13 7 <null> <null>
+13 8 <null> <null>
+14 1 <null> <null>
+14 2 <null> <null>
+14 3 <null> <null>
+14 4 <null> <null>
+14 5 <null> <null>
+15 1 <null> <null>
+15 2 <null> <null>
+15 3 <null> <null>
+15 4 <null> <null>
+15 5 <null> <null>
+15 6 <null> <null>
+15 7 <null> <null>
+15 8 <null> <null>
+15 9 <null> <null>
+15 10 <null> <null>
+15 11 <null> <null>
+15 12 <null> <null>
+15 13 <null> <null>
+15 14 <null> <null>
+16 1 <null> <null>
+16 2 <null> <null>
+16 3 <null> <null>
+16 4 <null> <null>
+16 5 <null> <null>
+16 6 <null> <null>
+16 7 <null> <null>
+17 1 <null> <null>
+17 2 <null> <null>
+17 3 <null> <null>
+17 4 <null> <null>
+17 5 <null> <null>
+17 6 <null> <null>
+17 7 <null> <null>
+17 8 <null> <null>
+17 9 <null> <null>
+17 10 <null> <null>
+17 11 <null> <null>
+17 12 <null> <null>
+17 13 <null> <null>
+7 1 <null> <null>
+7 2 <null> <null>
+18 1 <null> <null>
+18 2 <null> <null>
+19 1 <null> <null>
+19 2 <null> <null>
+19 3 <null> <null>
+19 4 <null> <null>
+19 5 <null> <null>
+20 1 <null> <null>
+20 2 <null> <null>
+20 3 <null> <null>
+20 4 <null> <null>
+20 5 <null> <null>
+20 6 <null> <null>
+20 7 <null> <null>
+21 1 <null> <null>
+21 2 <null> <null>
+22 1 <null> <null>
+22 2 <null> <null>
+22 3 <null> <null>
+22 4 <null> <null>
+23 1 <null> <null>
+23 2 <null> <null>
+23 3 <null> <null>
+23 4 <null> <null>
+23 5 <null> <null>
+23 6 <null> <null>
+23 7 <null> <null>
+23 8 <null> <null>
+23 9 <null> <null>
+23 10 <null> <null>
+24 1 <null> <null>
+24 2 <null> <null>
+24 3 <null> <null>
+24 4 <null> <null>
+24 5 <null> <null>
+24 6 <null> <null>
+24 7 <null> <null>
+24 8 <null> <null>
+24 9 <null> <null>
+25 1 <null> <null>
+25 2 <null> <null>
+25 3 <null> <null>
+25 4 <null> <null>
+25 5 <null> <null>
+25 6 <null> <null>
+25 7 <null> <null>
+25 8 <null> <null>
+25 9 <null> <null>
+26 1 <null> <null>
+26 2 <null> <null>
+26 3 <null> <null>
+26 4 <null> <null>
+26 5 <null> <null>
+26 6 <null> <null>
+26 7 <null> <null>
+26 8 <null> <null>
+27 1 <null> <null>
+27 2 <null> <null>
+28 1 <null> <null>
+28 2 <null> <null>
+28 3 <null> <null>
+28 4 <null> <null>
+28 5 <null> <null>
+28 6 <null> <null>
+28 7 <null> <null>
+28 8 <null> <null>
+28 9 <null> <null>
+28 10 <null> <null>
+29 1 <null> <null>
+29 2 <null> <null>
+29 3 <null> <null>
+29 4 <null> <null>
+29 5 <null> <null>
+29 6 <null> <null>
+29 7 <null> <null>
+29 8 <null> <null>
+29 9 <null> <null>
+30 1 <null> <null>
+30 2 <null> <null>
+30 3 <null> <null>
+30 4 <null> <null>
+30 5 <null> <null>
+30 6 <null> <null>
+30 7 <null> <null>
+30 8 <null> <null>
+30 9 <null> <null>
+30 10 <null> <null>
+30 11 <null> <null>
+31 1 <null> <null>
+31 2 <null> <null>
+31 3 <null> <null>
+31 4 <null> <null>
+Row Count : 254
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
adrelid 4 PartsSupplier java.lang.Integer adrelid integer pg_catalog pg_attrdef 11 10 0 false false false false 2 true true false false
-adnum 4 PartsSupplier java.lang.Integer adnum integer pg_catalog pg_attrdef 11 10 0 false false false false 2 true true false false
+adnum 5 PartsSupplier java.lang.Short adnum short pg_catalog pg_attrdef 6 5 0 false false false false 2 true true false false
adbin 12 PartsSupplier java.lang.String adbin string pg_catalog pg_attrdef 4000 4000 0 false false false false 2 true true false false
adsrc 12 PartsSupplier java.lang.String adsrc string pg_catalog pg_attrdef 4000 4000 0 false false false false 2 true true false false
Modified: trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -179,7 +179,7 @@
177 21 oid 23 4 1 4 false false false
178 21 amname 1043 -1 2 4 false false false
179 22 adrelid 23 4 1 4 false false false
-180 22 adnum 23 4 2 4 false false false
+180 22 adnum 21 2 2 4 false false false
181 22 adbin 1043 -1 3 4 false false false
182 22 adsrc 1043 -1 4 4 false false false
183 23 oid 23 4 1 4 false false false
@@ -244,15 +244,17 @@
242 30 typnamespace 23 4 3 4 false false false
243 30 typlen 21 2 4 4 false false false
244 30 typtype 1042 1 5 4 false false false
-245 30 typbasetype 23 4 6 4 false false false
-246 30 typtypmod 23 4 7 4 false false false
-247 30 typrelid 23 4 8 4 false false false
-248 30 typelem 23 4 9 4 false false false
-249 31 oid 23 4 1 4 false false false
-250 31 usename 1043 -1 2 4 false false false
-251 31 usecreatedb 16 1 3 4 false false false
-252 31 usesuper 16 1 4 4 false false false
-Row Count : 252
+245 30 typnotnull 16 1 6 4 false false false
+246 30 typbasetype 23 4 7 4 false false false
+247 30 typtypmod 23 4 8 4 false false false
+248 30 typdelim 1042 1 9 4 false false false
+249 30 typrelid 23 4 10 4 false false false
+250 30 typelem 23 4 11 4 false false false
+251 31 oid 23 4 1 4 false false false
+252 31 usename 1043 -1 2 4 false false false
+253 31 usecreatedb 16 1 3 4 false false false
+254 31 usesuper 16 1 4 4 false false false
+Row Count : 254
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
oid 4 PartsSupplier java.lang.Integer oid integer pg_catalog pg_attribute 11 10 0 false false false false 2 true true false false
attrelid 4 PartsSupplier java.lang.Integer attrelid integer pg_catalog pg_attribute 11 10 0 false false false false 2 true true false false
Modified: trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -1,41 +1,41 @@
-integer string integer short char integer integer integer integer
-oid typname typnamespace typlen typtype typbasetype typtypmod typrelid typelem
-16 boolean 3 1 b 0 -1 0 0
-1043 string 3 -1 b 0 -1 0 0
-25 text 3 -1 b 0 -1 0 0
-1042 char 3 1 b 0 -1 0 0
-21 short 3 2 b 0 -1 0 0
-20 long 3 8 b 0 -1 0 0
-23 integer 3 4 b 0 -1 0 0
-26 oid 3 4 b 0 -1 0 0
-700 float 3 4 b 0 -1 0 0
-701 double 3 8 b 0 -1 0 0
-705 unknown 3 -2 b 0 -1 0 0
-1082 date 3 4 b 0 -1 0 0
-1083 datetime 3 8 b 0 -1 0 0
-1114 timestamp 3 8 b 0 -1 0 0
-1700 decimal 3 -1 b 0 -1 0 0
-142 xml 3 -1 b 0 -1 0 0
-14939 lo 3 -1 b 0 -1 0 0
-2278 void 3 4 p 0 -1 0 0
-2249 record 3 -1 p 0 -1 0 0
-30 oidvector 3 -1 b 0 -1 0 26
-1000 _bool 3 -1 b 0 -1 0 16
-1002 _char 3 -1 b 0 -1 0 18
-1005 _int2 3 -1 b 0 -1 0 21
-1007 _int4 3 -1 b 0 -1 0 23
-1009 _text 3 -1 b 0 -1 0 25
-1028 _oid 3 -1 b 0 -1 0 26
-1014 _bpchar 3 -1 b 0 -1 0 1042
-1015 _varchar 3 -1 b 0 -1 0 1043
-1016 _int8 3 -1 b 0 -1 0 20
-1021 _float4 3 -1 b 0 -1 0 700
-1022 _float8 3 -1 b 0 -1 0 701
-1115 _timestamp 3 -1 b 0 -1 0 1114
-1182 _date 3 -1 b 0 -1 0 1082
-1183 _time 3 -1 b 0 -1 0 1083
-2287 _record 3 -1 b 0 -1 0 2249
-2283 anyelement 3 4 p 0 -1 0 0
+integer string integer short char boolean integer integer char integer integer
+oid typname typnamespace typlen typtype typnotnull typbasetype typtypmod typdelim typrelid typelem
+16 boolean 3 1 b false 0 -1 , 0 0
+1043 string 3 -1 b false 0 -1 , 0 0
+25 text 3 -1 b false 0 -1 , 0 0
+1042 char 3 1 b false 0 -1 , 0 0
+21 short 3 2 b false 0 -1 , 0 0
+20 long 3 8 b false 0 -1 , 0 0
+23 integer 3 4 b false 0 -1 , 0 0
+26 oid 3 4 b false 0 -1 , 0 0
+700 float 3 4 b false 0 -1 , 0 0
+701 double 3 8 b false 0 -1 , 0 0
+705 unknown 3 -2 b false 0 -1 , 0 0
+1082 date 3 4 b false 0 -1 , 0 0
+1083 datetime 3 8 b false 0 -1 , 0 0
+1114 timestamp 3 8 b false 0 -1 , 0 0
+1700 decimal 3 -1 b false 0 -1 , 0 0
+142 xml 3 -1 b false 0 -1 , 0 0
+14939 lo 3 -1 b false 0 -1 , 0 0
+2278 void 3 4 p false 0 -1 , 0 0
+2249 record 3 -1 p false 0 -1 , 0 0
+30 oidvector 3 -1 b false 0 -1 , 0 26
+1000 _bool 3 -1 b false 0 -1 , 0 16
+1002 _char 3 -1 b false 0 -1 , 0 18
+1005 _int2 3 -1 b false 0 -1 , 0 21
+1007 _int4 3 -1 b false 0 -1 , 0 23
+1009 _text 3 -1 b false 0 -1 , 0 25
+1028 _oid 3 -1 b false 0 -1 , 0 26
+1014 _bpchar 3 -1 b false 0 -1 , 0 1042
+1015 _varchar 3 -1 b false 0 -1 , 0 1043
+1016 _int8 3 -1 b false 0 -1 , 0 20
+1021 _float4 3 -1 b false 0 -1 , 0 700
+1022 _float8 3 -1 b false 0 -1 , 0 701
+1115 _timestamp 3 -1 b false 0 -1 , 0 1114
+1182 _date 3 -1 b false 0 -1 , 0 1082
+1183 _time 3 -1 b false 0 -1 , 0 1083
+2287 _record 3 -1 b false 0 -1 , 0 2249
+2283 anyelement 3 4 p false 0 -1 , 0 0
Row Count : 36
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
oid 4 PartsSupplier java.lang.Integer oid integer pg_catalog pg_type 11 10 0 false false false false 2 true true false false
@@ -43,7 +43,9 @@
typnamespace 4 PartsSupplier java.lang.Integer typnamespace integer pg_catalog pg_type 11 10 0 false false false false 2 true true false false
typlen 5 PartsSupplier java.lang.Short typlen short pg_catalog pg_type 6 5 0 false false false false 2 true true false false
typtype 1 PartsSupplier java.lang.String typtype char pg_catalog pg_type 1 1 0 false false false false 2 true true false false
+typnotnull -7 PartsSupplier java.lang.Boolean typnotnull boolean pg_catalog pg_type 5 1 0 false false false false 2 true true false false
typbasetype 4 PartsSupplier java.lang.Integer typbasetype integer pg_catalog pg_type 11 10 0 false false false false 2 true true false false
typtypmod 4 PartsSupplier java.lang.Integer typtypmod integer pg_catalog pg_type 11 10 0 false false false false 2 true true false false
+typdelim 1 PartsSupplier java.lang.String typdelim char pg_catalog pg_type 1 1 0 false false false false 2 true true false false
typrelid 4 PartsSupplier java.lang.Integer typrelid integer pg_catalog pg_type 11 10 0 false false false false 2 true true false false
typelem 4 PartsSupplier java.lang.Integer typelem integer pg_catalog pg_type 11 10 0 false false false false 2 true true false false
Modified: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -3,4 +3,4 @@
PART_ID
Row Count : 1
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
-x 12 java.lang.String x varchar 2147483647 0 0 false true false false 1 false true false true
+x 12 java.lang.String x varchar 4000 4000 0 false true false false 1 false true false true
Modified: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -3,8 +3,8 @@
oid 1 pg_attribute pg_catalog pg_attribute
Row Count : 1
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
-attname 12 java.lang.String attname varchar 2147483647 0 0 false true false false 0 false true false true
+attname 12 java.lang.String attname varchar 255 255 0 false true false false 0 false true false true
attnum 5 java.lang.Integer attnum int2 6 5 0 false false false false 2 false true true true
-relname 12 java.lang.String relname varchar 2147483647 0 0 false true false false 0 false true false true
-nspname 12 java.lang.String nspname varchar 2147483647 0 0 false true false false 1 false true false true
-relname 12 java.lang.String relname varchar 2147483647 0 0 false true false false 0 false true false true
+relname 12 java.lang.String relname varchar 2048 2048 0 false true false false 0 false true false true
+nspname 12 java.lang.String nspname varchar 255 255 0 false true false false 1 false true false true
+relname 12 java.lang.String relname varchar 2048 2048 0 false true false false 0 false true false true
Modified: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -3,8 +3,8 @@
oid 1 pg_attribute pg_catalog pg_attribute
Row Count : 1
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
-attname 12 java.lang.String attname varchar 2147483647 0 0 false true false false 0 false true false true
+attname 12 java.lang.String attname varchar 255 255 0 false true false false 0 false true false true
attnum 5 java.lang.Integer attnum int2 6 5 0 false false false false 2 false true true true
-relname 12 java.lang.String relname varchar 2147483647 0 0 false true false false 0 false true false true
-nspname 12 java.lang.String nspname varchar 2147483647 0 0 false true false false 1 false true false true
-relname 12 java.lang.String relname varchar 2147483647 0 0 false true false false 0 false true false true
+relname 12 java.lang.String relname varchar 2048 2048 0 false true false false 0 false true false true
+nspname 12 java.lang.String nspname varchar 255 255 0 false true false false 1 false true false true
+relname 12 java.lang.String relname varchar 2048 2048 0 false true false false 0 false true false true
Modified: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -1,48 +1,48 @@
-varchar varchar varchar varchar varchar bool bool varchar int4 varchar bool bool int4
-vdbname schemaname name type nameinsource isphysical supportsupdates uid cardinality description issystem ismaterialized oid
-parts SYS Columns Table <null> true false mmuuid:1c9a5cb2-17b1-4e4a-8b0e-3a42bd052509 -1 <null> true false 8
-parts SYS DataTypes Table <null> true false mmuuid:9a8794f9-66f8-49e8-8576-89d212d0f957 -1 <null> true false 9
-parts SYS KeyColumns Table <null> true false mmuuid:14946083-3bd5-42d5-8283-1c0694347c29 -1 <null> true false 10
-parts SYS Keys Table <null> true false mmuuid:1e5135dc-ce5d-4b25-a8ff-63f5440b3108 -1 <null> true false 11
-parts SYSADMIN MatViews Table <null> true false mmuuid:520ba1e8-3553-460f-8d18-9b43f089e256 -1 <null> true false 6
-parts PartsSupplier PARTSSUPPLIER.PARTS Table PARTS true true mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590 16 <null> false false 1
-parts PartsSupplier PARTSSUPPLIER.SHIP_VIA Table SHIP_VIA true true mmuuid:0f4e9b80-73ff-1edc-a81c-ecf397b10590 4 <null> false false 2
-parts PartsSupplier PARTSSUPPLIER.STATUS Table STATUS true true mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590 3 <null> false false 3
-parts PartsSupplier PARTSSUPPLIER.SUPPLIER Table SUPPLIER true true mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590 16 <null> false false 4
-parts PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS Table SUPPLIER_PARTS true true mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590 227 <null> false false 5
-parts SYS ProcedureParams Table <null> true false mmuuid:a56bd7fe-c87a-411c-8f5d-661975a25626 -1 <null> true false 12
-parts SYS Procedures Table <null> true false mmuuid:0bc132a5-9f8d-4a3c-9f5d-98156a98a962 -1 <null> true false 13
-parts SYS Properties Table <null> true false mmuuid:7a45e50a-d03f-4548-ba35-761651bbca85 -1 <null> true false 14
-parts SYS ReferenceKeyColumns Table <null> true false mmuuid:6a9653e8-a337-41b2-86fa-77b98f409a29 -1 <null> true false 15
-parts SYS Schemas Table <null> true false mmuuid:8648a554-b2ad-4e8e-84ca-2ec618b311a9 -1 <null> true false 16
-parts SYS Tables Table <null> true false mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7 -1 <null> true false 17
-parts SYSADMIN VDBResources Table <null> true false mmuuid:1785804d-beaf-4831-9531-e59164fedd49 -1 <null> true false 7
-parts SYS VirtualDatabases Table <null> true false mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489 -1 <null> true false 18
-parts pg_catalog matpg_datatype Table <null> false false mmuid:17448311-6679-4dfd-aeb6-4aabbd894729 -1 <null> true true 19
-parts pg_catalog matpg_relatt Table <null> false false mmuid:8c0714d6-1c72-40b4-8528-3b2c63059107 -1 <null> true true 20
-parts pg_catalog pg_am Table <null> false false mmuid:f6517a63-8c14-4b73-a18d-afaa5dfb35d9 -1 <null> true false 21
-parts pg_catalog pg_attrdef Table <null> false false mmuid:76a7dd05-9a7d-4243-b561-f3056500dcaf -1 <null> true false 22
-parts pg_catalog pg_attribute Table <null> false false mmuid:fa463d98-365f-489a-a707-025193cb51eb -1 <null> true true 23
-parts pg_catalog pg_class Table <null> false false mmuid:7e21f2e6-06e3-4bca-9b01-72ea47821560 -1 <null> true true 24
-parts pg_catalog pg_database Table <null> false false mmuid:382f9fc9-8c96-4df7-ab5d-04dfb47ee142 -1 <null> true false 25
-parts pg_catalog pg_index Table <null> false false mmuid:09daed8d-b0b8-4552-a261-2b6c775b46b0 -1 <null> true true 26
-parts pg_catalog pg_namespace Table <null> false false mmuid:6609866a-3d7b-4f4b-95fe-ebfac769d699 -1 <null> true false 27
-parts pg_catalog pg_proc Table <null> false false mmuid:f20c9489-10ca-4596-8a37-24218b67f764 -1 <null> true true 28
-parts pg_catalog pg_trigger Table <null> false false mmuid:2b75f0b1-7475-4ed5-9da3-d37a8a25f26a -1 <null> true false 29
-parts pg_catalog pg_type Table <null> false false mmuid:9462e3f8-cd3c-414f-a570-f6f33c40e36a -1 <null> true false 30
-parts pg_catalog pg_user Table <null> false false mmuid:e63613cb-01ee-4b37-8b91-99d1aac4dfcb -1 <null> true false 31
+varchar varchar varchar varchar varchar bool bool varchar int4 varchar bool bool int4
+vdbname schemaname name type nameinsource isphysical supportsupdates uid cardinality description issystem ismaterialized oid
+parts SYS Columns Table <null> true false mmuuid:1c9a5cb2-17b1-4e4a-8b0e-3a42bd052509 -1 <null> true false 8
+parts SYS DataTypes Table <null> true false mmuuid:9a8794f9-66f8-49e8-8576-89d212d0f957 -1 <null> true false 9
+parts SYS KeyColumns Table <null> true false mmuuid:14946083-3bd5-42d5-8283-1c0694347c29 -1 <null> true false 10
+parts SYS Keys Table <null> true false mmuuid:1e5135dc-ce5d-4b25-a8ff-63f5440b3108 -1 <null> true false 11
+parts SYSADMIN MatViews Table <null> true false mmuuid:520ba1e8-3553-460f-8d18-9b43f089e256 -1 <null> true false 6
+parts PartsSupplier PARTSSUPPLIER.PARTS Table PARTS true true mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590 16 <null> false false 1
+parts PartsSupplier PARTSSUPPLIER.SHIP_VIA Table SHIP_VIA true true mmuuid:0f4e9b80-73ff-1edc-a81c-ecf397b10590 4 <null> false false 2
+parts PartsSupplier PARTSSUPPLIER.STATUS Table STATUS true true mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590 3 <null> false false 3
+parts PartsSupplier PARTSSUPPLIER.SUPPLIER Table SUPPLIER true true mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590 16 <null> false false 4
+parts PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS Table SUPPLIER_PARTS true true mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590 227 <null> false false 5
+parts SYS ProcedureParams Table <null> true false mmuuid:a56bd7fe-c87a-411c-8f5d-661975a25626 -1 <null> true false 12
+parts SYS Procedures Table <null> true false mmuuid:0bc132a5-9f8d-4a3c-9f5d-98156a98a962 -1 <null> true false 13
+parts SYS Properties Table <null> true false mmuuid:7a45e50a-d03f-4548-ba35-761651bbca85 -1 <null> true false 14
+parts SYS ReferenceKeyColumns Table <null> true false mmuuid:6a9653e8-a337-41b2-86fa-77b98f409a29 -1 <null> true false 15
+parts SYS Schemas Table <null> true false mmuuid:8648a554-b2ad-4e8e-84ca-2ec618b311a9 -1 <null> true false 16
+parts SYS Tables Table <null> true false mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7 -1 <null> true false 17
+parts SYSADMIN VDBResources Table <null> true false mmuuid:1785804d-beaf-4831-9531-e59164fedd49 -1 <null> true false 7
+parts SYS VirtualDatabases Table <null> true false mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489 -1 <null> true false 18
+parts pg_catalog matpg_datatype Table <null> false false mmuid:0f312b3c-98ca-4a09-81fa-f1ff83f0a6c1 -1 <null> true true 19
+parts pg_catalog matpg_relatt Table <null> false false mmuid:0b0894ba-e1ea-4eaf-bcd2-ea9ebd05e47d -1 <null> true true 20
+parts pg_catalog pg_am Table <null> false false mmuid:da4b747e-7d87-403a-8309-2cdf1399031b -1 <null> true false 21
+parts pg_catalog pg_attrdef Table <null> false false mmuid:e9b278d4-49af-442f-9a5a-b699fe3b102b -1 <null> true false 22
+parts pg_catalog pg_attribute Table <null> false false mmuid:fa463d98-365f-489a-a707-025193cb51eb -1 <null> true true 23
+parts pg_catalog pg_class Table <null> false false mmuid:7e21f2e6-06e3-4bca-9b01-72ea47821560 -1 <null> true true 24
+parts pg_catalog pg_database Table <null> false false mmuid:1aedd02c-5801-41e7-accd-da1f257c26e8 -1 <null> true false 25
+parts pg_catalog pg_index Table <null> false false mmuid:8709e084-48df-417d-b3f8-f4e9b7d8802b -1 <null> true true 26
+parts pg_catalog pg_namespace Table <null> false false mmuid:6609866a-3d7b-4f4b-95fe-ebfac769d699 -1 <null> true false 27
+parts pg_catalog pg_proc Table <null> false false mmuid:b288b3aa-37f2-4a8e-8b1b-e932a2ce3e25 -1 <null> true true 28
+parts pg_catalog pg_trigger Table <null> false false mmuid:64977f3e-f2a0-466e-a5d1-80bb058cbe08 -1 <null> true false 29
+parts pg_catalog pg_type Table <null> false false mmuid:9462e3f8-cd3c-414f-a570-f6f33c40e36a -1 <null> true false 30
+parts pg_catalog pg_user Table <null> false false mmuid:236445e1-408c-40a1-a61c-40e96fb5dc9f -1 <null> true false 31
Row Count : 31
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
-vdbname 12 java.lang.String vdbname varchar 2147483647 0 0 false true false false 1 false true false true
-schemaname 12 java.lang.String schemaname varchar 2147483647 0 0 false true false false 1 false true false true
-name 12 java.lang.String name varchar 2147483647 0 0 false true false false 0 false true false true
-type 12 java.lang.String type varchar 2147483647 0 0 false true false false 0 false true false true
-nameinsource 12 java.lang.String nameinsource varchar 2147483647 0 0 false true false false 1 false true false true
+vdbname 12 java.lang.String vdbname varchar 255 255 0 false true false false 1 false true false true
+schemaname 12 java.lang.String schemaname varchar 255 255 0 false true false false 1 false true false true
+name 12 java.lang.String name varchar 255 255 0 false true false false 0 false true false true
+type 12 java.lang.String type varchar 20 20 0 false true false false 0 false true false true
+nameinsource 12 java.lang.String nameinsource varchar 255 255 0 false true false false 1 false true false true
isphysical -7 java.lang.Boolean isphysical bool 1 1 0 false false false false 0 false true false true
supportsupdates -7 java.lang.Boolean supportsupdates bool 1 1 0 false false false false 0 false true false true
-uid 12 java.lang.String uid varchar 2147483647 0 0 false true false false 0 false true false true
+uid 12 java.lang.String uid varchar 50 50 0 false true false false 0 false true false true
cardinality 4 java.lang.Integer cardinality int4 11 10 0 false false false false 0 false true true true
-description 12 java.lang.String description varchar 2147483647 0 0 false true false false 1 false true false true
+description 12 java.lang.String description varchar 255 255 0 false true false false 1 false true false true
issystem -7 java.lang.Boolean issystem bool 1 1 0 false false false false 1 false true false true
ismaterialized -7 java.lang.Boolean ismaterialized bool 1 1 0 false false false false 0 false true false true
oid 4 java.lang.Integer oid int4 11 10 0 false false false false 0 false true true true
Modified: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -179,7 +179,7 @@
PartsSupplier pg_catalog pg_am oid 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 1 <null> <null> <null> !
<null> NO
PartsSupplier pg_catalog pg_am amname 12 string 4000 <null> 0 0 2 <null> <null> <null> <null> 0 2 <null> <null> <null> !
<null> NO
PartsSupplier pg_catalog pg_attrdef adrelid 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 1 <null> <null> <null> !
<null> NO
-PartsSupplier pg_catalog pg_attrdef adnum 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 2 <null> <null> <null> !
<null> NO
+PartsSupplier pg_catalog pg_attrdef adnum 5 short 5 <null> 0 0 2 <null> <null> <null> <null> 0 2 <null> <null> <null> !
<null> NO
PartsSupplier pg_catalog pg_attrdef adbin 12 string 4000 <null> 0 0 2 <null> <null> <null> <null> 0 3 <null> <null> <null> !
<null> NO
PartsSupplier pg_catalog pg_attrdef adsrc 12 string 4000 <null> 0 0 2 <null> <null> <null> <null> 0 4 <null> <null> <null> !
<null> NO
PartsSupplier pg_catalog pg_attribute oid 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 1 <null> <null> <null> !
<null> NO
@@ -244,15 +244,17 @@
PartsSupplier pg_catalog pg_type typnamespace 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 3 <null> <null> <null> !
<null> NO
PartsSupplier pg_catalog pg_type typlen 5 short 5 <null> 0 0 2 <null> <null> <null> <null> 0 4 <null> <null> <null> !
<null> NO
PartsSupplier pg_catalog pg_type typtype 1 char 1 <null> 0 0 2 <null> <null> <null> <null> 0 5 <null> <null> <null> !
<null> NO
-PartsSupplier pg_catalog pg_type typbasetype 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 6 <null> <null> <null> !
<null> NO
-PartsSupplier pg_catalog pg_type typtypmod 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 7 <null> <null> <null> !
<null> NO
-PartsSupplier pg_catalog pg_type typrelid 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 8 <null> <null> <null> !
<null> NO
-PartsSupplier pg_catalog pg_type typelem 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 9 <null> <null> <null> !
<null> NO
+PartsSupplier pg_catalog pg_type typnotnull -7 boolean 1 <null> 0 0 2 <null> <null> <null> <null> 0 6 <null> <null> <null> !
<null> NO
+PartsSupplier pg_catalog pg_type typbasetype 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 7 <null> <null> <null> !
<null> NO
+PartsSupplier pg_catalog pg_type typtypmod 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 8 <null> <null> <null> !
<null> NO
+PartsSupplier pg_catalog pg_type typdelim 1 char 1 <null> 0 0 2 <null> <null> <null> <null> 0 9 <null> <null> <null> !
<null> NO
+PartsSupplier pg_catalog pg_type typrelid 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 10 <null> <null> <null> !
<null> NO
+PartsSupplier pg_catalog pg_type typelem 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 11 <null> <null> <null> !
<null> NO
PartsSupplier pg_catalog pg_user oid 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 1 <null> <null> <null> !
<null> NO
PartsSupplier pg_catalog pg_user usename 12 string 4000 <null> 0 0 2 <null> <null> <null> <null> 0 2 <null> <null> <null> !
<null> NO
PartsSupplier pg_catalog pg_user usecreatedb -7 boolean 1 <null> 0 0 2 <null> <null> <null> <null> 0 3 <null> <null> <null> !
<null> NO
PartsSupplier pg_catalog pg_user usesuper -7 boolean 1 <null> 0 0 2 <null> <null> <null> <null> 0 4 <null> <null> <null> !
<null> NO
-Row Count : 252
+Row Count : 254
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
VDBName 12 PartsSupplier java.lang.String TABLE_CAT string SYS Columns 255 255 0 false false false false 0 true true false false
SchemaName 12 PartsSupplier java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false true 1 false true true true
Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -162,97 +162,99 @@
PartsSupplier SYSADMIN MatViews Valid 6 <null> boolean 0 0 false true false true true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 10 mmuuid:13098912-bce2-!
4842-9ea9-b162fcd7383e <null> 23
PartsSupplier SYS Properties Value 2 <null> string 0 255 true true false true true false false No Nulls <null> <null> -1 -1 Searchable <null> <null> java.lang.String 255 255 10 mmuuid:c917257d-06b7-!
41dd-a6cb-44c0ff0f897e <null> 125
PartsSupplier SYS VirtualDatabases Version 2 <null> string 0 50 true true false true false false false No Nulls <null> <null> -1 -1 Searchable <null> <null> java.lang.String 50 50 10 mmuuid:c876d749-a512-!
4810-9910-3034ca524c45 <null> 164
-PartsSupplier pg_catalog pg_attrdef adbin 3 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:e22c521a-e208-4!
181-9dbd-89f5de7014b9 <null> 181
-PartsSupplier pg_catalog pg_attrdef adnum 2 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:e9b278d4-49af-4!
42f-9a5a-b699fe3b102b <null> 180
-PartsSupplier pg_catalog pg_attrdef adrelid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:4589389f-4abd-4!
2a6-818f-ff1f2a085dfb <null> 179
-PartsSupplier pg_catalog pg_attrdef adsrc 4 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:492dd834-907f-4!
29b-aa6e-958ad65204c6 <null> 182
-PartsSupplier pg_catalog pg_am amname 2 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:da4b747e-7d87-4!
03a-8309-2cdf1399031b <null> 178
+PartsSupplier pg_catalog pg_attrdef adbin 3 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:382f9fc9-8c96-4!
df7-ab5d-04dfb47ee142 <null> 181
+PartsSupplier pg_catalog pg_attrdef adnum 2 <null> short 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 0 0 0 mmuid:492dd834-907f-4!
29b-aa6e-958ad65204c6 <null> 180
+PartsSupplier pg_catalog pg_attrdef adrelid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:e22c521a-e208-4!
181-9dbd-89f5de7014b9 <null> 179
+PartsSupplier pg_catalog pg_attrdef adsrc 4 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:689cde3b-a631-4!
f25-94b4-ff2ffe022b0f <null> 182
+PartsSupplier pg_catalog pg_am amname 2 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:bdf3ee1e-b5b7-4!
8ab-b43c-4bbb2c8ae1e2 <null> 178
PartsSupplier pg_catalog pg_attribute atthasdef 10 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:5868e549-4bbe-4!
79e-bc7e-632c05cc2329 <null> 192
PartsSupplier pg_catalog pg_attribute attisdropped 9 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:7beb42a9-dfe6-4!
3de-98b6-7e8948b1a666 <null> 191
PartsSupplier pg_catalog pg_attribute attlen 5 <null> short 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 0 0 0 mmuid:d1214249-95cd-4!
26f-b8f6-4bf68c0504c7 <null> 187
-PartsSupplier pg_catalog matpg_relatt attname 3 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:5cfb2b62-a912-4!
bfb-bf4f-51e107fe210c <null> 172
+PartsSupplier pg_catalog matpg_relatt attname 3 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:f1998229-2c1a-4!
7b7-8f46-9dda81446db6 <null> 172
PartsSupplier pg_catalog pg_attribute attname 3 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:6064d149-4102-4!
c2d-9132-582342f25e90 <null> 185
PartsSupplier pg_catalog pg_attribute attnotnull 8 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:91ce8bde-8570-4!
867-be17-80acfa9275a6 <null> 190
-PartsSupplier pg_catalog matpg_relatt attnum 2 <null> short 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 0 0 0 mmuid:0b0894ba-e1ea-4!
eaf-bcd2-ea9ebd05e47d <null> 171
+PartsSupplier pg_catalog matpg_relatt attnum 2 <null> short 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 0 0 0 mmuid:ffbf69c1-2e34-4!
764-a9b3-9a1b61bfd4af <null> 171
PartsSupplier pg_catalog pg_attribute attnum 6 <null> short 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 0 0 0 mmuid:141fd911-f2dd-4!
edd-8f08-ad8a67ffd0fb <null> 188
-PartsSupplier pg_catalog matpg_relatt attrelid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:5c7bf056-ecc5-4!
1ea-a122-7a4b1de9908a <null> 170
+PartsSupplier pg_catalog matpg_relatt attrelid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:5cfb2b62-a912-4!
bfb-bf4f-51e107fe210c <null> 170
PartsSupplier pg_catalog pg_attribute attrelid 2 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:3be6b5de-2287-4!
279-93f3-4f5064799118 <null> 184
PartsSupplier pg_catalog pg_attribute atttypid 4 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:99782493-1cce-4!
e14-9c1b-4de7ce50e2c8 <null> 186
PartsSupplier pg_catalog pg_attribute atttypmod 7 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:2e2bae3c-ab93-4!
9f5-b96c-7a7b9d66782d <null> 189
-PartsSupplier pg_catalog matpg_relatt autoinc 6 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:23454408-0347-4!
0d2-a3f9-3faa664fb5e9 <null> 175
+PartsSupplier pg_catalog matpg_relatt autoinc 6 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:559efade-b320-4!
9bd-8524-1d325ae11c82 <null> 175
PartsSupplier SYSADMIN VDBResources contents 2 <null> blob 0 0 false true false true true false false Nullable <null> <null> -1 -1 Searchable <null> <null> org.teiid.core.types.BlobType 0 0 10 mmuuid:f9421669-3564-!
451d-9293-96c1e5e72c4f <null> 28
-PartsSupplier pg_catalog pg_database datacl 7 <null> object 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Object 0 0 0 mmuid:8b993c11-de2b-4!
8bc-beb1-3e44c46811b4 <null> 208
-PartsSupplier pg_catalog pg_database datallowconn 5 <null> char 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Character 0 0 0 mmuid:5c9d54b2-433f-4!
43a-85ce-821f42ed109e <null> 206
-PartsSupplier pg_catalog pg_database datconfig 6 <null> object 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Object 0 0 0 mmuid:4b5beb14-03a0-4!
652-9d6f-5f8cc74d470c <null> 207
-PartsSupplier pg_catalog pg_database datdba 8 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:36db343d-e99a-4!
27c-a4e2-763a720ce4a4 <null> 209
-PartsSupplier pg_catalog pg_database datlastsysoid 4 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:c2bdf40c-ec58-4!
39c-a403-7adf604ceadd <null> 205
-PartsSupplier pg_catalog pg_database datname 2 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:1aedd02c-5801-4!
1e7-accd-da1f257c26e8 <null> 203
-PartsSupplier pg_catalog pg_database dattablespace 9 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:28d034eb-6f39-4!
02f-b642-9c9560e57247 <null> 210
-PartsSupplier pg_catalog pg_database encoding 3 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:3b621b25-171c-4!
05b-8bf9-635cf93f2273 <null> 204
-PartsSupplier pg_catalog pg_index indexprs 7 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:1e6dbecd-9a2d-4!
aef-afbe-665de7acb9d6 <null> 217
-PartsSupplier pg_catalog pg_index indexrelid 2 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:8709e084-48df-4!
17d-b3f8-f4e9b7d8802b <null> 212
-PartsSupplier pg_catalog pg_index indisclustered 4 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:9f873e0f-903d-4!
c9d-8c37-1073b5ec4c67 <null> 214
-PartsSupplier pg_catalog pg_index indisprimary 6 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:9ea3b6d2-b27b-4!
bb1-a99d-b703c3308384 <null> 216
-PartsSupplier pg_catalog pg_index indisunique 5 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:a52c714d-dfe9-4!
06c-906b-fadd53ac4e98 <null> 215
-PartsSupplier pg_catalog pg_index indkey 8 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:347ec08c-6b41-4!
1d0-8475-031ce7d99ac0 <null> 218
-PartsSupplier pg_catalog pg_index indrelid 3 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:16998907-e1dd-4!
47e-898d-780994d30619 <null> 213
-PartsSupplier pg_catalog matpg_datatype name 3 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:b4e04928-9a59-4!
718-a7f1-3a60bcae7449 <null> 167
-PartsSupplier pg_catalog matpg_relatt nspname 5 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:f1998229-2c1a-4!
7b7-8f46-9dda81446db6 <null> 174
+PartsSupplier pg_catalog pg_database datacl 7 <null> object 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Object 0 0 0 mmuid:28d034eb-6f39-4!
02f-b642-9c9560e57247 <null> 208
+PartsSupplier pg_catalog pg_database datallowconn 5 <null> char 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Character 0 0 0 mmuid:8b993c11-de2b-4!
8bc-beb1-3e44c46811b4 <null> 206
+PartsSupplier pg_catalog pg_database datconfig 6 <null> object 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Object 0 0 0 mmuid:36db343d-e99a-4!
27c-a4e2-763a720ce4a4 <null> 207
+PartsSupplier pg_catalog pg_database datdba 8 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:e63613cb-01ee-4!
b37-8b91-99d1aac4dfcb <null> 209
+PartsSupplier pg_catalog pg_database datlastsysoid 4 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:4b5beb14-03a0-4!
652-9d6f-5f8cc74d470c <null> 205
+PartsSupplier pg_catalog pg_database datname 2 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:c2bdf40c-ec58-4!
39c-a403-7adf604ceadd <null> 203
+PartsSupplier pg_catalog pg_database dattablespace 9 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:bb78401d-d10c-4!
3b1-af84-e4fa6b95db42 <null> 210
+PartsSupplier pg_catalog pg_database encoding 3 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:5c9d54b2-433f-4!
43a-85ce-821f42ed109e <null> 204
+PartsSupplier pg_catalog pg_index indexprs 7 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:1462b28e-0bab-4!
36f-9654-013821506337 <null> 217
+PartsSupplier pg_catalog pg_index indexrelid 2 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:9f873e0f-903d-4!
c9d-8c37-1073b5ec4c67 <null> 212
+PartsSupplier pg_catalog pg_index indisclustered 4 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:9ea3b6d2-b27b-4!
bb1-a99d-b703c3308384 <null> 214
+PartsSupplier pg_catalog pg_index indisprimary 6 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:347ec08c-6b41-4!
1d0-8475-031ce7d99ac0 <null> 216
+PartsSupplier pg_catalog pg_index indisunique 5 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:1e6dbecd-9a2d-4!
aef-afbe-665de7acb9d6 <null> 215
+PartsSupplier pg_catalog pg_index indkey 8 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:f6517a63-8c14-4!
b73-a18d-afaa5dfb35d9 <null> 218
+PartsSupplier pg_catalog pg_index indrelid 3 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:a52c714d-dfe9-4!
06c-906b-fadd53ac4e98 <null> 213
+PartsSupplier pg_catalog matpg_datatype name 3 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:0e9c4439-48d0-4!
115-a343-5baab7a236b6 <null> 167
+PartsSupplier pg_catalog matpg_relatt nspname 5 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:595a823f-cec1-4!
2dc-b8b2-c95c8b4e4e66 <null> 174
PartsSupplier pg_catalog pg_namespace nspname 2 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:0e513513-b35a-4!
8be-975d-5dbed6ace7e9 <null> 220
-PartsSupplier pg_catalog matpg_datatype oid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:053375a4-3971-4!
705-9146-9ecc640022c2 <null> 165
-PartsSupplier pg_catalog pg_am oid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:3c67619c-7d8f-4!
378-b7e9-84a0451ea5e5 <null> 177
+PartsSupplier pg_catalog matpg_datatype oid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:b4e04928-9a59-4!
718-a7f1-3a60bcae7449 <null> 165
+PartsSupplier pg_catalog pg_am oid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:f20c9489-10ca-4!
596-8a37-24218b67f764 <null> 177
PartsSupplier pg_catalog pg_attribute oid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:f735e545-a81c-4!
ee2-84d0-3ea35d4083a2 <null> 183
PartsSupplier pg_catalog pg_class oid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:c1e736ac-c9d4-4!
026-8904-23c90e6eb1c0 <null> 193
-PartsSupplier pg_catalog pg_database oid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:689cde3b-a631-4!
f25-94b4-ff2ffe022b0f <null> 202
-PartsSupplier pg_catalog pg_index oid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:83ae2247-7eec-4!
59f-b037-ffd3cdca0627 <null> 211
+PartsSupplier pg_catalog pg_database oid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:3b621b25-171c-4!
05b-8bf9-635cf93f2273 <null> 202
+PartsSupplier pg_catalog pg_index oid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:16998907-e1dd-4!
47e-898d-780994d30619 <null> 211
PartsSupplier pg_catalog pg_namespace oid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:688e5112-4083-4!
b67-b42c-62d9a614c59a <null> 219
-PartsSupplier pg_catalog pg_proc oid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:bdf3ee1e-b5b7-4!
8ab-b43c-4bbb2c8ae1e2 <null> 221
-PartsSupplier pg_catalog pg_trigger oid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:635b6634-632c-4!
3c9-8cc7-bcaa016133e8 <null> 231
+PartsSupplier pg_catalog pg_proc oid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:e0244e1d-431c-4!
1fa-8194-1e357e2b688b <null> 221
+PartsSupplier pg_catalog pg_trigger oid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:250d7c06-728a-4!
b2a-b557-91f2a69bb184 <null> 231
PartsSupplier pg_catalog pg_type oid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:b6f64d16-b147-4!
59d-8e84-1bd3048fb900 <null> 240
-PartsSupplier pg_catalog pg_user oid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:bb78401d-d10c-4!
3b1-af84-e4fa6b95db42 <null> 249
-PartsSupplier pg_catalog pg_proc proallargtypes 9 <null> object 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Object 0 0 0 mmuid:a385751f-a31a-4!
d5d-9197-3fbd390b0251 <null> 229
-PartsSupplier pg_catalog pg_proc proargmodes 8 <null> object 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Object 0 0 0 mmuid:bcbed548-176c-4!
116-a5d6-7638cb0206e1 <null> 228
-PartsSupplier pg_catalog pg_proc proargnames 7 <null> object 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Object 0 0 0 mmuid:d9f36bdc-7b25-4!
af0-b9f5-a96aac6d3094 <null> 227
-PartsSupplier pg_catalog pg_proc proargtypes 6 <null> object 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Object 0 0 0 mmuid:ffa4ac73-b549-4!
70e-931f-dc36330cb8c4 <null> 226
-PartsSupplier pg_catalog pg_proc proname 2 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:b288b3aa-37f2-4!
a8e-8b1b-e932a2ce3e25 <null> 222
-PartsSupplier pg_catalog pg_proc pronamespace 10 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:e5715456-245f-4!
846-b90b-01d06d1c3672 <null> 230
-PartsSupplier pg_catalog pg_proc pronargs 5 <null> short 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 0 0 0 mmuid:6796c2e7-48a4-4!
f9f-bc98-d47913e2491c <null> 225
-PartsSupplier pg_catalog pg_proc proretset 3 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:e0244e1d-431c-4!
1fa-8194-1e357e2b688b <null> 223
-PartsSupplier pg_catalog pg_proc prorettype 4 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:9fb5a34a-3a7e-4!
d38-b7cd-239f28a3504e <null> 224
+PartsSupplier pg_catalog pg_user oid 1 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:6da98878-b46e-4!
ed1-b032-1bc72da595f4 <null> 251
+PartsSupplier pg_catalog pg_proc proallargtypes 9 <null> object 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Object 0 0 0 mmuid:9569efdb-21b2-4!
b4f-a2db-e7406267b8ed <null> 229
+PartsSupplier pg_catalog pg_proc proargmodes 8 <null> object 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Object 0 0 0 mmuid:e5715456-245f-4!
846-b90b-01d06d1c3672 <null> 228
+PartsSupplier pg_catalog pg_proc proargnames 7 <null> object 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Object 0 0 0 mmuid:a385751f-a31a-4!
d5d-9197-3fbd390b0251 <null> 227
+PartsSupplier pg_catalog pg_proc proargtypes 6 <null> object 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Object 0 0 0 mmuid:bcbed548-176c-4!
116-a5d6-7638cb0206e1 <null> 226
+PartsSupplier pg_catalog pg_proc proname 2 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:9fb5a34a-3a7e-4!
d38-b7cd-239f28a3504e <null> 222
+PartsSupplier pg_catalog pg_proc pronamespace 10 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:2b75f0b1-7475-4!
ed5-9da3-d37a8a25f26a <null> 230
+PartsSupplier pg_catalog pg_proc pronargs 5 <null> short 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 0 0 0 mmuid:d9f36bdc-7b25-4!
af0-b9f5-a96aac6d3094 <null> 225
+PartsSupplier pg_catalog pg_proc proretset 3 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:6796c2e7-48a4-4!
f9f-bc98-d47913e2491c <null> 223
+PartsSupplier pg_catalog pg_proc prorettype 4 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:ffa4ac73-b549-4!
70e-931f-dc36330cb8c4 <null> 224
PartsSupplier pg_catalog pg_class relam 5 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:c2f92b1a-6ba0-4!
486-8936-f5185d926178 <null> 197
PartsSupplier pg_catalog pg_class relhasoids 9 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:3ac5a14a-1f9e-4!
55b-8ea1-cf0878774fd7 <null> 201
PartsSupplier pg_catalog pg_class relhasrules 8 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:6c26fd66-2a4a-4!
ccf-949a-a06a858db7f6 <null> 200
PartsSupplier pg_catalog pg_class relkind 4 <null> char 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Character 0 0 0 mmuid:ef4359eb-6d51-4!
249-bfea-40bc0f407d10 <null> 196
-PartsSupplier pg_catalog matpg_relatt relname 4 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:ffbf69c1-2e34-4!
764-a9b3-9a1b61bfd4af <null> 173
+PartsSupplier pg_catalog matpg_relatt relname 4 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:23454408-0347-4!
0d2-a3f9-3faa664fb5e9 <null> 173
PartsSupplier pg_catalog pg_class relname 2 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:5f9b50fa-8188-4!
048-93c2-3ad1587915df <null> 194
PartsSupplier pg_catalog pg_class relnamespace 3 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:4591ef08-bff8-4!
f3b-9de7-420f9c7f9d2b <null> 195
PartsSupplier pg_catalog pg_class relpages 7 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:44dee7d6-b6ae-4!
4c7-85f2-e87364d8d059 <null> 199
PartsSupplier pg_catalog pg_class reltuples 6 <null> float 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Float 0 0 0 mmuid:b9ed4b49-5a7b-4!
ba4-863a-37fd95b2a34c <null> 198
PartsSupplier SYSADMIN VDBResources resourcePath 1 <null> string 0 255 false true false true true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 255 10 mmuuid:b1bc5150-3dcc-!
452e-9e75-4a506997f612 <null> 27
-PartsSupplier pg_catalog pg_trigger tgargs 4 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:0c20dbe7-5d89-4!
11f-a8ab-3d77b999595b <null> 234
-PartsSupplier pg_catalog pg_trigger tgconstrname 8 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:c010d12f-2074-4!
5db-8e18-979cee2c45da <null> 238
-PartsSupplier pg_catalog pg_trigger tgconstrrelid 2 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:64977f3e-f2a0-4!
66e-a5d1-80bb058cbe08 <null> 232
-PartsSupplier pg_catalog pg_trigger tgdeferrable 6 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:bfbff036-caf2-4!
652-80cf-398af17ed7d1 <null> 236
-PartsSupplier pg_catalog pg_trigger tgfoid 3 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:250d7c06-728a-4!
b2a-b557-91f2a69bb184 <null> 233
-PartsSupplier pg_catalog pg_trigger tginitdeferred 7 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:da4b59ca-ebff-4!
5a8-ad68-9777bc587813 <null> 237
-PartsSupplier pg_catalog pg_trigger tgnargs 5 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:d70f020b-658c-4!
f58-86dc-0fbb12e2d8af <null> 235
-PartsSupplier pg_catalog pg_trigger tgrelid 9 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:71091853-c65e-4!
6a9-9947-aa024f806e2d <null> 239
-PartsSupplier pg_catalog pg_type typbasetype 6 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:a17d2f61-cd68-4!
c0d-8d25-132f68eb3b67 <null> 245
-PartsSupplier pg_catalog pg_type typelem 9 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:22ac431d-e6e6-4!
eef-9d74-b31795424e97 <null> 248
-PartsSupplier pg_catalog matpg_datatype typlen 5 <null> short 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 0 0 0 mmuid:0e9c4439-48d0-4!
115-a343-5baab7a236b6 <null> 169
+PartsSupplier pg_catalog pg_trigger tgargs 4 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:bfbff036-caf2-4!
652-80cf-398af17ed7d1 <null> 234
+PartsSupplier pg_catalog pg_trigger tgconstrname 8 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:76a7dd05-9a7d-4!
243-b561-f3056500dcaf <null> 238
+PartsSupplier pg_catalog pg_trigger tgconstrrelid 2 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:0c20dbe7-5d89-4!
11f-a8ab-3d77b999595b <null> 232
+PartsSupplier pg_catalog pg_trigger tgdeferrable 6 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:c010d12f-2074-4!
5db-8e18-979cee2c45da <null> 236
+PartsSupplier pg_catalog pg_trigger tgfoid 3 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:d70f020b-658c-4!
f58-86dc-0fbb12e2d8af <null> 233
+PartsSupplier pg_catalog pg_trigger tginitdeferred 7 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:71091853-c65e-4!
6a9-9947-aa024f806e2d <null> 237
+PartsSupplier pg_catalog pg_trigger tgnargs 5 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:da4b59ca-ebff-4!
5a8-ad68-9777bc587813 <null> 235
+PartsSupplier pg_catalog pg_trigger tgrelid 9 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:4589389f-4abd-4!
2a6-818f-ff1f2a085dfb <null> 239
+PartsSupplier pg_catalog pg_type typbasetype 7 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:cee3559d-1ce6-4!
b17-ad57-2ecb79a9e1d2 <null> 246
+PartsSupplier pg_catalog pg_type typdelim 9 <null> char 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Character 0 0 0 mmuid:22ac431d-e6e6-4!
eef-9d74-b31795424e97 <null> 248
+PartsSupplier pg_catalog pg_type typelem 11 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:83ae2247-7eec-4!
59f-b037-ffd3cdca0627 <null> 250
+PartsSupplier pg_catalog matpg_datatype typlen 5 <null> short 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 0 0 0 mmuid:443a2ab3-8257-4!
c4c-838e-9a47deaf4cf9 <null> 169
PartsSupplier pg_catalog pg_type typlen 4 <null> short 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 0 0 0 mmuid:931c09e1-937a-4!
37e-aab2-2360f8d90e2b <null> 243
-PartsSupplier pg_catalog matpg_datatype typname 2 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:0f312b3c-98ca-4!
a09-81fa-f1ff83f0a6c1 <null> 166
+PartsSupplier pg_catalog matpg_datatype typname 2 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:87826ebc-98a5-4!
f19-a6d8-6b7b96cbed48 <null> 166
PartsSupplier pg_catalog pg_type typname 2 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:d600d818-2aad-4!
c92-9343-267d044dd97d <null> 241
PartsSupplier pg_catalog pg_type typnamespace 3 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:e47217d2-2b07-4!
353-bfbd-d7c883a5e7e0 <null> 242
-PartsSupplier pg_catalog matpg_relatt typoid 7 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:595a823f-cec1-4!
2dc-b8b2-c95c8b4e4e66 <null> 176
-PartsSupplier pg_catalog pg_type typrelid 8 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:bec25882-b292-4!
ed1-a610-cad5d504837d <null> 247
+PartsSupplier pg_catalog pg_type typnotnull 6 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:a17d2f61-cd68-4!
c0d-8d25-132f68eb3b67 <null> 245
+PartsSupplier pg_catalog matpg_relatt typoid 7 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:349f0c8c-7c64-4!
e0a-a84a-aee3deaf83af <null> 176
+PartsSupplier pg_catalog pg_type typrelid 10 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:09daed8d-b0b8-4!
552-a261-2b6c775b46b0 <null> 249
PartsSupplier pg_catalog pg_type typtype 5 <null> char 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Character 0 0 0 mmuid:83199eba-7af4-4!
4a9-822f-006677b1b895 <null> 244
-PartsSupplier pg_catalog pg_type typtypmod 7 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:cee3559d-1ce6-4!
b17-ad57-2ecb79a9e1d2 <null> 246
-PartsSupplier pg_catalog matpg_datatype uid 4 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:87826ebc-98a5-4!
f19-a6d8-6b7b96cbed48 <null> 168
-PartsSupplier pg_catalog pg_user usecreatedb 3 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:6da98878-b46e-4!
ed1-b032-1bc72da595f4 <null> 251
-PartsSupplier pg_catalog pg_user usename 2 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:236445e1-408c-4!
0a1-a61c-40e96fb5dc9f <null> 250
-PartsSupplier pg_catalog pg_user usesuper 4 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:9bfddc66-af75-4!
366-8eac-b9fef3421219 <null> 252
-Row Count : 252
+PartsSupplier pg_catalog pg_type typtypmod 8 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:bec25882-b292-4!
ed1-a610-cad5d504837d <null> 247
+PartsSupplier pg_catalog matpg_datatype uid 4 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:eda814fb-0a5a-4!
fbf-87bc-b57952292038 <null> 168
+PartsSupplier pg_catalog pg_user usecreatedb 3 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:8c0714d6-1c72-4!
0b4-8528-3b2c63059107 <null> 253
+PartsSupplier pg_catalog pg_user usename 2 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:9bfddc66-af75-4!
366-8eac-b9fef3421219 <null> 252
+PartsSupplier pg_catalog pg_user usesuper 4 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:5c7bf056-ecc5-4!
1ea-a122-7a4b1de9908a <null> 254
+Row Count : 254
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
VDBName 12 PartsSupplier java.lang.String VDBName string SYS Columns 255 255 0 false false false false 0 true true false false
SchemaName 12 PartsSupplier java.lang.String SchemaName string SYS Columns 255 255 0 false true false true 1 false true true true
Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -9,19 +9,19 @@
PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_ID PK_SUPPLIER Primary <null> mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590 1 4
PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS SUPPLIER_ID PK_SUPPLIER_PARTS Primary <null> mmuuid:455e5440-73ff-1edc-a81c-ecf397b10590 1 6
PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_STATUS FK_SPLIER_STATS Foreign mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590 mmuuid:5ac43c00-73ff-1edc-a81c-ecf397b10590 1 5
-PartsSupplier pg_catalog matpg_relatt attname pk_matpg_relatt_names Primary <null> mmuid:559efade-b320-49bd-8524-1d325ae11c82 1 14
-PartsSupplier pg_catalog matpg_relatt attnum idx_matpg_relatt_ids Index <null> mmuid:349f0c8c-7c64-4e0a-a84a-aee3deaf83af 2 18
-PartsSupplier pg_catalog matpg_relatt attrelid idx_matpg_relatt_ids Index <null> mmuid:349f0c8c-7c64-4e0a-a84a-aee3deaf83af 1 17
-PartsSupplier pg_catalog matpg_datatype name matpg_datatype_names Primary <null> mmuid:eda814fb-0a5a-4fbf-87bc-b57952292038 2 11
-PartsSupplier pg_catalog matpg_relatt nspname pk_matpg_relatt_names Primary <null> mmuid:559efade-b320-49bd-8524-1d325ae11c82 3 16
-PartsSupplier pg_catalog matpg_datatype oid matpg_datatype_ids Index <null> mmuid:443a2ab3-8257-4c4c-838e-9a47deaf4cf9 2 13
-PartsSupplier pg_catalog matpg_datatype oid matpg_datatype_names Primary <null> mmuid:eda814fb-0a5a-4fbf-87bc-b57952292038 1 10
+PartsSupplier pg_catalog matpg_relatt attname pk_matpg_relatt_names Primary <null> mmuid:17448311-6679-4dfd-aeb6-4aabbd894729 1 14
+PartsSupplier pg_catalog matpg_relatt attnum idx_matpg_relatt_ids Index <null> mmuid:053375a4-3971-4705-9146-9ecc640022c2 2 18
+PartsSupplier pg_catalog matpg_relatt attrelid idx_matpg_relatt_ids Index <null> mmuid:053375a4-3971-4705-9146-9ecc640022c2 1 17
+PartsSupplier pg_catalog matpg_datatype name matpg_datatype_names Primary <null> mmuid:542872fe-66ec-43b3-9486-ee25088b7248 2 11
+PartsSupplier pg_catalog matpg_relatt nspname pk_matpg_relatt_names Primary <null> mmuid:17448311-6679-4dfd-aeb6-4aabbd894729 3 16
+PartsSupplier pg_catalog matpg_datatype oid matpg_datatype_ids Index <null> mmuid:68ba97de-981f-49ed-873a-60f0e9d76b6f 2 13
+PartsSupplier pg_catalog matpg_datatype oid matpg_datatype_names Primary <null> mmuid:542872fe-66ec-43b3-9486-ee25088b7248 1 10
PartsSupplier pg_catalog pg_attribute oid pk_pg_attr Primary <null> mmuid:649c1635-60ad-4c28-9b20-035c562bb1be 1 19
PartsSupplier pg_catalog pg_class oid pk_pg_class Primary <null> mmuid:59f7dc95-95fe-4d90-9813-1a097188e768 1 20
-PartsSupplier pg_catalog pg_index oid pk_pg_index Primary <null> mmuid:1462b28e-0bab-436f-9654-013821506337 1 21
-PartsSupplier pg_catalog pg_proc oid pk_pg_proc Primary <null> mmuid:9569efdb-21b2-4b4f-a2db-e7406267b8ed 1 22
-PartsSupplier pg_catalog matpg_relatt relname pk_matpg_relatt_names Primary <null> mmuid:559efade-b320-49bd-8524-1d325ae11c82 2 15
-PartsSupplier pg_catalog matpg_datatype typname matpg_datatype_ids Index <null> mmuid:443a2ab3-8257-4c4c-838e-9a47deaf4cf9 1 12
+PartsSupplier pg_catalog pg_index oid pk_pg_index Primary <null> mmuid:3c67619c-7d8f-4378-b7e9-84a0451ea5e5 1 21
+PartsSupplier pg_catalog pg_proc oid pk_pg_proc Primary <null> mmuid:635b6634-632c-43c9-8cc7-bcaa016133e8 1 22
+PartsSupplier pg_catalog matpg_relatt relname pk_matpg_relatt_names Primary <null> mmuid:17448311-6679-4dfd-aeb6-4aabbd894729 2 15
+PartsSupplier pg_catalog matpg_datatype typname matpg_datatype_ids Index <null> mmuid:68ba97de-981f-49ed-873a-60f0e9d76b6f 1 12
Row Count : 22
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
VDBName 12 PartsSupplier java.lang.String VDBName string SYS KeyColumns 255 255 0 false false false false 0 true true false false
Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -8,14 +8,14 @@
PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS PK_STATUS <null> <null> Primary false <null> mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590 3
PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER PK_SUPPLIER <null> <null> Primary false <null> mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590 4
PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS PK_SUPPLIER_PARTS <null> <null> Primary false <null> mmuuid:455e5440-73ff-1edc-a81c-ecf397b10590 6
-PartsSupplier pg_catalog matpg_relatt idx_matpg_relatt_ids <null> <null> Index false <null> mmuid:349f0c8c-7c64-4e0a-a84a-aee3deaf83af 12
-PartsSupplier pg_catalog matpg_datatype matpg_datatype_ids <null> <null> Index false <null> mmuid:443a2ab3-8257-4c4c-838e-9a47deaf4cf9 10
-PartsSupplier pg_catalog matpg_datatype matpg_datatype_names <null> <null> Primary false <null> mmuid:eda814fb-0a5a-4fbf-87bc-b57952292038 9
-PartsSupplier pg_catalog matpg_relatt pk_matpg_relatt_names <null> <null> Primary false <null> mmuid:559efade-b320-49bd-8524-1d325ae11c82 11
+PartsSupplier pg_catalog matpg_relatt idx_matpg_relatt_ids <null> <null> Index false <null> mmuid:053375a4-3971-4705-9146-9ecc640022c2 12
+PartsSupplier pg_catalog matpg_datatype matpg_datatype_ids <null> <null> Index false <null> mmuid:68ba97de-981f-49ed-873a-60f0e9d76b6f 10
+PartsSupplier pg_catalog matpg_datatype matpg_datatype_names <null> <null> Primary false <null> mmuid:542872fe-66ec-43b3-9486-ee25088b7248 9
+PartsSupplier pg_catalog matpg_relatt pk_matpg_relatt_names <null> <null> Primary false <null> mmuid:17448311-6679-4dfd-aeb6-4aabbd894729 11
PartsSupplier pg_catalog pg_attribute pk_pg_attr <null> <null> Primary false <null> mmuid:649c1635-60ad-4c28-9b20-035c562bb1be 13
PartsSupplier pg_catalog pg_class pk_pg_class <null> <null> Primary false <null> mmuid:59f7dc95-95fe-4d90-9813-1a097188e768 14
-PartsSupplier pg_catalog pg_index pk_pg_index <null> <null> Primary false <null> mmuid:1462b28e-0bab-436f-9654-013821506337 15
-PartsSupplier pg_catalog pg_proc pk_pg_proc <null> <null> Primary false <null> mmuid:9569efdb-21b2-4b4f-a2db-e7406267b8ed 16
+PartsSupplier pg_catalog pg_index pk_pg_index <null> <null> Primary false <null> mmuid:3c67619c-7d8f-4378-b7e9-84a0451ea5e5 15
+PartsSupplier pg_catalog pg_proc pk_pg_proc <null> <null> Primary false <null> mmuid:635b6634-632c-43c9-8cc7-bcaa016133e8 16
Row Count : 16
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
VDBName 12 PartsSupplier java.lang.String VDBName string SYS Keys 255 255 0 false false false false 0 true true false false
Added: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected (rev 0)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -0,0 +1,13 @@
+string string string integer clob
+Name Value UID OID ClobValue
+pg_type:oid 30 mmuid:bcbed548-176c-4116-a5d6-7638cb0206e1 1 Clob[2]
+pg_type:oid 1009 mmuid:a385751f-a31a-4d5d-9197-3fbd390b0251 2 Clob[4]
+pg_type:oid 1002 mmuid:e5715456-245f-4846-b90b-01d06d1c3672 3 Clob[4]
+pg_type:oid 1028 mmuid:9569efdb-21b2-4b4f-a2db-e7406267b8ed 4 Clob[4]
+Row Count : 4
+getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
+Name 12 PartsSupplier java.lang.String Name string SYS Properties 255 255 0 false true false false 0 true true true false
+Value 12 PartsSupplier java.lang.String Value string SYS Properties 255 255 0 false true false false 0 true true true false
+UID 12 PartsSupplier java.lang.String UID string SYS Properties 50 50 0 false false false false 0 true true true false
+OID 4 PartsSupplier java.lang.Integer OID integer SYS Properties 11 10 0 false false false false 0 true true false false
+ClobValue 2005 PartsSupplier java.sql.Clob ClobValue clob SYS Properties 2097152 2097152 0 false true false true 1 false true true true
Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -18,19 +18,19 @@
PartsSupplier SYS Tables Table <null> true false mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7 -1 <null> true false 17
PartsSupplier SYSADMIN VDBResources Table <null> true false mmuuid:1785804d-beaf-4831-9531-e59164fedd49 -1 <null> true false 7
PartsSupplier SYS VirtualDatabases Table <null> true false mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489 -1 <null> true false 18
-PartsSupplier pg_catalog matpg_datatype Table <null> false false mmuid:17448311-6679-4dfd-aeb6-4aabbd894729 -1 <null> true true 19
-PartsSupplier pg_catalog matpg_relatt Table <null> false false mmuid:8c0714d6-1c72-40b4-8528-3b2c63059107 -1 <null> true true 20
-PartsSupplier pg_catalog pg_am Table <null> false false mmuid:f6517a63-8c14-4b73-a18d-afaa5dfb35d9 -1 <null> true false 21
-PartsSupplier pg_catalog pg_attrdef Table <null> false false mmuid:76a7dd05-9a7d-4243-b561-f3056500dcaf -1 <null> true false 22
+PartsSupplier pg_catalog matpg_datatype Table <null> false false mmuid:0f312b3c-98ca-4a09-81fa-f1ff83f0a6c1 -1 <null> true true 19
+PartsSupplier pg_catalog matpg_relatt Table <null> false false mmuid:0b0894ba-e1ea-4eaf-bcd2-ea9ebd05e47d -1 <null> true true 20
+PartsSupplier pg_catalog pg_am Table <null> false false mmuid:da4b747e-7d87-403a-8309-2cdf1399031b -1 <null> true false 21
+PartsSupplier pg_catalog pg_attrdef Table <null> false false mmuid:e9b278d4-49af-442f-9a5a-b699fe3b102b -1 <null> true false 22
PartsSupplier pg_catalog pg_attribute Table <null> false false mmuid:fa463d98-365f-489a-a707-025193cb51eb -1 <null> true true 23
PartsSupplier pg_catalog pg_class Table <null> false false mmuid:7e21f2e6-06e3-4bca-9b01-72ea47821560 -1 <null> true true 24
-PartsSupplier pg_catalog pg_database Table <null> false false mmuid:382f9fc9-8c96-4df7-ab5d-04dfb47ee142 -1 <null> true false 25
-PartsSupplier pg_catalog pg_index Table <null> false false mmuid:09daed8d-b0b8-4552-a261-2b6c775b46b0 -1 <null> true true 26
+PartsSupplier pg_catalog pg_database Table <null> false false mmuid:1aedd02c-5801-41e7-accd-da1f257c26e8 -1 <null> true false 25
+PartsSupplier pg_catalog pg_index Table <null> false false mmuid:8709e084-48df-417d-b3f8-f4e9b7d8802b -1 <null> true true 26
PartsSupplier pg_catalog pg_namespace Table <null> false false mmuid:6609866a-3d7b-4f4b-95fe-ebfac769d699 -1 <null> true false 27
-PartsSupplier pg_catalog pg_proc Table <null> false false mmuid:f20c9489-10ca-4596-8a37-24218b67f764 -1 <null> true true 28
-PartsSupplier pg_catalog pg_trigger Table <null> false false mmuid:2b75f0b1-7475-4ed5-9da3-d37a8a25f26a -1 <null> true false 29
+PartsSupplier pg_catalog pg_proc Table <null> false false mmuid:b288b3aa-37f2-4a8e-8b1b-e932a2ce3e25 -1 <null> true true 28
+PartsSupplier pg_catalog pg_trigger Table <null> false false mmuid:64977f3e-f2a0-466e-a5d1-80bb058cbe08 -1 <null> true false 29
PartsSupplier pg_catalog pg_type Table <null> false false mmuid:9462e3f8-cd3c-414f-a570-f6f33c40e36a -1 <null> true false 30
-PartsSupplier pg_catalog pg_user Table <null> false false mmuid:e63613cb-01ee-4b37-8b91-99d1aac4dfcb -1 <null> true false 31
+PartsSupplier pg_catalog pg_user Table <null> false false mmuid:236445e1-408c-40a1-a61c-40e96fb5dc9f -1 <null> true false 31
Row Count : 31
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
VDBName 12 PartsSupplier java.lang.String VDBName string SYS Tables 255 255 0 false true false true 1 false true true true
Added: trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected (rev 0)
+++ trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -0,0 +1,13 @@
+string string string
+Name Value UID
+NugentXAttribute Nuuuuuge22222 mmuuid:4789b280-841c-1f15-9526-ebd0cace03e1
+NugentYAttribute Nuuuuuge44444 mmuuid:4789b280-841c-1f15-9526-ebd0cace03e1
+pg_type:oid 30 mmuid:bcbed548-176c-4116-a5d6-7638cb0206e1
+pg_type:oid 1009 mmuid:a385751f-a31a-4d5d-9197-3fbd390b0251
+pg_type:oid 1002 mmuid:e5715456-245f-4846-b90b-01d06d1c3672
+pg_type:oid 1028 mmuid:9569efdb-21b2-4b4f-a2db-e7406267b8ed
+Row Count : 6
+getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
+Name 12 xmlvp java.lang.String Name string SYS Properties 255 255 0 false true false false 0 true true true false
+Value 12 xmlvp java.lang.String Value string SYS Properties 255 255 0 false true false false 0 true true true false
+UID 12 xmlvp java.lang.String UID string SYS Properties 50 50 0 false false false false 0 true true true false
13 years, 8 months
- 1
- 0
Teiid-NightlyBuild - Build # 1500 - Still Failing!
by jboss-qa-internal＠redhat.com
Teiid-NightlyBuild - Build # 1500 - Still Failing:
Check console output at http://hudson.qa.jboss.com/hudson/job/Teiid-NightlyBuild/1500/ to view the results.
13 years, 8 months
- 1
- 17
teiid SVN: r4055 - in trunk: admin/src/main/java/org/teiid/adminapi and 200 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-05-02 17:36:21 -0400 (Wed, 02 May 2012)
New Revision: 4055
Modified:
trunk/
trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java
trunk/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java
trunk/adminshell/src/main/java/groovy/
trunk/adminshell/src/main/java/groovy/sql/
trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java
trunk/adminshell/src/main/java/org/teiid/adminshell/
trunk/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java
trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java
trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java
trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java
trunk/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java
trunk/adminshell/src/main/java/org/teiid/adminshell/Help.java
trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java
trunk/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java
trunk/adminshell/src/main/resources/org/
trunk/adminshell/src/main/resources/org/codehaus/
trunk/adminshell/src/main/resources/org/codehaus/groovy/
trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/
trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/
trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml
trunk/adminshell/src/main/resources/org/teiid/
trunk/adminshell/src/main/resources/org/teiid/adminshell/
trunk/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties
trunk/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties
trunk/adminshell/src/test/java/org/
trunk/adminshell/src/test/java/org/teiid/
trunk/adminshell/src/test/java/org/teiid/adminshell/
trunk/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java
trunk/adminshell/src/test/resources/foo/
trunk/adminshell/src/test/resources/foo/bar.txt
trunk/api/src/main/java/org/teiid/connector/DataPlugin.java
trunk/api/src/main/java/org/teiid/events/
trunk/api/src/main/java/org/teiid/events/EventDistributor.java
trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java
trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java
trunk/build/kits/
trunk/build/kits/adminshell/
trunk/build/kits/jboss-as7/
trunk/client/src/main/java/org/teiid/client/util/
trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java
trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java
trunk/client/src/main/java/org/teiid/client/util/ResultsFuture.java
trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java
trunk/client/src/main/java/org/teiid/gss/MakeGSS.java
trunk/client/src/main/java/org/teiid/jdbc/
trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java
trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java
trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java
trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java
trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java
trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java
trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java
trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java
trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java
trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java
trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java
trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java
trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java
trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java
trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java
trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java
trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java
trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java
trunk/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java
trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java
trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java
trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java
trunk/client/src/main/java/org/teiid/jdbc/RequestOptions.java
trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java
trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java
trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java
trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java
trunk/client/src/main/java/org/teiid/jdbc/StatementCallback.java
trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java
trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java
trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java
trunk/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java
trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java
trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java
trunk/client/src/main/java/org/teiid/jdbc/TeiidStatement.java
trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java
trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java
trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java
trunk/client/src/main/java/org/teiid/net/socket/
trunk/client/src/main/java/org/teiid/net/socket/AuthenticationType.java
trunk/client/src/main/java/org/teiid/net/socket/Handshake.java
trunk/client/src/main/java/org/teiid/net/socket/Message.java
trunk/client/src/main/java/org/teiid/net/socket/ObjectChannel.java
trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java
trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java
trunk/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java
trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java
trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java
trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java
trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java
trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java
trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java
trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java
trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java
trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java
trunk/client/src/main/resources/org/
trunk/client/src/main/resources/org/teiid/
trunk/client/src/main/resources/org/teiid/jdbc/
trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties
trunk/client/src/main/resources/org/teiid/net/
trunk/client/src/test/java/org/teiid/client/plan/
trunk/client/src/test/java/org/teiid/client/plan/TestPlanNode.java
trunk/client/src/test/java/org/teiid/client/util/
trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java
trunk/client/src/test/java/org/teiid/client/util/TestResultsFuture.java
trunk/client/src/test/java/org/teiid/jdbc/
trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java
trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java
trunk/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java
trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java
trunk/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java
trunk/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java
trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java
trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java
trunk/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java
trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java
trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java
trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java
trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java
trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java
trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java
trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java
trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java
trunk/client/src/test/java/org/teiid/jdbc/util/
trunk/client/src/test/java/org/teiid/net/
trunk/client/src/test/java/org/teiid/net/TestTeiidURL.java
trunk/client/src/test/java/org/teiid/net/socket/
trunk/common-core/src/main/java/org/
trunk/common-core/src/main/java/org/teiid/
trunk/common-core/src/main/java/org/teiid/core/
trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java
trunk/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java
trunk/common-core/src/main/java/org/teiid/core/CoreConstants.java
trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java
trunk/common-core/src/main/java/org/teiid/core/TeiidComponentException.java
trunk/common-core/src/main/java/org/teiid/core/TeiidException.java
trunk/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java
trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java
trunk/common-core/src/main/java/org/teiid/core/crypto/
trunk/common-core/src/main/java/org/teiid/core/types/
trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java
trunk/common-core/src/main/java/org/teiid/core/types/BinaryType.java
trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java
trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java
trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java
trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java
trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java
trunk/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java
trunk/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java
trunk/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java
trunk/common-core/src/main/java/org/teiid/core/types/NullType.java
trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java
trunk/common-core/src/main/java/org/teiid/core/types/Sequencable.java
trunk/common-core/src/main/java/org/teiid/core/types/SourceTransform.java
trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java
trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java
trunk/common-core/src/main/java/org/teiid/core/types/Transform.java
trunk/common-core/src/main/java/org/teiid/core/types/TransformationException.java
trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java
trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java
trunk/common-core/src/main/java/org/teiid/core/types/basic/
trunk/common-core/src/main/java/org/teiid/core/types/basic/BlobToBinaryTransform.java
trunk/common-core/src/main/java/org/teiid/core/types/basic/ClobToStringTransform.java
trunk/common-core/src/main/java/org/teiid/core/types/basic/ObjectToAnyTransform.java
trunk/common-core/src/main/java/org/teiid/core/types/basic/SQLXMLToStringTransform.java
trunk/common-core/src/main/java/org/teiid/core/types/basic/StringToDateTransform.java
trunk/common-core/src/main/java/org/teiid/core/util/
trunk/common-core/src/main/java/org/teiid/core/util/FileUtils.java
trunk/common-core/src/main/java/org/teiid/core/util/ReflectionHelper.java
trunk/common-core/src/main/resources/org/teiid/core/i18n.properties
trunk/common-core/src/test/java/org/
trunk/common-core/src/test/java/org/teiid/
trunk/common-core/src/test/java/org/teiid/core/
trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java
trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java
trunk/common-core/src/test/java/org/teiid/core/crypto/
trunk/common-core/src/test/java/org/teiid/core/types/
trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java
trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java
trunk/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java
trunk/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java
trunk/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java
trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java
trunk/common-core/src/test/java/org/teiid/core/types/basic/
trunk/common-core/src/test/java/org/teiid/core/util/
trunk/common-core/src/test/java/org/teiid/core/util/TestFileUtils.java
trunk/common-core/src/test/java/org/teiid/query/
trunk/common-core/src/test/java/org/teiid/query/unittest/
trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/
trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file/
trunk/connectors/connector-file/src/main/resources/org/
trunk/connectors/connector-file/src/main/resources/org/teiid/
trunk/connectors/connector-file/src/main/resources/org/teiid/resource/
trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/
trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/
trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties
trunk/connectors/connector-file/src/test/java/org/
trunk/connectors/connector-file/src/test/java/org/teiid/
trunk/connectors/connector-file/src/test/java/org/teiid/resource/
trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/
trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/
trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java
trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/
trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/
trunk/connectors/connector-ws/src/main/resources/org/
trunk/connectors/connector-ws/src/main/resources/org/teiid/
trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/
trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/
trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/
trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCPlugin.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java
trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/
trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/
trunk/engine/src/main/java/org/teiid/api/
trunk/engine/src/main/java/org/teiid/api/exception/
trunk/engine/src/main/java/org/teiid/api/exception/query/
trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java
trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java
trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java
trunk/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java
trunk/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java
trunk/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java
trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java
trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java
trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java
trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java
trunk/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java
trunk/engine/src/main/java/org/teiid/common/
trunk/engine/src/main/java/org/teiid/common/buffer/
trunk/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java
trunk/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java
trunk/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java
trunk/engine/src/main/java/org/teiid/common/buffer/BatchManager.java
trunk/engine/src/main/java/org/teiid/common/buffer/BlockedException.java
trunk/engine/src/main/java/org/teiid/common/buffer/BufferManager.java
trunk/engine/src/main/java/org/teiid/common/buffer/Cache.java
trunk/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java
trunk/engine/src/main/java/org/teiid/common/buffer/CacheKey.java
trunk/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java
trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java
trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java
trunk/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java
trunk/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java
trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java
trunk/engine/src/main/java/org/teiid/common/buffer/SPage.java
trunk/engine/src/main/java/org/teiid/common/buffer/STree.java
trunk/engine/src/main/java/org/teiid/common/buffer/Serializer.java
trunk/engine/src/main/java/org/teiid/common/buffer/StorageManager.java
trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java
trunk/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java
trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java
trunk/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java
trunk/engine/src/main/java/org/teiid/common/buffer/TupleSource.java
trunk/engine/src/main/java/org/teiid/common/buffer/impl/
trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java
trunk/engine/src/main/java/org/teiid/core/
trunk/engine/src/main/java/org/teiid/core/id/
trunk/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java
trunk/engine/src/main/java/org/teiid/query/
trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java
trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java
trunk/engine/src/main/java/org/teiid/query/ReplicatedObject.java
trunk/engine/src/main/java/org/teiid/query/analysis/
trunk/engine/src/main/java/org/teiid/query/eval/
trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java
trunk/engine/src/main/java/org/teiid/query/function/
trunk/engine/src/main/java/org/teiid/query/function/CharsetUtils.java
trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java
trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java
trunk/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java
trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java
trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java
trunk/engine/src/main/java/org/teiid/query/function/FunctionTree.java
trunk/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java
trunk/engine/src/main/java/org/teiid/query/function/UDFSource.java
trunk/engine/src/main/java/org/teiid/query/function/aggregate/
trunk/engine/src/main/java/org/teiid/query/function/metadata/
trunk/engine/src/main/java/org/teiid/query/function/source/
trunk/engine/src/main/java/org/teiid/query/mapping/
trunk/engine/src/main/java/org/teiid/query/mapping/relational/
trunk/engine/src/main/java/org/teiid/query/mapping/xml/
trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingChoiceNode.java
trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingDocument.java
trunk/engine/src/main/java/org/teiid/query/metadata/
trunk/engine/src/main/java/org/teiid/query/optimizer/
trunk/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java
trunk/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java
trunk/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java
trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java
trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java
trunk/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java
trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree/
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/FrameUtil.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanJoins.java
trunk/engine/src/main/java/org/teiid/query/optimizer/xml/
trunk/engine/src/main/java/org/teiid/query/optimizer/xml/NameInSourceResolverVisitor.java
trunk/engine/src/main/java/org/teiid/query/optimizer/xml/SourceNodePlannerVisitor.java
trunk/engine/src/main/java/org/teiid/query/optimizer/xml/ValidateMappedCriteriaVisitor.java
trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPlanner.java
trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLProjectionMinimizer.java
trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLQueryPlanner.java
trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLStagaingQueryPlanner.java
trunk/engine/src/main/java/org/teiid/query/parser/
trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java
trunk/engine/src/main/java/org/teiid/query/processor/
trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java
trunk/engine/src/main/java/org/teiid/query/processor/BatchIterator.java
trunk/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java
trunk/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java
trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java
trunk/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java
trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java
trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java
trunk/engine/src/main/java/org/teiid/query/processor/proc/
trunk/engine/src/main/java/org/teiid/query/processor/proc/ErrorInstruction.java
trunk/engine/src/main/java/org/teiid/query/processor/relational/
trunk/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java
trunk/engine/src/main/java/org/teiid/query/processor/xml/
trunk/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor.java
trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLContext.java
trunk/engine/src/main/java/org/teiid/query/report/
trunk/engine/src/main/java/org/teiid/query/resolver/
trunk/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java
trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java
trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java
trunk/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java
trunk/engine/src/main/java/org/teiid/query/resolver/command/
trunk/engine/src/main/java/org/teiid/query/resolver/command/SimpleQueryResolver.java
trunk/engine/src/main/java/org/teiid/query/resolver/command/TempTableResolver.java
trunk/engine/src/main/java/org/teiid/query/resolver/command/UpdateProcedureResolver.java
trunk/engine/src/main/java/org/teiid/query/resolver/command/XMLQueryResolver.java
trunk/engine/src/main/java/org/teiid/query/resolver/util/
trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java
trunk/engine/src/main/java/org/teiid/query/rewriter/
trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
trunk/engine/src/main/java/org/teiid/query/sql/
trunk/engine/src/main/java/org/teiid/query/sql/LanguageObject.java
trunk/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java
trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java
trunk/engine/src/main/java/org/teiid/query/sql/lang/
trunk/engine/src/main/java/org/teiid/query/sql/lang/MatchCriteria.java
trunk/engine/src/main/java/org/teiid/query/sql/navigator/
trunk/engine/src/main/java/org/teiid/query/sql/proc/
trunk/engine/src/main/java/org/teiid/query/sql/symbol/
trunk/engine/src/main/java/org/teiid/query/sql/util/
trunk/engine/src/main/java/org/teiid/query/sql/visitor/
trunk/engine/src/main/java/org/teiid/query/tempdata/
trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableStore.java
trunk/engine/src/main/java/org/teiid/query/util/
trunk/engine/src/main/java/org/teiid/query/validator/
trunk/engine/src/main/java/org/teiid/query/xquery/
trunk/engine/src/main/java/org/teiid/query/xquery/saxon/
trunk/engine/src/main/java/org/teiid/query/xquery/saxon/XQueryEvaluator.java
trunk/engine/src/main/java/org/teiid/vdb/
trunk/engine/src/main/java/org/teiid/vdb/runtime/
trunk/engine/src/main/resources/org/teiid/query/i18n.properties
trunk/engine/src/test/java/org/teiid/cache/
trunk/engine/src/test/java/org/teiid/cache/TestDefaultCache.java
trunk/engine/src/test/java/org/teiid/common/
trunk/engine/src/test/java/org/teiid/common/buffer/
trunk/engine/src/test/java/org/teiid/common/queue/
trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestTransactionServer.java
trunk/engine/src/test/java/org/teiid/query/
trunk/engine/src/test/java/org/teiid/query/analysis/
trunk/engine/src/test/java/org/teiid/query/function/
trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java
trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java
trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java
trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java
trunk/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java
trunk/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java
trunk/engine/src/test/java/org/teiid/query/function/metadata/
trunk/engine/src/test/java/org/teiid/query/function/source/
trunk/engine/src/test/java/org/teiid/query/mapping/
trunk/engine/src/test/java/org/teiid/query/mapping/xml/
trunk/engine/src/test/java/org/teiid/query/metadata/
trunk/engine/src/test/java/org/teiid/query/optimizer/
trunk/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java
trunk/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java
trunk/engine/src/test/java/org/teiid/query/optimizer/capabilities/
trunk/engine/src/test/java/org/teiid/query/optimizer/proc/
trunk/engine/src/test/java/org/teiid/query/optimizer/relational/
trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java
trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java
trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java
trunk/engine/src/test/java/org/teiid/query/optimizer/relational/plantree/
trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules/
trunk/engine/src/test/java/org/teiid/query/optimizer/xml/
trunk/engine/src/test/java/org/teiid/query/parser/
trunk/engine/src/test/java/org/teiid/query/processor/
trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java
trunk/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java
trunk/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java
trunk/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java
trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java
trunk/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java
trunk/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java
trunk/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java
trunk/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java
trunk/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java
trunk/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java
trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java
trunk/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java
trunk/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java
trunk/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java
trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java
trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java
trunk/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java
trunk/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java
trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java
trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java
trunk/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java
trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java
trunk/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java
trunk/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java
trunk/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java
trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java
trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java
trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java
trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java
trunk/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java
trunk/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java
trunk/engine/src/test/java/org/teiid/query/processor/eval/
trunk/engine/src/test/java/org/teiid/query/processor/eval/TestCriteriaEvaluator.java
trunk/engine/src/test/java/org/teiid/query/processor/proc/
trunk/engine/src/test/java/org/teiid/query/processor/relational/
trunk/engine/src/test/java/org/teiid/query/processor/xml/
trunk/engine/src/test/java/org/teiid/query/processor/xml/TestXMLProcessor.java
trunk/engine/src/test/java/org/teiid/query/resolver/
trunk/engine/src/test/java/org/teiid/query/resolver/TestProcedureResolving.java
trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java
trunk/engine/src/test/java/org/teiid/query/rewriter/
trunk/engine/src/test/java/org/teiid/query/sql/
trunk/engine/src/test/java/org/teiid/query/sql/lang/
trunk/engine/src/test/java/org/teiid/query/sql/proc/
trunk/engine/src/test/java/org/teiid/query/sql/symbol/
trunk/engine/src/test/java/org/teiid/query/sql/util/
trunk/engine/src/test/java/org/teiid/query/sql/visitor/
trunk/engine/src/test/java/org/teiid/query/unittest/
trunk/engine/src/test/java/org/teiid/query/util/
trunk/engine/src/test/java/org/teiid/query/validator/
trunk/engine/src/test/java/org/teiid/vdb/
trunk/engine/src/test/java/org/teiid/vdb/runtime/
trunk/engine/src/test/resources/text/
trunk/engine/src/test/resources/text/TextParts_HeaderRow2.csv
trunk/engine/src/test/resources/text/cdm_dos.txt
trunk/engine/src/test/resources/text/cdm_dos_win.txt
trunk/engine/src/test/resources/text/test-file.txt.csv
trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/AddressWrapper.java
trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java
trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java
trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java
trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties
trunk/metadata/src/main/java/org/teiid/metadata/index/RuntimeMetadataPlugin.java
trunk/metadata/src/test/java/org/teiid/cdk/
trunk/metadata/src/test/java/org/teiid/cdk/api/
trunk/metadata/src/test/java/org/teiid/cdk/unittest/
trunk/metadata/src/test/java/org/teiid/core/
trunk/metadata/src/test/java/org/teiid/core/util/
trunk/metadata/src/test/java/org/teiid/internal/
trunk/metadata/src/test/java/org/teiid/internal/core/
trunk/metadata/src/test/java/org/teiid/internal/core/index/
trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java
trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java
trunk/runtime/src/main/java/org/teiid/transport/pg/
trunk/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java
trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties
trunk/runtime/src/main/resources/org/teiid/transport/
trunk/runtime/src/test/java/org/teiid/dqp/
trunk/runtime/src/test/java/org/teiid/dqp/service/
trunk/runtime/src/test/java/org/teiid/dqp/service/buffer/
trunk/test-integration/common/src/test/java/org/teiid/cdk/
trunk/test-integration/common/src/test/java/org/teiid/cdk/api/
trunk/test-integration/common/src/test/java/org/teiid/dqp/
trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/
trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/
trunk/test-integration/common/src/test/java/org/teiid/transport/
trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java
trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/
trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected
trunk/test-integration/db/src/main/java/org/teiid/internal/
trunk/test-integration/db/src/main/java/org/teiid/internal/core/
trunk/test-integration/db/src/main/java/org/teiid/internal/core/xml/
trunk/test-integration/db/src/test/java/com/
trunk/test-integration/db/src/test/java/org/teiid/internal/
trunk/test-integration/db/src/test/java/org/teiid/internal/core/
Log:
forward merge from 8.0
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x:3535-3555
/branches/7.6.x:3673-3711,3754-3769
/branches/7.7.x:3816-3868,3876-3915,3920-3983
/branches/8.0.x:4002-4046
/trunk:3188-3450,3452-3666
+ /branches/7.4.x:3535-3555
/branches/7.6.x:3673-3711,3754-3769
/branches/7.7.x:3816-3868,3876-3915,3920-3983
/branches/8.0.x:4002-4046,4048-4051
/trunk:3188-3450,3452-3666
Modified: trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -22,25 +22,15 @@
package org.teiid.adminapi;
-import static org.jboss.as.controller.client.helpers.ClientConstants.DEPLOYMENT_REMOVE_OPERATION;
-import static org.jboss.as.controller.client.helpers.ClientConstants.DEPLOYMENT_UNDEPLOY_OPERATION;
+import static org.jboss.as.controller.client.helpers.ClientConstants.*;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
+import java.util.*;
+import java.util.logging.Logger;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -64,10 +54,10 @@
import org.teiid.adminapi.impl.PropertyDefinitionMetadata;
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.adminapi.impl.VDBMetadataMapper;
+import org.teiid.adminapi.impl.VDBTranslatorMetaData;
import org.teiid.adminapi.impl.VDBMetadataMapper.RequestMetadataMapper;
import org.teiid.adminapi.impl.VDBMetadataMapper.SessionMetadataMapper;
import org.teiid.adminapi.impl.VDBMetadataMapper.TransactionMetadataMapper;
-import org.teiid.adminapi.impl.VDBTranslatorMetaData;
import org.teiid.core.util.ObjectConverterUtil;
@@ -76,6 +66,7 @@
*/
@SuppressWarnings("nls")
public class AdminFactory {
+ private static final Logger LOGGER = Logger.getLogger(AdminFactory.class.getName());
private static AdminFactory INSTANCE = new AdminFactory();
public static AdminFactory getInstance() {
@@ -106,12 +97,12 @@
List<String> nodeTypes = Util.getNodeTypes(newClient, new DefaultOperationRequestAddress());
if (!nodeTypes.isEmpty()) {
boolean domainMode = nodeTypes.contains("server-group"); //$NON-NLS-1$
- System.out.println("Connected to " //$NON-NLS-1$
+ LOGGER.info("Connected to " //$NON-NLS-1$
+ (domainMode ? "domain controller at " : "standalone controller at ") //$NON-NLS-1$ //$NON-NLS-2$
+ host + ":" + port); //$NON-NLS-1$
return new AdminImpl(newClient);
}
- System.out.println(AdminPlugin.Util.gs(AdminPlugin.Event.TEIID70051, host, port)); //$NON-NLS-1$ //$NON-NLS-2$
+ LOGGER.info(AdminPlugin.Util.gs(AdminPlugin.Event.TEIID70051, host, port)); //$NON-NLS-1$ //$NON-NLS-2$
} catch (UnknownHostException e) {
throw new AdminProcessingException(AdminPlugin.Event.TEIID70000, AdminPlugin.Util.gs(AdminPlugin.Event.TEIID70000, host, e.getLocalizedMessage()));
}
@@ -619,7 +610,7 @@
} catch (OperationFormatException e) {
throw new AdminProcessingException(AdminPlugin.Event.TEIID70011, e, e.getMessage());
} catch (IOException e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70012, e, e.getMessage());
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70011, e, e.getMessage());
}
}
Modified: trunk/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -32,8 +32,6 @@
public static enum Event implements BundleUtil.Event {
TEIID70000,
- TEIID70001,
- TEIID70002,
TEIID70003,
TEIID70004,
TEIID70005,
@@ -43,14 +41,11 @@
TEIID70009,
TEIID70010,
TEIID70011,
- TEIID70012,
TEIID70013,
TEIID70014,
TEIID70015,
TEIID70016,
TEIID70017,
- TEIID70018,
- TEIID70019,
TEIID70020,
TEIID70021,
TEIID70022,
Property changes on: trunk/adminshell/src/main/java/groovy
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/groovy:3535-3555*
/branches/7.6.x/adminshell/src/main/java/groovy:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/java/groovy:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/java/groovy:4002-4046*
/trunk/adminshell/src/main/java/groovy:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/groovy:3535-3555*
/branches/7.6.x/adminshell/src/main/java/groovy:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/java/groovy:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/java/groovy:4002-4046*,4048-4051*
/trunk/adminshell/src/main/java/groovy:3507-3666
Property changes on: trunk/adminshell/src/main/java/groovy/sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/groovy/sql:3535-3555*
/branches/7.6.x/adminshell/src/main/java/groovy/sql:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/java/groovy/sql:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/java/groovy/sql:4002-4046*
/trunk/adminshell/src/main/java/groovy/sql:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/groovy/sql:3535-3555*
/branches/7.6.x/adminshell/src/main/java/groovy/sql:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/java/groovy/sql:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/java/groovy/sql:4002-4046*,4048-4051*
/trunk/adminshell/src/main/java/groovy/sql:3507-3666
Property changes on: trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:4002-4046
/trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:4002-4046,4048-4051
/trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java:3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell:3535-3555*
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell:4002-4046*
/trunk/adminshell/src/main/java/org/teiid/adminshell:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell:3535-3555*
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell:4002-4046*,4048-4051*
/trunk/adminshell/src/main/java/org/teiid/adminshell:3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:4002-4046,4048-4051
/trunk/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:2901-2940
/branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3188-3450,3452-3666
+ /branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:2901-2940
/branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:4002-4046,4048-4051
/trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3188-3450,3452-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:4002-4046,4048-4051
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:4002-4046,4048-4051
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:4002-4046,4048-4051
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/Help.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/Help.java:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:4002-4046,4048-4051
/trunk/adminshell/src/main/java/org/teiid/adminshell/Help.java:3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:4002-4046,4048-4051
/trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:4002-4046,4048-4051
/trunk/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org:4002-4046*
/trunk/adminshell/src/main/resources/org:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org:4002-4046*,4048-4051*
/trunk/adminshell/src/main/resources/org:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/codehaus
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/codehaus:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/codehaus:4002-4046*
/trunk/adminshell/src/main/resources/org/codehaus:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/codehaus:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/codehaus:4002-4046*,4048-4051*
/trunk/adminshell/src/main/resources/org/codehaus:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groovy
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy:4002-4046*
/trunk/adminshell/src/main/resources/org/codehaus/groovy:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy:4002-4046*,4048-4051*
/trunk/adminshell/src/main/resources/org/codehaus/groovy:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groovy/tools
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy/tools:4002-4046*
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy/tools:4002-4046*,4048-4051*
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:4002-4046*
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:4002-4046*,4048-4051*
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:4002-4046
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:4002-4046,4048-4051
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/teiid:4002-4046*
/trunk/adminshell/src/main/resources/org/teiid:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/teiid:4002-4046*,4048-4051*
/trunk/adminshell/src/main/resources/org/teiid:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/teiid/adminshell
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/teiid/adminshell:4002-4046*
/trunk/adminshell/src/main/resources/org/teiid/adminshell:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/teiid/adminshell:4002-4046*,4048-4051*
/trunk/adminshell/src/main/resources/org/teiid/adminshell:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:4002-4046
/trunk/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:4002-4046,4048-4051
/trunk/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:4002-4046
/trunk/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:4002-4046,4048-4051
/trunk/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3507-3666
Property changes on: trunk/adminshell/src/test/java/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/test/java/org:3535-3555*
/branches/7.6.x/adminshell/src/test/java/org:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/test/java/org:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/test/java/org:4002-4046*
/trunk/adminshell/src/test/java/org:3507-3666
+ /branches/7.4.x/adminshell/src/test/java/org:3535-3555*
/branches/7.6.x/adminshell/src/test/java/org:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/test/java/org:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/test/java/org:4002-4046*,4048-4051*
/trunk/adminshell/src/test/java/org:3507-3666
Property changes on: trunk/adminshell/src/test/java/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/test/java/org/teiid:3535-3555*
/branches/7.6.x/adminshell/src/test/java/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/test/java/org/teiid:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/test/java/org/teiid:4002-4046*
/trunk/adminshell/src/test/java/org/teiid:3507-3666
+ /branches/7.4.x/adminshell/src/test/java/org/teiid:3535-3555*
/branches/7.6.x/adminshell/src/test/java/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/test/java/org/teiid:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/test/java/org/teiid:4002-4046*,4048-4051*
/trunk/adminshell/src/test/java/org/teiid:3507-3666
Property changes on: trunk/adminshell/src/test/java/org/teiid/adminshell
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell:3535-3555*
/branches/7.6.x/adminshell/src/test/java/org/teiid/adminshell:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/test/java/org/teiid/adminshell:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/test/java/org/teiid/adminshell:4002-4046*
/trunk/adminshell/src/test/java/org/teiid/adminshell:3507-3666
+ /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell:3535-3555*
/branches/7.6.x/adminshell/src/test/java/org/teiid/adminshell:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/test/java/org/teiid/adminshell:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/test/java/org/teiid/adminshell:4002-4046*,4048-4051*
/trunk/adminshell/src/test/java/org/teiid/adminshell:3507-3666
Property changes on: trunk/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3535-3555
/branches/7.6.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:4002-4046
/trunk/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3507-3666
+ /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3535-3555
/branches/7.6.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:4002-4046,4048-4051
/trunk/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3507-3666
Property changes on: trunk/adminshell/src/test/resources/foo
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/test/resources/foo:3535-3555*
/branches/7.6.x/adminshell/src/test/resources/foo:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/test/resources/foo:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/test/resources/foo:4002-4046*
/trunk/adminshell/src/test/resources/foo:3507-3666
+ /branches/7.4.x/adminshell/src/test/resources/foo:3535-3555*
/branches/7.6.x/adminshell/src/test/resources/foo:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/test/resources/foo:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/test/resources/foo:4002-4046*,4048-4051*
/trunk/adminshell/src/test/resources/foo:3507-3666
Property changes on: trunk/adminshell/src/test/resources/foo/bar.txt
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/test/resources/foo/bar.txt:3535-3555
/branches/7.6.x/adminshell/src/test/resources/foo/bar.txt:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/test/resources/foo/bar.txt:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/test/resources/foo/bar.txt:4002-4046
/trunk/adminshell/src/test/resources/foo/bar.txt:3507-3666
+ /branches/7.4.x/adminshell/src/test/resources/foo/bar.txt:3535-3555
/branches/7.6.x/adminshell/src/test/resources/foo/bar.txt:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/test/resources/foo/bar.txt:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/test/resources/foo/bar.txt:4002-4046,4048-4051
/trunk/adminshell/src/test/resources/foo/bar.txt:3507-3666
Modified: trunk/api/src/main/java/org/teiid/connector/DataPlugin.java
===================================================================
--- trunk/api/src/main/java/org/teiid/connector/DataPlugin.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/api/src/main/java/org/teiid/connector/DataPlugin.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -40,8 +40,6 @@
TEIID60003,
TEIID60004,
TEIID60005,
- TEIID60006,
- TEIID60007,
TEIID60008,
TEIID60009,
TEIID60010,
Property changes on: trunk/api/src/main/java/org/teiid/events
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/api/src/main/java/org/teiid/events:3535-3555*
/branches/7.6.x/api/src/main/java/org/teiid/events:3673-3711*,3754-3769
/branches/7.7.x/api/src/main/java/org/teiid/events:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/api/src/main/java/org/teiid/events:4002-4046*
/trunk/api/src/main/java/org/teiid/events:3507-3666
+ /branches/7.4.x/api/src/main/java/org/teiid/events:3535-3555*
/branches/7.6.x/api/src/main/java/org/teiid/events:3673-3711*,3754-3769
/branches/7.7.x/api/src/main/java/org/teiid/events:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/api/src/main/java/org/teiid/events:4002-4046*,4048-4051*
/trunk/api/src/main/java/org/teiid/events:3507-3666
Property changes on: trunk/api/src/main/java/org/teiid/events/EventDistributor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributor.java:3340-3349,3535-3555
/branches/7.6.x/api/src/main/java/org/teiid/events/EventDistributor.java:3673-3711,3754-3769
/branches/7.7.x/api/src/main/java/org/teiid/events/EventDistributor.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/api/src/main/java/org/teiid/events/EventDistributor.java:4002-4046
/trunk/api/src/main/java/org/teiid/events/EventDistributor.java:3188-3450,3452-3666
+ /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributor.java:3340-3349,3535-3555
/branches/7.6.x/api/src/main/java/org/teiid/events/EventDistributor.java:3673-3711,3754-3769
/branches/7.7.x/api/src/main/java/org/teiid/events/EventDistributor.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/api/src/main/java/org/teiid/events/EventDistributor.java:4002-4046,4048-4051
/trunk/api/src/main/java/org/teiid/events/EventDistributor.java:3188-3450,3452-3666
Property changes on: trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3535-3555
/branches/7.6.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3673-3711,3754-3769
/branches/7.7.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:4002-4046
/trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3507-3666
+ /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3535-3555
/branches/7.6.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3673-3711,3754-3769
/branches/7.7.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:4002-4046,4048-4051
/trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3507-3666
Modified: trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java
===================================================================
--- trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -819,9 +819,9 @@
} catch (TeiidException e) {
throw new TranslatorException(DataPlugin.Event.TEIID60005, e);
} catch (IllegalAccessException e) {
- throw new TranslatorException(DataPlugin.Event.TEIID60006, e);
+ throw new TranslatorException(DataPlugin.Event.TEIID60005, e);
} catch(InstantiationException e) {
- throw new TranslatorException(DataPlugin.Event.TEIID60007, e);
+ throw new TranslatorException(DataPlugin.Event.TEIID60005, e);
}
}
Property changes on: trunk/build/kits
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/build/kits:3535-3555*
/branches/7.6.x/build/kits:3673-3711*,3754-3769
/branches/7.7.x/build/kits:3816-3868,3876-3915,3920-3983
/branches/8.0.x/build/kits:4002-4046
/trunk/build/kits:3507-3666
+ /branches/7.4.x/build/kits:3535-3555*
/branches/7.6.x/build/kits:3673-3711*,3754-3769
/branches/7.7.x/build/kits:3816-3868,3876-3915,3920-3983
/branches/8.0.x/build/kits:4002-4046,4048-4051
/trunk/build/kits:3507-3666
Property changes on: trunk/build/kits/adminshell
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/build/kits/adminshell:3535-3555
/branches/7.6.x/build/kits/adminshell:3673-3711,3754-3769
/branches/7.7.x/build/kits/adminshell:3816-3868,3876-3915,3920-3983
/branches/8.0.x/build/kits/adminshell:4002-4046
/trunk/build/kits/adminshell:3507-3666
+ /branches/7.4.x/build/kits/adminshell:3535-3555
/branches/7.6.x/build/kits/adminshell:3673-3711,3754-3769
/branches/7.7.x/build/kits/adminshell:3816-3868,3876-3915,3920-3983
/branches/8.0.x/build/kits/adminshell:4002-4046,4048-4051
/trunk/build/kits/adminshell:3507-3666
Property changes on: trunk/build/kits/jboss-as7
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/8.0.x/build/kits/jboss-as7:4048-4051
Property changes on: trunk/client/src/main/java/org/teiid/client/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/client/util:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/client/util:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/client/src/main/java/org/teiid/client/util:4002-4046*
/trunk/client/src/main/java/org/teiid/client/util:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/client/util:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/client/util:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/client/src/main/java/org/teiid/client/util:4002-4046*,4048-4051*
/trunk/client/src/main/java/org/teiid/client/util:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:4002-4046
/trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:4002-4046
/trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/client/util/ResultsFuture.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:4002-4046
/trunk/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:4002-4046
/trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/gss/MakeGSS.java
===================================================================
--- trunk/client/src/main/java/org/teiid/gss/MakeGSS.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/client/src/main/java/org/teiid/gss/MakeGSS.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -100,7 +100,7 @@
}
if (errors.length() > 0) {
- throw new LogonException(JDBCPlugin.Event.TEIID20004, errors.toString());
+ throw new LogonException(JDBCPlugin.Event.TEIID20005, errors.toString());
}
String user = props.getProperty(TeiidURL.CONNECTION.USER_NAME);
@@ -124,7 +124,7 @@
else if (result instanceof CommunicationException)
throw (CommunicationException)result;
else if (result instanceof Exception)
- throw new LogonException(JDBCPlugin.Event.TEIID20006, (Exception)result, JDBCPlugin.Util.gs(JDBCPlugin.Event.TEIID20006));
+ throw new LogonException(JDBCPlugin.Event.TEIID20005, (Exception)result, JDBCPlugin.Util.gs(JDBCPlugin.Event.TEIID20005));
return (LogonResult)result;
}
Property changes on: trunk/client/src/main/java/org/teiid/jdbc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/jdbc:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/client/src/main/java/org/teiid/jdbc:4002-4046*
/trunk/client/src/main/java/org/teiid/jdbc:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/jdbc:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/client/src/main/java/org/teiid/jdbc:4002-4046*,4048-4051*
/trunk/client/src/main/java/org/teiid/jdbc:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3188-3450,3452-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3188-3450,3452-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3188-3450,3452-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3188-3450,3452-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3188-3450,3452-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3188-3450,3452-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -42,14 +42,11 @@
TEIID20001,
TEIID20002,
TEIID20003,
- TEIID20004,
TEIID20005,
- TEIID20006,
TEIID20007,
TEIID20008,
TEIID20009,
TEIID20010,
- TEIID20011,
TEIID20012,
TEIID20013,
TEIID20014,
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3188-3450,3452-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3188-3450,3452-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:3598-3666
+ /branches/7.6.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:3598-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/RequestOptions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/client/src/main/java/org/teiid/jdbc/RequestOptions.java:3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/RequestOptions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/RequestOptions.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/RequestOptions.java:3507-3666
+ /branches/7.6.x/client/src/main/java/org/teiid/jdbc/RequestOptions.java:3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/RequestOptions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/RequestOptions.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/RequestOptions.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3188-3450,3452-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3188-3450,3452-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3220-3275,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java:3188-3450,3452-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3220-3275,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java:3188-3450,3452-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/StatementCallback.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/StatementCallback.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3598-3666
+ /branches/7.6.x/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/StatementCallback.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3598-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3149-3217,3220-3275,3281-3325,3355-3365,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3188-3450,3452-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3149-3217,3220-3275,3281-3325,3355-3365,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3188-3450,3452-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:3598-3666
+ /branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:3598-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3220-3275,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3188-3450,3452-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3220-3275,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3188-3450,3452-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:3598-3666
+ /branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:3598-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidStatement.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/net/socket:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/client/src/main/java/org/teiid/net/socket:4002-4046*
/trunk/client/src/main/java/org/teiid/net/socket:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/net/socket:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/client/src/main/java/org/teiid/net/socket:4002-4046*,4048-4051*
/trunk/client/src/main/java/org/teiid/net/socket:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/AuthenticationType.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:3598-3666
+ /branches/7.6.x/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:3598-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Handshake.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Handshake.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/Handshake.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/Handshake.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/Handshake.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/Handshake.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Handshake.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/Handshake.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/Handshake.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/Handshake.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/Handshake.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Message.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Message.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/Message.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/Message.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/Message.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/Message.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Message.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/Message.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/Message.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/Message.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/Message.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/ObjectChannel.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3188-3450,3452-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3188-3450,3452-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3507-3666
Property changes on: trunk/client/src/main/resources/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/resources/org:3535-3555*
/branches/7.6.x/client/src/main/resources/org:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/resources/org:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/client/src/main/resources/org:4002-4046*
/trunk/client/src/main/resources/org:3507-3666
+ /branches/7.4.x/client/src/main/resources/org:3535-3555*
/branches/7.6.x/client/src/main/resources/org:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/resources/org:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/client/src/main/resources/org:4002-4046*,4048-4051*
/trunk/client/src/main/resources/org:3507-3666
Property changes on: trunk/client/src/main/resources/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/client/src/main/resources/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/resources/org/teiid:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/client/src/main/resources/org/teiid:4002-4046*
/trunk/client/src/main/resources/org/teiid:3507-3666
+ /branches/7.4.x/client/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/client/src/main/resources/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/resources/org/teiid:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/client/src/main/resources/org/teiid:4002-4046*,4048-4051*
/trunk/client/src/main/resources/org/teiid:3507-3666
Property changes on: trunk/client/src/main/resources/org/teiid/jdbc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/resources/org/teiid/jdbc:3535-3555
/branches/7.6.x/client/src/main/resources/org/teiid/jdbc:3673-3711,3754-3769
/branches/7.7.x/client/src/main/resources/org/teiid/jdbc:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/resources/org/teiid/jdbc:4002-4046
/trunk/client/src/main/resources/org/teiid/jdbc:3507-3666
+ /branches/7.4.x/client/src/main/resources/org/teiid/jdbc:3535-3555
/branches/7.6.x/client/src/main/resources/org/teiid/jdbc:3673-3711,3754-3769
/branches/7.7.x/client/src/main/resources/org/teiid/jdbc:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/resources/org/teiid/jdbc:4002-4046,4048-4051
/trunk/client/src/main/resources/org/teiid/jdbc:3507-3666
Modified: trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties
===================================================================
--- trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties 2012-05-02 21:36:21 UTC (rev 4055)
@@ -152,7 +152,6 @@
no_krb_ticket=No cached kerberos ticket found and/or no password supplied
-TEIID20006=GSS Authentication failed
TEIID20005=GSS Authentication failed
TEIID20007=Duplicate class
setup_failed=Protocol error. Session setup failed.
Property changes on: trunk/client/src/main/resources/org/teiid/net
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/resources/org/teiid/net:3535-3555*
/branches/7.6.x/client/src/main/resources/org/teiid/net:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/resources/org/teiid/net:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/client/src/main/resources/org/teiid/net:4002-4046*
/trunk/client/src/main/resources/org/teiid/net:3507-3666
+ /branches/7.4.x/client/src/main/resources/org/teiid/net:3535-3555*
/branches/7.6.x/client/src/main/resources/org/teiid/net:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/resources/org/teiid/net:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/client/src/main/resources/org/teiid/net:4002-4046*,4048-4051*
/trunk/client/src/main/resources/org/teiid/net:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/client/plan
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/client/plan:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/client/plan:3673-3711*,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/plan:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/client/src/test/java/org/teiid/client/plan:4002-4046*
/trunk/client/src/test/java/org/teiid/client/plan:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/client/plan:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/client/plan:3673-3711*,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/plan:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/client/src/test/java/org/teiid/client/plan:4002-4046*,4048-4051*
/trunk/client/src/test/java/org/teiid/client/plan:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/client/plan/TestPlanNode.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:4002-4046
/trunk/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/client/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/client/util:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/client/util:3673-3711*,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/util:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/client/src/test/java/org/teiid/client/util:4002-4046*
/trunk/client/src/test/java/org/teiid/client/util:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/client/util:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/client/util:3673-3711*,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/util:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/client/src/test/java/org/teiid/client/util:4002-4046*,4048-4051*
/trunk/client/src/test/java/org/teiid/client/util:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:4002-4046
/trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/client/util/TestResultsFuture.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:4002-4046
/trunk/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/jdbc:3673-3711*,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/client/src/test/java/org/teiid/jdbc:4002-4046*
/trunk/client/src/test/java/org/teiid/jdbc:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/jdbc:3673-3711*,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/client/src/test/java/org/teiid/jdbc:4002-4046*,4048-4051*
/trunk/client/src/test/java/org/teiid/jdbc:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:3281-3325,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java:3188-3450,3452-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:3281-3325,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java:3188-3450,3452-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3220-3275,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3188-3450,3452-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3220-3275,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3188-3450,3452-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java:3188-3450,3452-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java:3188-3450,3452-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3188-3450,3452-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3188-3450,3452-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/util:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/util:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/util:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/util:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/util:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/util:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/util:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/util:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/util:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/util:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/net
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/net:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/net:3673-3711*,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/net:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/client/src/test/java/org/teiid/net:4002-4046*
/trunk/client/src/test/java/org/teiid/net:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/net:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/net:3673-3711*,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/net:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/client/src/test/java/org/teiid/net:4002-4046*,4048-4051*
/trunk/client/src/test/java/org/teiid/net:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/net/TestTeiidURL.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:4002-4046
/trunk/client/src/test/java/org/teiid/net/TestTeiidURL.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/net/TestTeiidURL.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/net/socket
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/net/socket:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/net/socket:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/net/socket:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/net/socket:4002-4046
/trunk/client/src/test/java/org/teiid/net/socket:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/net/socket:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/net/socket:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/net/socket:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/net/socket:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/net/socket:3507-3666
Property changes on: trunk/common-core/src/main/java/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org:3535-3555*
/branches/7.6.x/common-core/src/main/java/org:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/main/java/org:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/common-core/src/main/java/org:4002-4046*
/trunk/common-core/src/main/java/org:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org:3535-3555*
/branches/7.6.x/common-core/src/main/java/org:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/main/java/org:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/common-core/src/main/java/org:4002-4046*,4048-4051*
/trunk/common-core/src/main/java/org:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid:3535-3555*
/branches/7.6.x/common-core/src/main/java/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/common-core/src/main/java/org/teiid:4002-4046*
/trunk/common-core/src/main/java/org/teiid:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid:3535-3555*
/branches/7.6.x/common-core/src/main/java/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/common-core/src/main/java/org/teiid:4002-4046*,4048-4051*
/trunk/common-core/src/main/java/org/teiid:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core:3535-3555*
/branches/7.6.x/common-core/src/main/java/org/teiid/core:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/common-core/src/main/java/org/teiid/core:4002-4046*
/trunk/common-core/src/main/java/org/teiid/core:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core:3535-3555*
/branches/7.6.x/common-core/src/main/java/org/teiid/core:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/common-core/src/main/java/org/teiid/core:4002-4046*,4048-4051*
/trunk/common-core/src/main/java/org/teiid/core:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/CoreConstants.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/CoreConstants.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/CoreConstants.java:3507-3666
Modified: trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -66,11 +66,6 @@
TEIID10022,
TEIID10023,
TEIID10024,
- TEIID10025,
- TEIID10026,
- TEIID10027,
- TEIID10028,
- TEIID10029,
TEIID10030,
TEIID10031,
TEIID10032,
@@ -91,24 +86,17 @@
TEIID10047,
TEIID10048,
TEIID10049,
- TEIID10050,
TEIID10051,
TEIID10052,
TEIID10053,
TEIID10054,
- TEIID10055,
TEIID10056,
TEIID10057,
TEIID10058,
TEIID10059,
TEIID10060,
TEIID10061,
- TEIID10062,
TEIID10063,
- TEIID10064,
- TEIID10065,
- TEIID10066,
- TEIID10067,
TEIID10068,
TEIID10069,
TEIID10070,
@@ -116,11 +104,9 @@
TEIID10072,
TEIID10073,
TEIID10074,
- TEIID10075,
TEIID10076,
TEIID10077,
TEIID10078,
- TEIID10079,
TEIID10080,
TEIID10081,
}
Property changes on: trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidComponentException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidException.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidException.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/TeiidException.java:3188-3450,3452-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidException.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidException.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/TeiidException.java:3188-3450,3452-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3188-3450,3452-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3188-3450,3452-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/crypto
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/crypto:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/crypto:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/crypto:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/crypto:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/crypto:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/crypto:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/crypto:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/crypto:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/crypto:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/crypto:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types:3535-3555*
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types:4002-4046*
/trunk/common-core/src/main/java/org/teiid/core/types:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types:3535-3555*
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types:4002-4046*,4048-4051*
/trunk/common-core/src/main/java/org/teiid/core/types:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/BinaryType.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BinaryType.java:3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BinaryType.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BinaryType.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/BinaryType.java:3507-3666
+ /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BinaryType.java:3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BinaryType.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BinaryType.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/BinaryType.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3507-3666
Modified: trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -33,8 +33,6 @@
import java.sql.Clob;
import java.sql.SQLException;
-import javax.sql.rowset.serial.SerialClob;
-
import org.teiid.core.CorePlugin;
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.util.ObjectConverterUtil;
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java:3507-3666
Modified: trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -847,7 +847,7 @@
targetClass);
if (transform == null) {
Object[] params = new Object[] { sourceType, targetClass, value};
- throw new TransformationException(CorePlugin.Event.TEIID10050, CorePlugin.Util.gs(CorePlugin.Event.TEIID10050, params));
+ throw new TransformationException(CorePlugin.Event.TEIID10076, CorePlugin.Util.gs(CorePlugin.Event.TEIID10076, params));
}
T result = (T) transform.transform(value);
return getCanonicalValue(result);
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/NullType.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/NullType.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/NullType.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/NullType.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/NullType.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/NullType.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/NullType.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/NullType.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/NullType.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/NullType.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/NullType.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/Sequencable.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/SourceTransform.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/Transform.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Transform.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Transform.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Transform.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Transform.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/Transform.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Transform.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Transform.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Transform.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Transform.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/Transform.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/TransformationException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/basic
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/basic:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/basic:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/basic:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/basic:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/basic:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/basic:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/basic:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/basic:3507-3666
Modified: trunk/common-core/src/main/java/org/teiid/core/types/basic/BlobToBinaryTransform.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/types/basic/BlobToBinaryTransform.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/java/org/teiid/core/types/basic/BlobToBinaryTransform.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -51,7 +51,7 @@
byte[] bytes = ObjectConverterUtil.convertToByteArray(source.getBinaryStream(), DataTypeManager.MAX_LOB_MEMORY_BYTES, true);
return new BinaryType(bytes);
} catch (SQLException e) {
- throw new TransformationException(CorePlugin.Event.TEIID10079, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10079, new Object[] {getSourceType().getName(), getTargetType().getName()}));
+ throw new TransformationException(CorePlugin.Event.TEIID10080, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10080, new Object[] {getSourceType().getName(), getTargetType().getName()}));
} catch(IOException e) {
throw new TransformationException(CorePlugin.Event.TEIID10080, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10080, new Object[] {getSourceType().getName(), getTargetType().getName()}));
}
Modified: trunk/common-core/src/main/java/org/teiid/core/types/basic/ClobToStringTransform.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/types/basic/ClobToStringTransform.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/java/org/teiid/core/types/basic/ClobToStringTransform.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -61,9 +61,9 @@
}
return contents.toString();
} catch (SQLException e) {
- throw new TransformationException(CorePlugin.Event.TEIID10064, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10064, new Object[] {getSourceType().getName(), getTargetType().getName()}));
+ throw new TransformationException(CorePlugin.Event.TEIID10080, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10080, new Object[] {getSourceType().getName(), getTargetType().getName()}));
} catch(IOException e) {
- throw new TransformationException(CorePlugin.Event.TEIID10065, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10065, new Object[] {getSourceType().getName(), getTargetType().getName()}));
+ throw new TransformationException(CorePlugin.Event.TEIID10080, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10080, new Object[] {getSourceType().getName(), getTargetType().getName()}));
} finally {
if (reader != null) {
try {
Modified: trunk/common-core/src/main/java/org/teiid/core/types/basic/ObjectToAnyTransform.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/types/basic/ObjectToAnyTransform.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/java/org/teiid/core/types/basic/ObjectToAnyTransform.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -56,7 +56,7 @@
if (transform == null || transform instanceof ObjectToAnyTransform) {
Object[] params = new Object[] { getSourceType(), targetClass, value};
- throw new TransformationException(CorePlugin.Event.TEIID10075, CorePlugin.Util.gs(CorePlugin.Event.TEIID10075, params));
+ throw new TransformationException(CorePlugin.Event.TEIID10076, CorePlugin.Util.gs(CorePlugin.Event.TEIID10076, params));
}
try {
Modified: trunk/common-core/src/main/java/org/teiid/core/types/basic/SQLXMLToStringTransform.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/types/basic/SQLXMLToStringTransform.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/java/org/teiid/core/types/basic/SQLXMLToStringTransform.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -56,9 +56,9 @@
int read = reader.read(result);
return new String(result, 0, read);
} catch (SQLException e) {
- throw new TransformationException(CorePlugin.Event.TEIID10066, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10066, new Object[] {getSourceType().getName(), getTargetType().getName()}));
+ throw new TransformationException(CorePlugin.Event.TEIID10080, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10080, new Object[] {getSourceType().getName(), getTargetType().getName()}));
} catch (IOException e) {
- throw new TransformationException(CorePlugin.Event.TEIID10067, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10067, new Object[] {getSourceType().getName(), getTargetType().getName()}));
+ throw new TransformationException(CorePlugin.Event.TEIID10080, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10080, new Object[] {getSourceType().getName(), getTargetType().getName()}));
} finally {
try {
if (reader != null) {
Modified: trunk/common-core/src/main/java/org/teiid/core/types/basic/StringToDateTransform.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/types/basic/StringToDateTransform.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/java/org/teiid/core/types/basic/StringToDateTransform.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -58,12 +58,12 @@
result = Date.valueOf( (String) value );
} catch(Exception e) {
if (!validate && pattern.matcher((String)value).matches()) {
- throw new TransformationException(CorePlugin.Event.TEIID10062, CorePlugin.Util.gs(CorePlugin.Event.TEIID10062, value, getTargetType().getSimpleName()));
+ throw new TransformationException(CorePlugin.Event.TEIID10060, CorePlugin.Util.gs(CorePlugin.Event.TEIID10060, value, getTargetType().getSimpleName()));
}
throw new TransformationException(CorePlugin.Event.TEIID10061, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10061, value));
}
if (validate && !result.toString().equals(value)) {
- throw new TransformationException(CorePlugin.Event.TEIID10062, CorePlugin.Util.gs(CorePlugin.Event.TEIID10062, value, getTargetType().getSimpleName()));
+ throw new TransformationException(CorePlugin.Event.TEIID10060, CorePlugin.Util.gs(CorePlugin.Event.TEIID10060, value, getTargetType().getSimpleName()));
}
return result;
}
Property changes on: trunk/common-core/src/main/java/org/teiid/core/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/util:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/util:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/util:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/util:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/util:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/util:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/util:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/util:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/util:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/util:3507-3666
Modified: trunk/common-core/src/main/java/org/teiid/core/util/FileUtils.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/util/FileUtils.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/java/org/teiid/core/util/FileUtils.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -22,17 +22,7 @@
package org.teiid.core.util;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
import java.util.ArrayList;
import java.util.List;
@@ -74,12 +64,6 @@
public final static char[] SUFFIX_zip = ".zip".toCharArray(); //$NON-NLS-1$
public final static char[] SUFFIX_ZIP = ".ZIP".toCharArray(); //$NON-NLS-1$
-
- private static final String TEMP_FILE = "delete.me"; //$NON-NLS-1$
- private static final String TEMP_FILE_RENAMED = "delete.me.old"; //$NON-NLS-1$
-
-
-
static {
String tempDirPath = System.getProperty(JAVA_IO_TEMP_DIR);
TEMP_DIRECTORY = (tempDirPath.endsWith(File.separator) ? tempDirPath : tempDirPath + File.separator);
@@ -751,63 +735,6 @@
}
/**
- * Test whether it's possible to read and write files in the specified directory.
- * @param dirPath Name of the directory to test
- * @throws TeiidException
- * @since 4.3
- */
- public static void testDirectoryPermissions(String dirPath) throws TeiidException {
-
- //try to create a file
- File tmpFile = new File(dirPath + File.separatorChar + TEMP_FILE);
- boolean success = false;
- try {
- success = tmpFile.createNewFile();
- } catch (IOException e) {
- }
- if (!success) {
- final String msg = CorePlugin.Util.getString("FileUtils.Unable_to_create_file_in", dirPath); //$NON-NLS-1$
- throw new TeiidException(CorePlugin.Event.TEIID10025, msg);
- }
-
-
- //test if file can be written to
- if (!tmpFile.canWrite()) {
- final String msg = CorePlugin.Util.getString("FileUtils.Unable_to_write_file_in", dirPath); //$NON-NLS-1$
- throw new TeiidException(CorePlugin.Event.TEIID10026, msg);
- }
-
- //test if file can be read
- if (!tmpFile.canRead()) {
- final String msg = CorePlugin.Util.getString("FileUtils.Unable_to_read_file_in", dirPath); //$NON-NLS-1$
- throw new TeiidException(CorePlugin.Event.TEIID10027, msg);
- }
-
- //test if file can be renamed
- File newFile = new File(dirPath + File.separatorChar + TEMP_FILE_RENAMED);
- success = false;
- try {
- success = tmpFile.renameTo(newFile);
- } catch (Exception e) {
- }
- if (!success) {
- final String msg = CorePlugin.Util.getString("FileUtils.Unable_to_rename_file_in", dirPath); //$NON-NLS-1$
- throw new TeiidException(CorePlugin.Event.TEIID10028, msg);
- }
-
- //test if file can be deleted
- success = false;
- try {
- success = newFile.delete();
- } catch (Exception e) {
- }
- if (!success) {
- final String msg = CorePlugin.Util.getString("FileUtils.Unable_to_delete_file_in", dirPath); //$NON-NLS-1$
- throw new TeiidException(CorePlugin.Event.TEIID10029, msg);
- }
- }
-
- /**
* Rename a file.
* @param oldFilePath
* @param newFilePath
Modified: trunk/common-core/src/main/java/org/teiid/core/util/ReflectionHelper.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/util/ReflectionHelper.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/java/org/teiid/core/util/ReflectionHelper.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -23,7 +23,6 @@
package org.teiid.core.util;
import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
Modified: trunk/common-core/src/main/resources/org/teiid/core/i18n.properties
===================================================================
--- trunk/common-core/src/main/resources/org/teiid/core/i18n.properties 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/resources/org/teiid/core/i18n.properties 2012-05-02 21:36:21 UTC (rev 4055)
@@ -70,11 +70,6 @@
IDGenerator.The_stringified_ID_may_not_be_null=The stringified ID may not be null
FileUtils.The_name_of_the_file_may_not_be_null=The name of the file may not be null
FileUtils.The_file_extension_may_not_be_null=The file extension may not be null
-FileUtils.Unable_to_create_file_in=Unable to create file in \"{0}\"
-FileUtils.Unable_to_write_file_in=Unable to create file in \"{0}\"
-FileUtils.Unable_to_read_file_in=Unable to create file in \"{0}\"
-FileUtils.Unable_to_rename_file_in=Unable to create file in \"{0}\"
-FileUtils.Unable_to_delete_file_in=Unable to create file in \"{0}\"
FileUtils.File_already_exists=File "\{0}\" already exists
Property changes on: trunk/common-core/src/test/java/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org:3535-3555*
/branches/7.6.x/common-core/src/test/java/org:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/test/java/org:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/common-core/src/test/java/org:4002-4046*
/trunk/common-core/src/test/java/org:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org:3535-3555*
/branches/7.6.x/common-core/src/test/java/org:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/test/java/org:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/common-core/src/test/java/org:4002-4046*,4048-4051*
/trunk/common-core/src/test/java/org:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/common-core/src/test/java/org/teiid:4002-4046*
/trunk/common-core/src/test/java/org/teiid:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/common-core/src/test/java/org/teiid:4002-4046*,4048-4051*
/trunk/common-core/src/test/java/org/teiid:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid/core:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/common-core/src/test/java/org/teiid/core:4002-4046*
/trunk/common-core/src/test/java/org/teiid/core:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid/core:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/common-core/src/test/java/org/teiid/core:4002-4046*,4048-4051*
/trunk/common-core/src/test/java/org/teiid/core:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:4002-4046,4048-4051
/trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3188-3450,3452-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:4002-4046,4048-4051
/trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3188-3450,3452-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/crypto
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/crypto:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/crypto:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/crypto:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/crypto:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/crypto:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/crypto:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/crypto:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/crypto:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/crypto:4002-4046,4048-4051
/trunk/common-core/src/test/java/org/teiid/core/crypto:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types:4002-4046*
/trunk/common-core/src/test/java/org/teiid/core/types:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types:4002-4046*,4048-4051*
/trunk/common-core/src/test/java/org/teiid/core/types:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:4002-4046,4048-4051
/trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:4002-4046,4048-4051
/trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:4002-4046,4048-4051
/trunk/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:4002-4046,4048-4051
/trunk/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:4002-4046,4048-4051
/trunk/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:4002-4046,4048-4051
/trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/basic
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/basic:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/basic:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/basic:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/basic:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/types/basic:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/basic:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/basic:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/basic:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/basic:4002-4046,4048-4051
/trunk/common-core/src/test/java/org/teiid/core/types/basic:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/util:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/util:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/util:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/util:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/util:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/util:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/util:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/util:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/util:4002-4046,4048-4051
/trunk/common-core/src/test/java/org/teiid/core/util:3507-3666
Modified: trunk/common-core/src/test/java/org/teiid/core/util/TestFileUtils.java
===================================================================
--- trunk/common-core/src/test/java/org/teiid/core/util/TestFileUtils.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/test/java/org/teiid/core/util/TestFileUtils.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -28,6 +28,7 @@
import junit.framework.TestCase;
+import org.teiid.core.CorePlugin;
import org.teiid.core.TeiidException;
@@ -42,6 +43,8 @@
private final static String TEMP_DIR_NAME = "tempdir"; //$NON-NLS-1$
File tempDir;
+ public static final String TEMP_FILE = "delete.me"; //$NON-NLS-1$
+ public static final String TEMP_FILE_RENAMED = "delete.me.old"; //$NON-NLS-1$
private final static String TEMP_FILE_NAME = "tempfile.txt"; //$NON-NLS-1$
private final static String TEMP_FILE_NAME2 = "tempfile2.txt"; //$NON-NLS-1$
@@ -135,11 +138,11 @@
//positive case
- FileUtils.testDirectoryPermissions(TEMP_DIR_NAME);
+ TestFileUtils.testDirectoryPermissions(TEMP_DIR_NAME);
//negative case: dir doesn't exist
try {
- FileUtils.testDirectoryPermissions("fakeDir"); //$NON-NLS-1$
+ TestFileUtils.testDirectoryPermissions("fakeDir"); //$NON-NLS-1$
fail("Expected a MetaMatrixCoreException"); //$NON-NLS-1$
} catch (TeiidException e) {
}
@@ -250,5 +253,57 @@
fileSource.delete();
}
}
+
+ /**
+ * Test whether it's possible to read and write files in the specified directory.
+ * @param dirPath Name of the directory to test
+ * @throws TeiidException
+ * @since 4.3
+ */
+ public static void testDirectoryPermissions(String dirPath) throws TeiidException {
+
+ //try to create a file
+ File tmpFile = new File(dirPath + File.separatorChar + TestFileUtils.TEMP_FILE);
+ boolean success = false;
+ try {
+ success = tmpFile.createNewFile();
+ } catch (IOException e) {
+ }
+ if (!success) {
+ throw new TeiidException("cannot create file in " + dirPath); //$NON-NLS-1$
+ }
+
+ //test if file can be written to
+ if (!tmpFile.canWrite()) {
+ throw new TeiidException("cannot write " +dirPath); //$NON-NLS-1$
+ }
+
+ //test if file can be read
+ if (!tmpFile.canRead()) {
+ throw new TeiidException("cannot read " + dirPath); //$NON-NLS-1$
+ }
+
+ //test if file can be renamed
+ File newFile = new File(dirPath + File.separatorChar + TestFileUtils.TEMP_FILE_RENAMED);
+ success = false;
+ try {
+ success = tmpFile.renameTo(newFile);
+ } catch (Exception e) {
+ }
+ if (!success) {
+ throw new TeiidException("failed to rename " + dirPath); //$NON-NLS-1$
+ }
+
+ //test if file can be deleted
+ success = false;
+ try {
+ success = newFile.delete();
+ } catch (Exception e) {
+ }
+ if (!success) {
+ final String msg = CorePlugin.Util.getString("FileUtils.Unable_to_delete_file_in", dirPath); //$NON-NLS-1$
+ throw new TeiidException(msg);
+ }
+ }
}
Property changes on: trunk/common-core/src/test/java/org/teiid/query
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/query:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid/query:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/query:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/common-core/src/test/java/org/teiid/query:4002-4046*
/trunk/common-core/src/test/java/org/teiid/query:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/query:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid/query:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/query:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/common-core/src/test/java/org/teiid/query:4002-4046*,4048-4051*
/trunk/common-core/src/test/java/org/teiid/query:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/query/unittest
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/query/unittest:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/query/unittest:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/query/unittest:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/query/unittest:4002-4046
/trunk/common-core/src/test/java/org/teiid/query/unittest:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/query/unittest:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/query/unittest:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/query/unittest:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/query/unittest:4002-4046,4048-4051
/trunk/common-core/src/test/java/org/teiid/query/unittest:3507-3666
Property changes on: trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:4002-4046*
/trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:4002-4046*,4048-4051*
/trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3507-3666
Property changes on: trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3535-3555
/branches/7.6.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:4002-4046
/trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3535-3555
/branches/7.6.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:4002-4046,4048-4051
/trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3507-3666
Property changes on: trunk/connectors/connector-file/src/main/resources/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/resources/org:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org:4002-4046*
/trunk/connectors/connector-file/src/main/resources/org:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/resources/org:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org:4002-4046*,4048-4051*
/trunk/connectors/connector-file/src/main/resources/org:3507-3666
Property changes on: trunk/connectors/connector-file/src/main/resources/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid:4002-4046*
/trunk/connectors/connector-file/src/main/resources/org/teiid:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid:4002-4046*,4048-4051*
/trunk/connectors/connector-file/src/main/resources/org/teiid:3507-3666
Property changes on: trunk/connectors/connector-file/src/main/resources/org/teiid/resource
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/resource:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/resource:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/resource:4002-4046*
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/resource:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/resource:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/resource:4002-4046*,4048-4051*
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource:3507-3666
Property changes on: trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:4002-4046*
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:4002-4046*,4048-4051*
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3507-3666
Property changes on: trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:4002-4046*
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:4002-4046*,4048-4051*
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3507-3666
Property changes on: trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3535-3555
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:4002-4046
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3535-3555
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:4002-4046,4048-4051
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3507-3666
Property changes on: trunk/connectors/connector-file/src/test/java/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/test/java/org:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org:4002-4046*
/trunk/connectors/connector-file/src/test/java/org:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/test/java/org:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org:4002-4046*,4048-4051*
/trunk/connectors/connector-file/src/test/java/org:3507-3666
Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid:4002-4046*
/trunk/connectors/connector-file/src/test/java/org/teiid:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid:4002-4046*,4048-4051*
/trunk/connectors/connector-file/src/test/java/org/teiid:3507-3666
Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid/resource
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource:4002-4046*
/trunk/connectors/connector-file/src/test/java/org/teiid/resource:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource:4002-4046*,4048-4051*
/trunk/connectors/connector-file/src/test/java/org/teiid/resource:3507-3666
Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:4002-4046*
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:4002-4046*,4048-4051*
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3507-3666
Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:4002-4046*
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:4002-4046*,4048-4051*
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3507-3666
Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3535-3555
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:4002-4046
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3535-3555
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:4002-4046,4048-4051
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3507-3666
Property changes on: trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:4002-4046*
/trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3507-3666
+ /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:4002-4046*,4048-4051*
/trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3507-3666
Property changes on: trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3535-3555
/branches/7.6.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:4002-4046
/trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3507-3666
+ /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3535-3555
/branches/7.6.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:4002-4046,4048-4051
/trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3507-3666
Property changes on: trunk/connectors/connector-ws/src/main/resources/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ws/src/main/resources/org:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org:4002-4046*
/trunk/connectors/connector-ws/src/main/resources/org:3507-3666
+ /branches/7.4.x/connectors/connector-ws/src/main/resources/org:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org:4002-4046*,4048-4051*
/trunk/connectors/connector-ws/src/main/resources/org:3507-3666
Property changes on: trunk/connectors/connector-ws/src/main/resources/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid:4002-4046*
/trunk/connectors/connector-ws/src/main/resources/org/teiid:3507-3666
+ /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid:4002-4046*,4048-4051*
/trunk/connectors/connector-ws/src/main/resources/org/teiid:3507-3666
Property changes on: trunk/connectors/connector-ws/src/main/resources/org/teiid/resource
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resource:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resource:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resource:4002-4046*
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource:3507-3666
+ /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resource:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resource:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resource:4002-4046*,4048-4051*
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource:3507-3666
Property changes on: trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:4002-4046*
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3507-3666
+ /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:4002-4046*,4048-4051*
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3507-3666
Property changes on: trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:4002-4046*
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3507-3666
+ /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:4002-4046*,4048-4051*
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3507-3666
Property changes on: trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3535-3555
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:4002-4046
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3507-3666
+ /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3535-3555
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:4002-4046,4048-4051
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3507-3666
Property changes on: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:4002-4046
/trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3598-3666
+ /branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:4002-4046,4048-4051
/trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3598-3666
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCPlugin.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCPlugin.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCPlugin.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -38,7 +38,6 @@
public static enum Event implements BundleUtil.Event{
- TEIID11001, // connection details
TEIID11002, // connection creation failed
TEIID11003, // invalid hint
TEIID11004,
Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3535-3555*
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3673-3711*,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:4002-4046*
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3507-3666
+ /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3535-3555*
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3673-3711*,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:4002-4046*,4048-4051*
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3507-3666
Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:4002-4046
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3507-3666
+ /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:4002-4046,4048-4051
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3507-3666
Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:4002-4046
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3507-3666
+ /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:4002-4046,4048-4051
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3507-3666
Property changes on: trunk/connectors/translator-ldap/src/main/java/org/teiid/translator
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/translator:3535-3555*
/branches/7.6.x/connectors/translator-ldap/src/main/java/org/teiid/translator:3673-3711*,3754-3769
/branches/7.7.x/connectors/translator-ldap/src/main/java/org/teiid/translator:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/translator-ldap/src/main/java/org/teiid/translator:4002-4046*
/trunk/connectors/translator-ldap/src/main/java/org/teiid/translator:3507-3666
+ /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/translator:3535-3555*
/branches/7.6.x/connectors/translator-ldap/src/main/java/org/teiid/translator:3673-3711*,3754-3769
/branches/7.7.x/connectors/translator-ldap/src/main/java/org/teiid/translator:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/translator-ldap/src/main/java/org/teiid/translator:4002-4046*,4048-4051*
/trunk/connectors/translator-ldap/src/main/java/org/teiid/translator:3507-3666
Property changes on: trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3535-3555
/branches/7.6.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:4002-4046
/trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3507-3666
+ /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3535-3555
/branches/7.6.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:4002-4046,4048-4051
/trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/api:4002-4046*
/trunk/engine/src/main/java/org/teiid/api:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/api:4002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/api:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception:4002-4046*
/trunk/engine/src/main/java/org/teiid/api/exception:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception:4002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/api/exception:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query:4002-4046*
/trunk/engine/src/main/java/org/teiid/api/exception/query:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query:4002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/api/exception/query:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/common:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/common:4002-4046*
/trunk/engine/src/main/java/org/teiid/common:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/common:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/common:4002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/common:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer:4002-4046*
/trunk/engine/src/main/java/org/teiid/common/buffer:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer:4002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/common/buffer:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/BatchManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/BlockedException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/BufferManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3220-3275,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3220-3275,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Cache.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/Cache.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/Cache.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/CacheKey.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java:3507-3666
+ /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/SPage.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/SPage.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/SPage.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/STree.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/STree.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/STree.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/STree.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/STree.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/STree.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/STree.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/STree.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/STree.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/STree.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/STree.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Serializer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/Serializer.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/Serializer.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/StorageManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3220-3275,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3220-3275,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3149-3217,3220-3275,3340-3349,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3149-3217,3220-3275,3340-3349,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java:3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java:3507-3666
+ /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java:3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/TupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/impl
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/impl:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/impl:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/impl:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/impl:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/impl:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/impl:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/impl:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/impl:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/impl:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/impl:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -727,7 +727,7 @@
CacheEntry ce = new CacheEntry(new CacheKey(oid, 1, 1), sizeEstimate, serializer.deserialize(dis), ref, true);
return ce;
} catch(IOException e) {
- throw new TeiidComponentException(QueryPlugin.Event.TEIID30047, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30047, oid));
+ throw new TeiidComponentException(QueryPlugin.Event.TEIID30048, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30048, oid));
} catch (ClassNotFoundException e) {
throw new TeiidComponentException(QueryPlugin.Event.TEIID30048, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30048, oid));
} catch (InterruptedException e) {
Property changes on: trunk/engine/src/main/java/org/teiid/core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/core:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/core:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/core:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/core:4002-4046*
/trunk/engine/src/main/java/org/teiid/core:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/core:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/core:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/core:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/core:4002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/core:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/core/id
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/core/id:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/core/id:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/core/id:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/core/id:4002-4046
/trunk/engine/src/main/java/org/teiid/core/id:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/core/id:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/core/id:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/core/id:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/core/id:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/core/id:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -232,7 +232,7 @@
checkXAState(threadId, xid, false, false);
tc = transactions.getOrCreateTransactionContext(threadId);
if (tc.getTransactionType() != TransactionContext.Scope.NONE) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30511, XAException.XAER_PROTO, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30511));
+ throw new XATransactionException(QueryPlugin.Event.TEIID30517, XAException.XAER_PROTO, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30517));
}
tc.setTransactionTimeout(timeout);
tc.setXid(xid);
@@ -258,13 +258,13 @@
} catch (NotSupportedException e) {
throw new XATransactionException(QueryPlugin.Event.TEIID30512, XAException.XAER_INVAL, e);
} catch (WorkException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30513, XAException.XAER_INVAL, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30512, XAException.XAER_INVAL, e);
} catch (InterruptedException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30514, XAException.XAER_INVAL, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30512, XAException.XAER_INVAL, e);
} catch (ExecutionException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30515, XAException.XAER_INVAL, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30512, XAException.XAER_INVAL, e);
} catch (SystemException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30516, XAException.XAER_INVAL, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30512, XAException.XAER_INVAL, e);
}
break;
}
@@ -380,7 +380,7 @@
} catch (javax.transaction.NotSupportedException err) {
throw new XATransactionException(QueryPlugin.Event.TEIID30528, err);
} catch (SystemException err) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30529, err);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30528, err);
}
}
@@ -391,13 +391,13 @@
} catch (SecurityException e) {
throw new XATransactionException(QueryPlugin.Event.TEIID30530, e);
} catch (RollbackException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30531, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30530, e);
} catch (HeuristicMixedException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30532, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30530, e);
} catch (HeuristicRollbackException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30533, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30530, e);
} catch (SystemException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30534, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30530, e);
} finally {
transactions.removeTransactionContext(context);
}
@@ -410,7 +410,7 @@
} catch (SecurityException e) {
throw new XATransactionException(QueryPlugin.Event.TEIID30535, e);
} catch (SystemException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30536, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30535, e);
} finally {
transactions.removeTransactionContext(tc);
}
@@ -430,7 +430,7 @@
} catch (InvalidTransactionException e) {
throw new XATransactionException(QueryPlugin.Event.TEIID30538, e);
} catch (SystemException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30539, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30538, e);
}
}
Property changes on: trunk/engine/src/main/java/org/teiid/query
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query:4002-4046*
/trunk/engine/src/main/java/org/teiid/query:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query:4002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/query:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -50,10 +50,8 @@
TEIID30004, // zero size batch
TEIID30005, // rollback failed
TEIID30006, // invalid max active plans
- TEIID30007, // general process worker error
TEIID30008, // request not deterministic
TEIID30009, // max threads exceeded
- TEIID30010, // duplicate function
TEIID30011, // dependent criteria over max
TEIID30012, // mat row refresh
TEIID30013, // mat table loading
@@ -90,7 +88,6 @@
TEIID30044,
TEIID30045,
TEIID30046,
- TEIID30047,
TEIID30048,
TEIID30049,
TEIID30050,
@@ -116,15 +113,12 @@
TEIID30070,
TEIID30071,
TEIID30072,
- TEIID30073,
TEIID30074,
TEIID30075,
TEIID30076,
TEIID30077,
TEIID30078,
TEIID30079,
- TEIID30080,
- TEIID30081,
TEIID30082,
TEIID30083,
TEIID30084,
@@ -147,25 +141,13 @@
TEIID30101,
TEIID30102,
TEIID30103,
- TEIID30104,
- TEIID30105,
- TEIID30106,
- TEIID30107,
- TEIID30108,
- TEIID30109,
- TEIID30110,
- TEIID30111,
TEIID30112,
- TEIID30113,
TEIID30114,
TEIID30115,
TEIID30116,
TEIID30117,
TEIID30118,
- TEIID30119,
- TEIID30120,
TEIID30121,
- TEIID30122,
TEIID30123,
TEIID30124,
TEIID30125,
@@ -175,7 +157,6 @@
TEIID30129,
TEIID30130,
TEIID30131,
- TEIID30132,
TEIID30133,
TEIID30134,
TEIID30135,
@@ -192,15 +173,12 @@
TEIID30146,
TEIID30147,
TEIID30148,
- TEIID30149,
- TEIID30150,
TEIID30151,
TEIID30152,
TEIID30153,
TEIID30154,
TEIID30155,
TEIID30156,
- TEIID30157,
TEIID30158,
TEIID30159,
TEIID30160,
@@ -216,7 +194,6 @@
TEIID30170,
TEIID30171,
TEIID30172,
- TEIID30173,
TEIID30174,
TEIID30175,
TEIID30176,
@@ -257,8 +234,6 @@
TEIID30211,
TEIID30212,
TEIID30213,
- TEIID30214,
- TEIID30215,
TEIID30216,
TEIID30217,
TEIID30218,
@@ -271,7 +246,6 @@
TEIID30225,
TEIID30226,
TEIID30227,
- TEIID30228,
TEIID30229,
TEIID30230,
TEIID30231,
@@ -298,14 +272,9 @@
TEIID30252,
TEIID30253,
TEIID30254,
- TEIID30255,
- TEIID30256,
TEIID30257,
TEIID30258,
TEIID30259,
- TEIID30260,
- TEIID30261,
- TEIID30262,
TEIID30263,
TEIID30264,
TEIID30265,
@@ -319,11 +288,7 @@
TEIID30273,
TEIID30274,
TEIID30275,
- TEIID30276,
- TEIID30277,
TEIID30278,
- TEIID30279,
- TEIID30280,
TEIID30281,
TEIID30282,
TEIID30283,
@@ -332,17 +297,10 @@
TEIID30286,
TEIID30287,
TEIID30288,
- TEIID30289,
- TEIID30290,
- TEIID30291,
- TEIID30292,
- TEIID30293,
TEIID30294,
TEIID30295,
TEIID30296,
TEIID30297,
- TEIID30298,
- TEIID30299,
TEIID30300,
TEIID30301,
TEIID30302,
@@ -353,19 +311,12 @@
TEIID30307,
TEIID30308,
TEIID30309,
- TEIID30310,
TEIID30311,
TEIID30312,
- TEIID30313,
TEIID30314,
- TEIID30315,
TEIID30316,
- TEIID30317,
- TEIID30318,
TEIID30319,
TEIID30320,
- TEIID30321,
- TEIID30322,
TEIID30323,
TEIID30324,
TEIID30325,
@@ -375,7 +326,6 @@
TEIID30329,
TEIID30330,
TEIID30331,
- TEIID30332,
TEIID30333,
TEIID30334,
TEIID30335,
@@ -383,7 +333,6 @@
TEIID30337,
TEIID30338,
TEIID30339,
- TEIID30340,
TEIID30341,
TEIID30342,
TEIID30343,
@@ -411,7 +360,6 @@
TEIID30365,
TEIID30366,
TEIID30367,
- TEIID30368,
TEIID30369,
TEIID30370,
TEIID30371,
@@ -422,11 +370,9 @@
TEIID30376,
TEIID30377,
TEIID30378,
- TEIID30379,
TEIID30380,
TEIID30381,
TEIID30382,
- TEIID30383,
TEIID30384,
TEIID30385,
TEIID30386,
@@ -436,11 +382,7 @@
TEIID30390,
TEIID30391,
TEIID30392,
- TEIID30393,
- TEIID30394,
- TEIID30395,
TEIID30396,
- TEIID30397,
TEIID30398,
TEIID30399,
TEIID30400,
@@ -451,16 +393,13 @@
TEIID30405,
TEIID30406,
TEIID30407,
- TEIID30408,
TEIID30409,
TEIID30410,
TEIID30411,
TEIID30412,
TEIID30413,
- TEIID30414,
TEIID30415,
TEIID30416,
- TEIID30417,
TEIID30418,
TEIID30419,
TEIID30420,
@@ -491,19 +430,9 @@
TEIID30447,
TEIID30448,
TEIID30449,
- TEIID30450,
TEIID30451,
TEIID30452,
- TEIID30453,
- TEIID30454,
- TEIID30455,
- TEIID30456,
TEIID30457,
- TEIID30458,
- TEIID30459,
- TEIID30460,
- TEIID30461,
- TEIID30462,
TEIID30463,
TEIID30464,
TEIID30465,
@@ -551,12 +480,7 @@
TEIID30508,
TEIID30509,
TEIID30510,
- TEIID30511,
TEIID30512,
- TEIID30513,
- TEIID30514,
- TEIID30515,
- TEIID30516,
TEIID30517,
TEIID30518,
TEIID30519,
@@ -569,17 +493,10 @@
TEIID30526,
TEIID30527,
TEIID30528,
- TEIID30529,
TEIID30530,
- TEIID30531,
- TEIID30532,
- TEIID30533,
- TEIID30534,
TEIID30535,
- TEIID30536,
TEIID30537,
TEIID30538,
- TEIID30539,
TEIID30540,
TEIID30541,
TEIID30542,
@@ -587,7 +504,6 @@
TEIID30544,
TEIID30545,
TEIID30546,
- TEIID30547,
TEIID30548,
TEIID30549,
TEIID30550,
@@ -606,13 +522,13 @@
TEIID30563,
TEIID30564,
TEIID30565,
- TEIID30574,
TEIID30580,
TEIID30581,
TEIID30590,
TEIID30591,
- TEIID30600, TEIID30601, TEIID30602, //User defined aggregate errors
-
+ TEIID30600,
+ TEIID30601,
+ TEIID30602, //User defined aggregate errors
TEIID31069,
TEIID31070,
TEIID31071,
Property changes on: trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3816-3868,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3816-3868,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/ReplicatedObject.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/analysis
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/analysis:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/analysis:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/analysis:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/analysis:4002-4046
/trunk/engine/src/main/java/org/teiid/query/analysis:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/analysis:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/analysis:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/analysis:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/analysis:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/analysis:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/eval
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/eval:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/eval:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/eval:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/eval:4002-4046
/trunk/engine/src/main/java/org/teiid/query/eval:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/eval:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/eval:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/eval:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/eval:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/eval:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -101,7 +101,7 @@
try {
QueryResult.serialize(row, result, SaxonXQueryExpression.DEFAULT_OUTPUT_PROPERTIES);
} catch (XPathException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30310, e);
+ throw new TeiidRuntimeException(e);
}
}
}
@@ -284,7 +284,7 @@
try {
rightValue = evaluate(criteria.getRightExpression(), tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30313, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30313, "right", criteria)); //$NON-NLS-1$
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30312, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30312, "right", criteria)); //$NON-NLS-1$
}
// Shortcut if null
@@ -305,7 +305,7 @@
try {
value = evaluate(criteria.getLeftExpression(), tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30315, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30315, "left", criteria)); //$NON-NLS-1$
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30312, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30312, "left", criteria)); //$NON-NLS-1$
}
// Shortcut if null
@@ -330,7 +330,7 @@
try {
rightValue = (String) evaluate(criteria.getRightExpression(), tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30317, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30317, "right", criteria)); //$NON-NLS-1$
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30312, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30312, "right", criteria)); //$NON-NLS-1$
}
// Shortcut if null
@@ -373,7 +373,7 @@
try {
leftValue = evaluate(criteria.getExpression(), tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30318, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30318, criteria));
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30323, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30323, criteria));
}
// Shortcut if null
@@ -429,7 +429,7 @@
try {
value = evaluate((Expression) possibleValue, tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30321, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30321, possibleValue));
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30323, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30323, possibleValue));
}
} else {
value = possibleValue;
@@ -459,7 +459,7 @@
try {
value = evaluate(criteria.getExpression(), tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30322, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30322, criteria));
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30323, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30323, criteria));
}
return (value == null ^ criteria.isNegated());
@@ -765,7 +765,7 @@
}
return xmlQuery.getXQueryExpression().createXMLType(result.iter, this.context.getBufferManager(), emptyOnEmpty);
} catch (TeiidProcessingException e) {
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30332, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30332, e.getMessage()));
+ throw new FunctionExecutionException(QueryPlugin.Event.TEIID30333, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30333, e.getMessage()));
} catch (XPathException e) {
throw new FunctionExecutionException(QueryPlugin.Event.TEIID30333, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30333, e.getMessage()));
} finally {
@@ -935,7 +935,7 @@
return internalEvaluate(expr.getThenExpression(i), tuple);
}
} catch (ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30340, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30340, "CASE", expr.getWhenCriteria(i))); //$NON-NLS-1$
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30346, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30346, "CASE", expr.getWhenCriteria(i))); //$NON-NLS-1$
}
}
if (expr.getElseExpression() != null) {
Property changes on: trunk/engine/src/main/java/org/teiid/query/function
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/function:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/function:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/function:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/function:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/function:4002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/query/function:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/CharsetUtils.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -242,7 +242,7 @@
}
return importValue(result, getReturnType());
} catch(ArithmeticException e) {
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30383, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30383, getName()));
+ throw new FunctionExecutionException(QueryPlugin.Event.TEIID30384, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30384, getName()));
} catch(InvocationTargetException e) {
throw new FunctionExecutionException(QueryPlugin.Event.TEIID30384, e.getTargetException(), QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30384, getName()));
} catch(IllegalAccessException e) {
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3149-3171,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3149-3171,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionForm.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionForm.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -237,22 +237,15 @@
// ================== Function = rand=====================
- public static Object rand(CommandContext context, Object seed) throws FunctionExecutionException {
- if(context != null) {
- if(seed == null) {
- return new Double(context.getNextRand());
- } else if(seed instanceof Integer) {
- return new Double(context.getNextRand(((Integer)seed).longValue()));
- }
- }
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30393, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30393, "rand", seed)); //$NON-NLS-1$
+ public static Object rand(CommandContext context, Integer seed) {
+ if(seed == null) {
+ return new Double(context.getNextRand());
+ }
+ return new Double(context.getNextRand(seed.longValue()));
}
- public static Object rand(CommandContext context) throws FunctionExecutionException {
- if(context != null) {
- return new Double(context.getNextRand());
- }
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30394, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30394, "rand"));//$NON-NLS-1$
+ public static Object rand(CommandContext context) {
+ return new Double(context.getNextRand());
}
// ================== Function = mod =====================
@@ -462,12 +455,11 @@
// ================== Function = quarter =====================
- public static Object quarter(Date date)
- throws FunctionExecutionException {
+ public static Object quarter(Date date) {
int month = getField(date, Calendar.MONTH);
if (month > 11) {
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30395, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30395, "quarter", date.getClass().getName())); //$NON-NLS-1$
+ throw new AssertionError("Invalid month for " + date); //$NON-NLS-1$
}
return Integer.valueOf(month/3 + 1);
}
@@ -667,7 +659,7 @@
throws FunctionExecutionException {
int countValue = count.intValue();
if(countValue < 0) {
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30397, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30397, countValue));
+ throw new FunctionExecutionException(QueryPlugin.Event.TEIID30396, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30396, countValue));
} else if(string.length() < countValue) {
return string;
} else {
@@ -1032,7 +1024,7 @@
public static Object rowlimitexception(Object expression)
throws FunctionExecutionException {
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30408, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30408));
+ throw new FunctionExecutionException(QueryPlugin.Event.TEIID30407, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30407));
}
// ================== Function = lookup =====================
@@ -1432,7 +1424,7 @@
if (array instanceof java.sql.Array) {
return Array.getLength(((java.sql.Array)array).getArray());
}
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30417, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30417, array.getClass()));
+ throw new FunctionExecutionException(QueryPlugin.Event.TEIID30416, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30416, array.getClass()));
}
}
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionTree.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3149-3171,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3149-3171,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/UDFSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/UDFSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/UDFSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/UDFSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/UDFSource.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/UDFSource.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/UDFSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/UDFSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/UDFSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/UDFSource.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/UDFSource.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/aggregate
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/aggregate:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/aggregate:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/aggregate:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/aggregate:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/aggregate:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/aggregate:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/aggregate:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/aggregate:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/aggregate:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/aggregate:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/metadata
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/metadata:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/metadata:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/metadata:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/metadata:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/metadata:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/metadata:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/metadata:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/metadata:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/metadata:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/metadata:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/source
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/source:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/source:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/source:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/source:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/source:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/source:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/source:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/source:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/source:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/source:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/mapping
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/mapping:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/mapping:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/mapping:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/mapping:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/mapping:4002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/query/mapping:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/mapping/relational
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/relational:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping/relational:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/mapping/relational:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/relational:4002-4046
/trunk/engine/src/main/java/org/teiid/query/mapping/relational:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/relational:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping/relational:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/mapping/relational:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/relational:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/mapping/relational:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/mapping/xml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/xml:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping/xml:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/mapping/xml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/xml:4002-4046
/trunk/engine/src/main/java/org/teiid/query/mapping/xml:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/xml:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping/xml:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/mapping/xml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/xml:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/mapping/xml:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingChoiceNode.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingChoiceNode.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingChoiceNode.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -90,18 +90,18 @@
}
public MappingChoiceNode addChoiceNode(MappingChoiceNode elem) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30453, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30453));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30452, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30452));
}
public MappingSequenceNode addSequenceNode(MappingSequenceNode elem) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30454, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30454));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30452, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30452));
}
public MappingElement addChildElement(MappingElement elem) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30455, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30455));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30452, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30452));
}
public MappingSourceNode addSourceNode(MappingSourceNode elem) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30456, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30456));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30452, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30452));
}
}
Modified: trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingDocument.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingDocument.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingDocument.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -23,6 +23,7 @@
package org.teiid.query.mapping.xml;
import org.teiid.core.TeiidRuntimeException;
+import org.teiid.core.util.Assertion;
import org.teiid.query.QueryPlugin;
@@ -120,30 +121,26 @@
}
public MappingAllNode addAllNode(MappingAllNode elem) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30458, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30458));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30452, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30452));
}
public MappingChoiceNode addChoiceNode(MappingChoiceNode elem) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30459, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30459));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30452, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30452));
}
public MappingSequenceNode addSequenceNode(MappingSequenceNode elem) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30460, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30460));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30452, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30452));
}
public MappingElement addChildElement(MappingElement elem) {
- if (elem == null) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30461, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30461));
- }
+ Assertion.isNotNull(elem);
fixCardinality(elem);
setRoot(elem);
return elem;
}
public MappingSourceNode addSourceNode(MappingSourceNode elem) {
- if (elem == null) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30462, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30462));
- }
+ Assertion.isNotNull(elem);
setRoot(elem);
return elem;
}
Property changes on: trunk/engine/src/main/java/org/teiid/query/metadata
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/metadata:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/metadata:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/metadata:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/metadata:4002-4046
/trunk/engine/src/main/java/org/teiid/query/metadata:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/metadata:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/metadata:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/metadata:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/metadata:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/metadata:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/optimizer:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer:4002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/query/optimizer:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/capabilities:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/capabilities:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/capabilities:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/capabilities:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/capabilities:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/capabilities:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/capabilities:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/capabilities:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational:4002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3188-3450,3452-3666
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -649,10 +649,10 @@
} else if (subqueryContainer instanceof ExistsCriteria) {
((ExistsCriteria) subqueryContainer).setShouldEvaluate(true);
} else {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30255, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30255, container));
+ throw new QueryPlannerException(QueryPlugin.Event.TEIID30253, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30253, container));
}
} else {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30256, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30256, container));
+ throw new QueryPlannerException(QueryPlugin.Event.TEIID30253, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30253, container));
}
}
ProcessorPlan plan = QueryOptimizer.optimizePlan(subqueryContainer.getCommand(), metadata, null, capFinder, analysisRecord, context);
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3673-3711,3754-3769,3776-3813
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3673-3711,3754-3769,3776-3813
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/FrameUtil.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/FrameUtil.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/FrameUtil.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -298,9 +298,9 @@
}
}
} catch(TeiidProcessingException e) {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30260, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30260, ses));
+ throw new QueryPlannerException(QueryPlugin.Event.TEIID30263, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30263, ses));
} catch (TeiidComponentException e) {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30261, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30261, ses));
+ throw new QueryPlannerException(QueryPlugin.Event.TEIID30263, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30263, ses));
}
}
@@ -337,7 +337,7 @@
try {
return QueryRewriter.rewriteCriteria(criteria, null, metadata);
} catch(TeiidProcessingException e) {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30262, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30262, criteria));
+ throw new QueryPlannerException(QueryPlugin.Event.TEIID30263, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30263, criteria));
} catch (TeiidComponentException e) {
throw new QueryPlannerException(QueryPlugin.Event.TEIID30263, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30263, criteria));
}
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanJoins.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanJoins.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanJoins.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -22,16 +22,7 @@
package org.teiid.query.optimizer.relational.rules;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.api.exception.query.QueryPlannerException;
@@ -376,7 +367,7 @@
private void planForDependencies(JoinRegion joinRegion) throws QueryPlannerException {
if (joinRegion.getJoinSourceNodes().isEmpty()) {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30276, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30276, joinRegion.getUnsatisfiedAccessPatterns()));
+ throw new QueryPlannerException(QueryPlugin.Event.TEIID30275, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30275, joinRegion.getUnsatisfiedAccessPatterns()));
}
HashSet<GroupSymbol> currentGroups = new HashSet<GroupSymbol>();
@@ -435,7 +426,7 @@
}
if (!dependentNodes.isEmpty()) {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30277, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30277, joinRegion.getUnsatisfiedAccessPatterns()));
+ throw new QueryPlannerException(QueryPlugin.Event.TEIID30275, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30275, joinRegion.getUnsatisfiedAccessPatterns()));
}
}
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/xml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/xml:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/xml:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/xml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/xml:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/xml:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/xml:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/xml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/xml:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/xml/NameInSourceResolverVisitor.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/xml/NameInSourceResolverVisitor.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/xml/NameInSourceResolverVisitor.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -31,7 +31,6 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.types.DataTypeManager;
-import org.teiid.query.QueryPlugin;
import org.teiid.query.mapping.xml.MappingAttribute;
import org.teiid.query.mapping.xml.MappingDocument;
import org.teiid.query.mapping.xml.MappingElement;
@@ -118,9 +117,9 @@
symbol.setType(DataTypeManager.getDataTypeClass(metadata.getElementType(symbol.getMetadataID())));
return symbol;
} catch (QueryMetadataException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30279, e);
+ throw new TeiidRuntimeException(e);
} catch (TeiidComponentException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30280, e);
+ throw new TeiidRuntimeException(e);
}
}
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/xml/SourceNodePlannerVisitor.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/xml/SourceNodePlannerVisitor.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/xml/SourceNodePlannerVisitor.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -33,7 +33,6 @@
import org.teiid.api.exception.query.QueryPlannerException;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidRuntimeException;
-import org.teiid.query.QueryPlugin;
import org.teiid.query.mapping.relational.QueryNode;
import org.teiid.query.mapping.xml.MappingDocument;
import org.teiid.query.mapping.xml.MappingNode;
@@ -184,7 +183,7 @@
baseQuery.setCriteria(inputSetCriteria);
rsInfo.setCriteriaRaised(true);
} catch (Exception e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30289, e);
+ throw new TeiidRuntimeException(e);
}
}
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/xml/ValidateMappedCriteriaVisitor.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/xml/ValidateMappedCriteriaVisitor.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/xml/ValidateMappedCriteriaVisitor.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -28,7 +28,6 @@
import org.teiid.api.exception.query.QueryPlannerException;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidRuntimeException;
-import org.teiid.query.QueryPlugin;
import org.teiid.query.mapping.xml.MappingCriteriaNode;
import org.teiid.query.mapping.xml.MappingDocument;
import org.teiid.query.mapping.xml.MappingRecursiveElement;
@@ -76,7 +75,7 @@
ResolverVisitor.resolveLanguageObject(crit, null, planEnv.getGlobalMetadata());
return crit;
} catch (Exception e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30290, e);
+ throw new TeiidRuntimeException(e);
}
}
return null;
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPlanner.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPlanner.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPlanner.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -293,7 +293,7 @@
// in the orderby. static nodes do not qualify for ordering.
if (elementNode.getNameInSource() == null){
Object[] params = new Object[] {elementNode, orderBy};
- String msg = QueryPlugin.Util.getString("XMLPlanner.The_XML_document_element_{0}_is_not_mapped_to_data_and_cannot_be_used_in_the_ORDER_BY_clause__{1}_1", params); //$NON-NLS-1$
+ String msg = QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30288, params);
throw new QueryPlannerException(QueryPlugin.Event.TEIID30288, msg);
}
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLProjectionMinimizer.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLProjectionMinimizer.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLProjectionMinimizer.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -31,7 +31,6 @@
import org.teiid.core.TeiidException;
import org.teiid.core.TeiidRuntimeException;
-import org.teiid.query.QueryPlugin;
import org.teiid.query.mapping.relational.QueryNode;
import org.teiid.query.mapping.xml.MappingAttribute;
import org.teiid.query.mapping.xml.MappingCriteriaNode;
@@ -104,7 +103,7 @@
MappingSourceNode parent = element.getParentSourceNode();
collectElementSymbols(element, bindings, parent);
} catch (TeiidException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30298, e);
+ throw new TeiidRuntimeException(e);
}
}
@@ -176,7 +175,7 @@
}
}
} catch (TeiidException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30299, e);
+ throw new TeiidRuntimeException(e);
}
}
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLQueryPlanner.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLQueryPlanner.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLQueryPlanner.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -106,7 +106,7 @@
}
} catch (Exception e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30292, e);
+ throw new TeiidRuntimeException(e);
}
}
@@ -132,7 +132,7 @@
ProcessorPlan queryPlan = optimizePlan(cmd, planEnv);
rsInfo.setPlan(queryPlan);
} catch (Exception e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30293, e);
+ throw new TeiidRuntimeException(e);
}
}
};
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLStagaingQueryPlanner.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLStagaingQueryPlanner.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLStagaingQueryPlanner.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -38,7 +38,6 @@
import org.teiid.core.TeiidRuntimeException;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.query.QueryPlugin;
import org.teiid.query.mapping.relational.QueryNode;
import org.teiid.query.mapping.xml.MappingBaseNode;
import org.teiid.query.mapping.xml.MappingDocument;
@@ -53,17 +52,7 @@
import org.teiid.query.resolver.QueryResolver;
import org.teiid.query.resolver.util.ResolverUtil;
import org.teiid.query.resolver.util.ResolverVisitor;
-import org.teiid.query.sql.lang.Command;
-import org.teiid.query.sql.lang.CompareCriteria;
-import org.teiid.query.sql.lang.Criteria;
-import org.teiid.query.sql.lang.ExistsCriteria;
-import org.teiid.query.sql.lang.From;
-import org.teiid.query.sql.lang.GroupBy;
-import org.teiid.query.sql.lang.Insert;
-import org.teiid.query.sql.lang.Option;
-import org.teiid.query.sql.lang.Query;
-import org.teiid.query.sql.lang.Select;
-import org.teiid.query.sql.lang.UnaryFromClause;
+import org.teiid.query.sql.lang.*;
import org.teiid.query.sql.symbol.Constant;
import org.teiid.query.sql.symbol.ElementSymbol;
import org.teiid.query.sql.symbol.Expression;
@@ -87,7 +76,7 @@
try {
stagePlannedQuery(sourceNode, planEnv);
} catch (Exception e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30291, e);
+ throw new TeiidRuntimeException(e);
}
}
};
Property changes on: trunk/engine/src/main/java/org/teiid/query/parser
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/parser:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/parser:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/parser:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/parser:4002-4046
/trunk/engine/src/main/java/org/teiid/query/parser:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/parser:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/parser:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/parser:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/parser:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/parser:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -148,7 +148,7 @@
throw convertParserException(pe);
} catch(TokenMgrError tme) {
if(sql.startsWith(XML_OPEN_BRACKET) || sql.startsWith(XQUERY_DECLARE)) {
- throw new QueryParserException(QueryPlugin.Event.TEIID30379, tme, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30379, sql));
+ throw new QueryParserException(QueryPlugin.Event.TEIID30378, tme, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30378, sql));
}
throw handleTokenMgrError(tme);
}
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/processor:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor:4002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/query/processor:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/BatchIterator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -99,14 +99,14 @@
if (obj.getEnabled() == null) {
if (obj.isCreate()) {
if (getPlanForEvent(t, event) != null) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30156, new TeiidProcessingException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30156, t.getName(), obj.getEvent())));
+ throw new TeiidRuntimeException(new TeiidProcessingException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30156, t.getName(), obj.getEvent())));
}
} else if (getPlanForEvent(t, event) == null) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30157, new TeiidProcessingException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30157, t.getName(), obj.getEvent())));
+ throw new TeiidRuntimeException(new TeiidProcessingException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30158, t.getName(), obj.getEvent())));
}
sql = obj.getDefinition().toString();
} else if (getPlanForEvent(t, event) == null) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30158, new TeiidProcessingException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30158, t.getName(), obj.getEvent())));
+ throw new TeiidRuntimeException(new TeiidProcessingException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30158, t.getName(), obj.getEvent())));
}
if (getMetadataRepository(vdb, t.getParent().getName()) != null) {
if (sql != null) {
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3816-3868,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3816-3868,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3816-3868,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3816-3868,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3220-3275,3340-3349,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3220-3275,3340-3349,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/proc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/proc:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/proc:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/proc:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/proc:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/proc:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/proc:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/proc:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/proc:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/proc:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/proc:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/processor/proc/ErrorInstruction.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/processor/proc/ErrorInstruction.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/processor/proc/ErrorInstruction.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -22,7 +22,7 @@
package org.teiid.query.processor.proc;
-import static org.teiid.query.analysis.AnalysisRecord.PROP_EXPRESSION;
+import static org.teiid.query.analysis.AnalysisRecord.*;
import org.teiid.client.ProcedureErrorInstructionException;
import org.teiid.client.plan.PlanNode;
@@ -77,7 +77,7 @@
TeiidProcessingException {
Object value = env.evaluateExpression(expression);
LogManager.logTrace(org.teiid.logging.LogConstants.CTX_DQP, new Object[] {"Processing RaiseErrorInstruction with the value :", value}); //$NON-NLS-1$
- throw new ProcedureErrorInstructionException(QueryPlugin.Event.TEIID30167, ERROR_PREFIX + (value != null ? value.toString() : ""));
+ throw new ProcedureErrorInstructionException(QueryPlugin.Event.TEIID30167, ERROR_PREFIX + (value != null ? value.toString() : "")); //$NON-NLS-1$
}
}
\ No newline at end of file
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/relational
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/relational:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/relational:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/relational:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/relational:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/relational:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/relational:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -332,7 +332,7 @@
this.notifyAll();
}
} catch (TeiidException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30173, e);
+ throw new TeiidRuntimeException(e);
}
}
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/xml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/xml:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/xml:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/xml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/xml:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/xml:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/xml:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/xml:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/xml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/xml:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/xml:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -287,7 +287,7 @@
} else if(namespacePrefix.equals(MappingNodeConstants.INSTANCES_NAMESPACE_PREFIX)) {
uri = MappingNodeConstants.INSTANCES_NAMESPACE;
}else {
- String msg = QueryPlugin.Util.getString("XMLPlanner.no_uri", new Object[] {namespacePrefix, name}); //$NON-NLS-1$
+ String msg = QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30213, new Object[] {namespacePrefix, name}); //$NON-NLS-1$
throw new TeiidComponentException(QueryPlugin.Event.TEIID30213, msg);
}
}
Modified: trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLContext.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLContext.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLContext.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -77,13 +77,7 @@
* @return
*/
public List<?> getCurrentRow(String aliasResultName) throws TeiidComponentException, TeiidProcessingException {
- PlanExecutor executor = this.resultsMap.get(aliasResultName);
- if (executor == null) {
- if (this.parentContext != null) {
- return this.parentContext.getCurrentRow(aliasResultName);
- }
- throw new TeiidComponentException(QueryPlugin.Event.TEIID30214, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30214, aliasResultName));
- }
+ PlanExecutor executor = getExecutor(aliasResultName);
return executor.currentRow();
}
@@ -94,13 +88,7 @@
* @throws TeiidComponentException
*/
public List<?> getNextRow(String aliasResultName) throws TeiidComponentException, TeiidProcessingException {
- PlanExecutor executor = this.resultsMap.get(aliasResultName);
- if (executor == null) {
- if (this.parentContext != null) {
- return this.parentContext.getNextRow(aliasResultName);
- }
- throw new TeiidComponentException(QueryPlugin.Event.TEIID30215, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30215, aliasResultName));
- }
+ PlanExecutor executor = getExecutor(aliasResultName);
return executor.nextRow();
}
@@ -132,15 +120,21 @@
* @throws TeiidComponentException
*/
public List<?> getOutputElements(String resultName) throws TeiidComponentException {
- PlanExecutor executor = this.resultsMap.get(resultName);
+ PlanExecutor executor = getExecutor(resultName);
+ return executor.getOutputElements();
+ }
+
+ private PlanExecutor getExecutor(String resultName)
+ throws TeiidComponentException {
+ PlanExecutor executor = this.resultsMap.get(resultName);
if (executor == null) {
if (this.parentContext != null) {
- return this.parentContext.getOutputElements(resultName);
+ return this.parentContext.getExecutor(resultName);
}
throw new TeiidComponentException(QueryPlugin.Event.TEIID30216, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30216, resultName));
}
- return executor.getOutputElements();
- }
+ return executor;
+ }
/**
Property changes on: trunk/engine/src/main/java/org/teiid/query/report
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/report:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/report:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/report:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/report:4002-4046
/trunk/engine/src/main/java/org/teiid/query/report:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/report:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/report:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/report:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/report:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/report:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/resolver:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver:4002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/query/resolver:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/command
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/command:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/command:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/command:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/command:4002-4046
/trunk/engine/src/main/java/org/teiid/query/resolver/command:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/command:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/command:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/command:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/command:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/resolver/command:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/resolver/command/SimpleQueryResolver.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/resolver/command/SimpleQueryResolver.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/resolver/command/SimpleQueryResolver.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -210,7 +210,7 @@
try {
ResolverUtil.resolveGroup(obj, metadata);
} catch (TeiidException err) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30104, err);
+ throw new TeiidRuntimeException(err);
}
}
@@ -223,7 +223,7 @@
try {
QueryResolver.resolveCommand(command, metadata.getMetadata(), false);
} catch (TeiidException err) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30105, err);
+ throw new TeiidRuntimeException(err);
}
}
@@ -240,7 +240,7 @@
}
obj.setElementSymbols(elementSymbols);
} catch (TeiidException err) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30106, err);
+ throw new TeiidRuntimeException(err);
}
}
@@ -288,7 +288,7 @@
try {
obj.setFile(ResolverUtil.convertExpression(obj.getFile(), DataTypeManager.DefaultDataTypes.CLOB, metadata));
} catch (QueryResolverException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30107, e);
+ throw new TeiidRuntimeException(e);
}
postTableFunctionReference(obj, saved);
//set to fixed width if any column has width specified
@@ -324,7 +324,7 @@
column.setDefaultExpression(ex);
}
} catch (TeiidException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30108, e);
+ throw new TeiidRuntimeException(e);
}
}
@@ -357,7 +357,7 @@
try {
ResolverUtil.addTempGroup(metadata, obj.getGroupSymbol(), obj.getProjectedSymbols(), false);
} catch (QueryResolverException err) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30109, err);
+ throw new TeiidRuntimeException(err);
}
obj.getGroupSymbol().setMetadataID(metadata.getMetadataStore().getTempGroupID(obj.getGroupSymbol().getName()));
//now resolve the projected symbols
@@ -367,7 +367,7 @@
try {
ResolverVisitor.resolveLanguageObject(symbol, groups, null, metadata);
} catch (TeiidException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30110, e);
+ throw new TeiidRuntimeException(e);
}
}
}
@@ -383,7 +383,7 @@
try {
ResolverUtil.addTempGroup(metadata, obj.getGroupSymbol(), obj.getCommand().getProjectedSymbols(), false);
} catch (QueryResolverException err) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30111, err);
+ throw new TeiidRuntimeException(err);
}
obj.getGroupSymbol().setMetadataID(metadata.getMetadataStore().getTempGroupID(obj.getGroupSymbol().getName()));
}
@@ -400,7 +400,7 @@
createProcRelational(obj);
}
} catch(TeiidException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30113, e);
+ throw new TeiidRuntimeException(e);
}
}
@@ -524,9 +524,9 @@
for (GroupSymbol group : discoveredGroups) {
if (!this.currentGroups.add(group)) {
String msg = QueryPlugin.Util.getString("ERR.015.008.0046", group.getName()); //$NON-NLS-1$
- QueryResolverException qre = new QueryResolverException(msg);
+ QueryResolverException qre = new QueryResolverException(QueryPlugin.Event.TEIID30115, msg);
qre.addUnresolvedSymbol(new UnresolvedSymbolDescription(group.toString(), msg));
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30115, qre);
+ throw new TeiidRuntimeException(qre);
}
}
discoveredGroups.clear();
Modified: trunk/engine/src/main/java/org/teiid/query/resolver/command/TempTableResolver.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/resolver/command/TempTableResolver.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/resolver/command/TempTableResolver.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -73,13 +73,13 @@
throw new QueryResolverException(QueryPlugin.Event.TEIID30118, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30118, group.getName()));
}
if (metadata.getMetadata().hasProcedure(group.getName())) {
- throw new QueryResolverException(QueryPlugin.Event.TEIID30119, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30119, group.getName()));
+ throw new QueryResolverException(QueryPlugin.Event.TEIID30118, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30118, group.getName()));
}
//now we will be more specific for temp groups
TempMetadataID id = metadata.getMetadataStore().getTempGroupID(group.getName());
if (id != null && !metadata.isTemporaryTable(id)) {
- throw new QueryResolverException(QueryPlugin.Event.TEIID30120, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30120, group.getName()));
+ throw new QueryResolverException(QueryPlugin.Event.TEIID30118, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30118, group.getName()));
}
//if we get here then either the group does not exist or has already been defined as a temp table
//if it has been defined as a temp table, that's ok we'll use this as the new definition and throw an
Modified: trunk/engine/src/main/java/org/teiid/query/resolver/command/UpdateProcedureResolver.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/resolver/command/UpdateProcedureResolver.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/resolver/command/UpdateProcedureResolver.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -203,7 +203,7 @@
AssignmentStatement assStmt = (AssignmentStatement)statement;
ResolverVisitor.resolveLanguageObject(assStmt.getVariable(), null, externalGroups, metadata);
if (!metadata.elementSupports(assStmt.getVariable().getMetadataID(), SupportConstants.Element.UPDATE)) {
- throw new QueryResolverException(QueryPlugin.Event.TEIID30122, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30122, assStmt.getVariable()));
+ throw new QueryResolverException(QueryPlugin.Event.TEIID30121, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30121, assStmt.getVariable()));
}
//don't allow variable assignments to be external
assStmt.getVariable().setIsExternalReference(false);
Modified: trunk/engine/src/main/java/org/teiid/query/resolver/command/XMLQueryResolver.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/resolver/command/XMLQueryResolver.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/resolver/command/XMLQueryResolver.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -295,7 +295,7 @@
try {
ResolverUtil.addTempGroup(metadata, new GroupSymbol(baseNode.getFullyQualifiedName()), Collections.EMPTY_LIST, false).setMetadataType(Type.XML);
} catch (QueryResolverException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30132, e);
+ throw new TeiidRuntimeException(e);
}
}
}
Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/util:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/util:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/util:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/util:4002-4046
/trunk/engine/src/main/java/org/teiid/query/resolver/util:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/util:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/util:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/util:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/util:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/resolver/util:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -672,7 +672,7 @@
if (commonType == null) {
// Neither are aggs, but types can't be reconciled
- throw new QueryResolverException(QueryPlugin.Event.TEIID30073, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30073, new Object[] { leftTypeName, rightTypeName, ccrit }));
+ throw new QueryResolverException(QueryPlugin.Event.TEIID30072, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30072, new Object[] { leftTypeName, rightTypeName, ccrit }));
}
ccrit.setLeftExpression(ResolverUtil.convertExpression(leftExpression, leftTypeName, commonType, metadata) );
ccrit.setRightExpression(ResolverUtil.convertExpression(rightExpression, rightTypeName, commonType, metadata) );
@@ -855,7 +855,7 @@
}
String thenTypeName = ResolverUtil.getCommonType((String[])thenTypeNames.toArray(new String[thenTypeNames.size()]));
if (thenTypeName == null) {
- throw new QueryResolverException(QueryPlugin.Event.TEIID30080, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30080, "THEN/ELSE", obj));//$NON-NLS-1$
+ throw new QueryResolverException(QueryPlugin.Event.TEIID30079, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30079, "THEN/ELSE", obj));//$NON-NLS-1$
}
obj.setExpression(ResolverUtil.convertExpression(obj.getExpression(), whenTypeName, metadata));
ArrayList whens = new ArrayList(whenCount);
@@ -941,7 +941,7 @@
// 3. Perform implicit type conversions
String thenTypeName = ResolverUtil.getCommonType(thenTypeNames.toArray(new String[thenTypeNames.size()]));
if (thenTypeName == null) {
- throw new QueryResolverException(QueryPlugin.Event.TEIID30081, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30081, "THEN/ELSE", obj)); //$NON-NLS-1$
+ throw new QueryResolverException(QueryPlugin.Event.TEIID30079, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30079, "THEN/ELSE", obj)); //$NON-NLS-1$
}
ArrayList thens = new ArrayList(whenCount);
for (int i = 0; i < whenCount; i++) {
Property changes on: trunk/engine/src/main/java/org/teiid/query/rewriter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/rewriter:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/rewriter:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/rewriter:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/rewriter:4002-4046
/trunk/engine/src/main/java/org/teiid/query/rewriter:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/rewriter:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/rewriter:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/rewriter:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/rewriter:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/rewriter:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -541,7 +541,7 @@
try {
return rewriteExpressionDirect(element);
} catch (TeiidException err) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30368, err);
+ throw new TeiidRuntimeException(err);
}
}
};
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/sql:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql:4002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/query/sql:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/LanguageObject.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/lang
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/lang:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/lang:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/lang:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/lang:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/lang:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/lang:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/lang:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/lang:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/lang:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/sql/lang:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/sql/lang/MatchCriteria.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/sql/lang/MatchCriteria.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/sql/lang/MatchCriteria.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -340,7 +340,7 @@
}
if (escaped) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30450, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30450, new Object[] {pattern, new Character(escape)}));
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30449, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30449, new Object[] {pattern, new Character(escape)}));
}
if (!endsWithMatchAny) {
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/navigator
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/navigator:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/navigator:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/navigator:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/navigator:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/navigator:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/navigator:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/navigator:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/navigator:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/navigator:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/sql/navigator:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/proc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/proc:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/proc:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/proc:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/proc:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/proc:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/proc:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/proc:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/proc:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/proc:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/sql/proc:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/symbol
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/symbol:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/symbol:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/symbol:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/symbol:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/symbol:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/symbol:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/symbol:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/symbol:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/symbol:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/sql/symbol:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/util:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/util:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/util:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/util:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/util:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/util:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/util:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/util:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/util:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/sql/util:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/visitor
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/visitor:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/visitor:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/visitor:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/visitor:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/visitor:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/visitor:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/visitor:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/visitor:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/visitor:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/sql/visitor:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/tempdata
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/tempdata:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/tempdata:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/tempdata:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/tempdata:4002-4046
/trunk/engine/src/main/java/org/teiid/query/tempdata:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/tempdata:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/tempdata:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/tempdata:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/tempdata:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/tempdata:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableStore.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableStore.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableStore.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -336,7 +336,7 @@
return tempTable;
}
} else if (tempTable.getActive().get() != 0) {
- throw new TeiidProcessingException(QueryPlugin.Event.TEIID30228, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30228, tempTableID));
+ throw new TeiidProcessingException(QueryPlugin.Event.TEIID30227, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30227, tempTableID));
}
}
} else if (transactionMode == TransactionMode.ISOLATE_READS) {
Property changes on: trunk/engine/src/main/java/org/teiid/query/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/util:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/util:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/util:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/util:4002-4046
/trunk/engine/src/main/java/org/teiid/query/util:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/util:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/util:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/util:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/util:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/util:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/validator
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/validator:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/validator:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/validator:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/validator:4002-4046
/trunk/engine/src/main/java/org/teiid/query/validator:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/validator:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/validator:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/validator:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/validator:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/validator:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/xquery
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/xquery:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/xquery:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/xquery:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/xquery:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/xquery:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/xquery:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/xquery:4002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/query/xquery:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/xquery/saxon
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery/saxon:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/xquery/saxon:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/xquery/saxon:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/xquery/saxon:4002-4046
/trunk/engine/src/main/java/org/teiid/query/xquery/saxon:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery/saxon:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/xquery/saxon:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/xquery/saxon:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/xquery/saxon:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/xquery/saxon:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/xquery/saxon/XQueryEvaluator.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/xquery/saxon/XQueryEvaluator.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/xquery/saxon/XQueryEvaluator.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -127,9 +127,9 @@
if (e.getCause() instanceof TeiidRuntimeException) {
RelationalNode.unwrapException((TeiidRuntimeException)e.getCause());
}
- throw new TeiidProcessingException(QueryPlugin.Event.TEIID30149, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30149));
+ throw new TeiidProcessingException(QueryPlugin.Event.TEIID30151, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30151));
} catch (IOException e) {
- throw new TeiidProcessingException(QueryPlugin.Event.TEIID30150, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30150));
+ throw new TeiidProcessingException(QueryPlugin.Event.TEIID30151, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30151));
} finally {
if (!isNonBlocking) {
commandContext.setNonBlocking(false);
Property changes on: trunk/engine/src/main/java/org/teiid/vdb
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/vdb:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/vdb:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/vdb:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/vdb:4002-4046*
/trunk/engine/src/main/java/org/teiid/vdb:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/vdb:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/vdb:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/vdb:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/vdb:4002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/vdb:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/vdb/runtime
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/vdb/runtime:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/vdb/runtime:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/vdb/runtime:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/vdb/runtime:4002-4046
/trunk/engine/src/main/java/org/teiid/vdb/runtime:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/vdb/runtime:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/vdb/runtime:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/vdb/runtime:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/vdb/runtime:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/vdb/runtime:3507-3666
Modified: trunk/engine/src/main/resources/org/teiid/query/i18n.properties
===================================================================
--- trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2012-05-02 21:36:21 UTC (rev 4055)
@@ -29,15 +29,13 @@
TEIID30384=Error while evaluating function {0}
TEIID30385=Unable to access function implementation for [{0}]
ERR.015.001.0005=ERROR loading system functions: {0}
-TEIID30397=Left count is invalid: {0}
TEIID30402=Pad length must be > 0.
TEIID30403=Pad string for lpad/rpad must have length greater than 0.
TEIID30404=Source and destination character lists must be the same length.
TEIID30405=Error converting [{0}] of type {1} to type {2}
TEIID30406=The context function may only be used in XML queries.
-TEIID30408=The rowlimit and rowlimitexception functions may only be used in XML queries.
TEIID30411=Illegal argument for formating: {0}
-TEIID30412=Parse Exception occurs for executing: {0} {1}
+TEIID30412=Could not parse number using format: {0} {1}
ERR.015.001.0044=Function metadata source is of invalid type: {0}
TEIID30011=The function "{0}" will not be added because a function with the same name and signature already exists.
TEIID30389=Unexpected exception while loading "{1}.{2}" for UDF "{0}"
@@ -74,16 +72,14 @@
QueryParser.lexicalError=Lexical error: {0}
QueryParser.nullSqlExpr=Parser cannot parse a null sql expression.
TEIID30378=Direct usage of XQuery is no longer supported, use XMLQUERY instead.
-TEIID30379=Direct usage of XQuery is no longer supported, use XMLQUERY instead.
# processor (006)
TEIID30311=Unknown criteria type: {0}
-ERR.015.006.0011=Unable to evaluate {0} expression of {1}
+TEIID30312=Unable to evaluate {0} expression of {1}
TEIID30325=Unknown compare criteria operator: {0}
TEIID30448=Failed to create regular expression from match pattern: {0}. {1}
TEIID30323=Unable to evaluate expression of {0}
TEIID30329=Unknown expression type: {0}
-ERR.015.006.0033=Unable to evaluate {0}: {1}
TEIID30342=Unable to evaluate LOOKUP function.
TEIID30326=Unknown subquery comparison predicate quantifier: {0}
TEIID30345=The command of this scalar subquery returned more than one value: {0}
@@ -101,7 +97,6 @@
ERR.015.008.0022=Failed parsing reference binding: {0}
ERR.015.008.0025=Binding reference cannot be a function: {0}
TEIID30083=Expression ''{0}'' has a parameter with non-determinable type information. The use of an explicit convert may be necessary.
-TEIID30073=The expressions in this criteria are being compared but are of differing types ({0} and {1}) and no implicit conversion is available: {2}
TEIID30074=This criteria must have string or CLOB expressions on each side: {0}
TEIID30092=Type cannot be null for expression: {0}
TEIID30078=This criteria must have values only of the same type as the left expression: {0}
@@ -111,7 +106,6 @@
TEIID30068=The function ''{0}'' is an unknown form. Check that the function name and number of arguments is correct.
TEIID30069=The function ''{0}'' has more than one possible signature.
TEIID30071=The conversion from {0} to {1} is not allowed.
-TEIID30068=The function ''{0}'' is an unknown form. Check that the function name and number of arguments is correct.
TEIID30070=The function ''{0}'' is a valid function form, but the arguments do not match a known type signature and cannot be converted using implicit type conversions.
TEIID30082=Expected value of type ''{0}'' but ''{1}'' is of type ''{2}'' and no implicit conversion is available.
TEIID30084=Element ''{0}'' in ORDER BY is ambiguous and may refer to more than one element of SELECT clause.
@@ -127,12 +121,10 @@
TEIID30358=Procedure ''{0}'' is ambiguous, use the fully qualified name instead
ERR.015.008.0056=Group does not exist
TEIID30143=Unable to resolve stored procedure {0} the datatype for the parameter {1} is not specified.
-TEIID30099=Unable to resolve return element referred to by LOOKUP function: {0}
+TEIID30099=Unable to resolve key element referred to by LOOKUP function: {0}
TEIID30095=The first three arguments for the LOOKUP function must be specified as constants.
TEIID30096=Group {0} is not allowed in LOOKUP function.
TEIID30079=Could not find a common type to which all {0} expressions can be implicitly converted: {1}
-TEIID30080=Could not find a common type to which all {0} expressions can be implicitly converted: {1}
-TEIID30081=Could not find a common type to which all {0} expressions can be implicitly converted: {1}
TEIID30135=Aliased Select Symbols are not valid in XML Queries.
TEIID30134=Expressions cannot be selected by XML Queries
TEIID30129=Aliased subquery contexts are not allowed: {0}
@@ -241,7 +233,7 @@
TEIID30268=Unable to create a query plan that sends a criteria to \"{0}\". This connection factory requires criteria set to true indicating that a query against this model requires criteria.
TEIID30283=Could not resolve group symbol {0}
TEIID30306=The criteria {0} has elements from the root staging table and the document nodes which is not allowed.
-TEIID30309=No mapping node found named, ''{0}', in use of ''context''
+TEIID30309=No mapping node found named, ''{0}'', in use of ''context''
TEIID30287=The XML document element(s) {0} are not mapped to data and cannot be used in the criteria \"{1}\".
TEIID30281=Could not parse query transformation for {0}: {1}
TEIID30300=Context functions within the same conjunct refer to different contexts: {0}
@@ -276,7 +268,7 @@
SQLParser.Invalid_char={0} value must be a single character: [{1}].
SQLParser.expected_non_reserved=Expected non-reserved word {0}, but was {1}.
SQLParser.invalid_window=Cannot window a non-aggregate expression {0}.
-SQLParser.virtual_proc_def=Virtual procedure {0} must define the procedure block after 'AS' keyword
+SQLParser.virtual_proc_def=Virtual procedure {0} must define the procedure block after ''AS'' keyword
SQLParser.view_def=Virtual view {0} must be defined with a query expression.
SQLParser.pk_exists=Primary Key is already defined on {0}
SQLParser.no_column=Column name {0} not found on table {1}
@@ -720,7 +712,6 @@
TEIID30133=If any symbol in SELECT clause is ''xml'' or group.''xml'' , then no other element is allowed.
TEIID30123=The datatype for the expression was not resolvable.
TEIID30117=Cannot create temporary table "{0}". Local temporary tables must be created with unqualified names.
-TEIID30120=Cannot create temporary table "{0}". An object with the same name already exists.
ValidationVisitor.drop_of_nontemptable=Cannot drop a non temporary table "{0}".
ValidationVisitor.orderby_expression_xml=XML queries cannot order by an expression.
ValidationVisitor.text_table_invalid_width=For a fixed width text table, all columns must have width set.
@@ -745,10 +736,8 @@
ValidationVisitor.xmlparse_type=XMLPARSE expects a STRING, CLOB, or BLOB value.
ValidationVisitor.invalid_encoding=Encoding {0} is not valid.
ValidationVisitor.subquery_insert=SELECT INTO should not be used in a subquery.
-TEIID30122=Variable "{0}" is read only and cannot be assigned a value.
MappingLoader.unknown_node_type=Unknown Node Type "{0}" being loaded by the XML mapping document.
MappingLoader.invalid_criteria_node=Invalid criteria node found; A criteria node must have criteria specified or it must be a default node.
-TEIID30460=Wrong type of child node is being added.
NoCriteria=Failed to add the node, because Criteria nodes must have "criteria" value set on them, or they need to be the default node.
TEIID30462=Root node assigned to a document can be null.
TEIID30457=Found recursive node {0} without recursive root node.
@@ -757,7 +746,6 @@
TEIID30155=Column "{0}" has an invalid path expression: {1}
TEIID30151=Error building Source for context item.
MappingLoader.invalidName=Null or blank name found in the Mapping Document, Must have valid name. Re-build the VDB
-TEIID30450=Invalid escape sequence "{0}" with escape character "{1}"
QueryUtil.wrong_number_of_values=The number of bound values ''{0}'' does not match the number of parameters ''{1}'' in the prepared statement.
QueryUtil.Error_executing_conversion_function_to_convert_value=Error converting parameter number {0} with value "{1}" to expected type {2}.
TEIID30128=Cannot convert insert query expression projected symbol ''{0}'' of type {1} to insert column ''{2}'' of type {3}
@@ -769,8 +757,8 @@
TEIID30238=Duplicate key
TEIID30236=Null value is not allowed for column {0}
-ValidationVisitor.group_in_both_dep=Table specified in both dependent and independent queries '{0}'
-XMLQuery.resolvingError=Failed to resolve the query '{0}'
+ValidationVisitor.group_in_both_dep=Table specified in both dependent and independent queries ''{0}''
+XMLQuery.resolvingError=Failed to resolve the query ''{0}''
TEIID30085=Invalid order by at {0}
TEIID30367=Infinite loop detected, procedure will not be executed.
@@ -778,9 +766,9 @@
TEIID30244=The batch contained an unrecognized command: {0}
TEIID30243=Error while planning update procedure, unknown statement type encountered: {0}
TEIID30272=Error getting modelID
-XMLPlanner.no_uri=Cannot find namespace URI for namespace {0} of element {1}
+TEIID30213=Cannot find namespace URI for namespace {0} of element {1}
-XMLPlanner.The_XML_document_element_{0}_is_not_mapped_to_data_and_cannot_be_used_in_the_ORDER_BY_clause__{1}_1=The XML document element {0} is not mapped to data and cannot be used in the ORDER BY clause: {1}
+TEIID30288=The XML document element {0} is not mapped to data and cannot be used in the ORDER BY clause: {1}
XMLPlanner.The_rowlimit_parameter_{0}_is_not_in_the_scope_of_any_mapping_class=The ''rowlimit'' or ''rowlimitexception'' function parameter ''{0}'' is not an XML node within the scope of any mapping class.
XMLPlanner.Criteria_{0}_contains_conflicting_row_limits=The criteria ''{0}'' contains conflicting row limits for an XML mapping class.
TEIID30174=Failed to rewrite the command: {0}
@@ -797,10 +785,8 @@
ExecDynamicSqlInstruction.6=The datatype ''{0}'' for element ''{1}'' in the dynamic SQL cannot be implicitly converted to ''{2}''.
TEIID30168=Couldn''t execute the dynamic SQL command "{0}" with the SQL statement "{1}" due to: {2}
-TEIID30277=Join region with unsatisfied access patterns cannot be satisfied by the join criteria, Access patterns: {0}
TEIID30229=Temporary table "{0}" already exists.
TEIID30226=Temporary table "{0}" does not exist.
-TEIID30228=Table {0} is locked by pending transaction update.
TEIID30295=Cannot create a query for MappingClass with user criteria {0}
TEIID30296=Conjunct "{0}" has no relationship with target context {1}.
@@ -841,7 +827,7 @@
TEIID30233={0} does not target an internal materialized view.
TEIID30230=Materialized view {0} cannot have a row refreshed since there is no primary key.
TEIID30231=Materialized view {0} cannot have a row refreshed because it uses a composite key.
-TEIID30232=Materialized view {0} cannot have a row refreshed because it's cache hint did not specify \"updatable\".
+TEIID30232=Materialized view {0} cannot have a row refreshed because it''s cache hint did not specify \"updatable\".
TEIID30012=Refreshing row {1} for materialized view {0}.
TEIID30303=No root node found.
@@ -849,14 +835,14 @@
TEIID30482=Connector is not in OPEN state
ConnectorManagerImpl.Initializing_connector=Initializing connector {0}
-Cancel_request_failed=AtomicRequest {0} failed to cancel.
+TEIID30024=AtomicRequest {0} failed to cancel.
ConnectorWorker.MaxResultRowsExceed=The number of result rows has exceeded the maximum result rows "{0}"
TEIID30004=Connector returned a 0 row non-last batch: {0}.
TEIID30005=rollback failed for requestID={0}
ConnectorWorker.process_failed=Connector worker process failed for atomic-request={0}
TEIID30479=Could not process stored procedure results for {0}. Expected {1} result set columns, but was {2}. Please update your models to allow for stored procedure results batching.
-TEIID30554=Could not obtain connection factory for model {0} in VDB name
+TEIID30554=A single source is not assigned to model {0} in VDB name {1}.{2}
TEIID30548=Property value length exceeds max of {0}.
TEIID30549=Could not find a metadata record with uuid {0}.
TEIID30489=Unable to load metadata for VDB name
@@ -876,9 +862,9 @@
ERR.018.005.0095 = User <{0}> is not entitled to action <{1}> for 1 or more of the groups/elements/procedures.
# services (003)
-TEIID30032=Wrong type of data found or no data found; expecting streamable object from the buffer manager.
-TEIID30033=Wrong type of data found or no data found; expecting streamable object from the buffer manager.
-TEIID30034=Wrong type of data found or no data found; expecting streamable object from the buffer manager.
+TEIID30032=No lob manager found.
+TEIID30033=No existing lob reference found.
+TEIID30034=Expected lob to have a reference value.
TEIID30035=Wrong type of data found or no data found; expecting streamable object from the buffer manager.
TEIID30491=Bind variables (represented as "?") were found but are allowed only in prepared or callable statements.
Request.no_result_set=The query does not return a result set.
@@ -890,7 +876,7 @@
TransactionServer.no_transaction=No transaction found for client {0}.
TEIID30525=Concurrent enlistment in global transaction {0} is not supported.
TEIID30521=Expected an existing global transaction {0} but there was none for client {1}
-TEIID30520=Unknown flags
+TEIID30520=Unknown END flags
TEIID30521=No global transaction found for {0}.
TEIID30524=Client is not currently enlisted in transaction {0}.
TEIID30518=Cannot resume, transaction {0} was not suspended by client {1}.
@@ -927,14 +913,12 @@
TEIID30481=Failed to find the Connection Factory with JNDI name {0}. Please check the name or deploy the Connection Factory with specified name.
TEIID31097=Connection Factory (no data source found) provided is null; Can not proceed with metadata load.
-TEIID30256=Source UPDATE or DELETE command "{0}" contains non-pushdown constructs and no compensating action can be taken as the table lacks a unique key or the source does not support equality predicates.
TEIID30254=Source UPDATE or DELETE command "{0}" contains non-pushdown constructs that cannot be simplified into a compensating action.
Translate.error=Cannot translate criteria "{0}", it is not matched by selector "{1}"
TEIID30561=The multisource plan must execute a procedure returning parameter values exactly 1: {0}
-TEIID30417=Expected a java.sql.Array, or java array type, but got: {0}
TEIID30546=Unknown log level: {0}, expected one of {1}
TEIID30415=Array index out of range: {0}
TEIID30190=Could not convert value for column: {0}
@@ -972,54 +956,40 @@
TEIID30269=Unexpected Exception
TEIID30153=Could not define global variable
-TEIID30072= The expressions in this criteria are being compared but are of differing types ({0} and {1}) and no implicit conversion is available: {2}
-TEIID30097= Unable to resolve return element referred to by LOOKUP function: {0}
+TEIID30072= The expressions in this criteria are being compared but are of differing types ({0} and {1}) and no implicit conversion is available: {2}
+TEIID30097= Unable to resolve LOOKUP function group: {0}
TEIID30098= Unable to resolve return element referred to by LOOKUP function: {0}
TEIID30118=Cannot create temporary table "{0}". An object with the same name already exists.
-TEIID30119=Cannot create temporary table "{0}". An object with the same name already exists.
TEIID30121=Variable "{0}" is read only and cannot be assigned a value.
TEIID30140= Incorrect number of parameters specified on the stored procedure {2} - expected {0} but got {1}
TEIID30146= {1} is not allowed on the view {0}: a procedure must be defined to handle the {1}.
TEIID30183=Text parse error: Non-whitespace character found between the qualifier and the delimiter in text line {0} in {1}.
TEIID30189=Expected a java.sql.Array, or java array type, but got: {0}
TEIID30191=Array index out of range: {0}
-TEIID30214=Results for the mapping class {0} are not found;
-TEIID30215=Results for the mapping class {0} are not found;
TEIID30227=Table {0} is locked by pending transaction update.
TEIID30240=Could not determine INSERT target for a partitioned UNION view {0} with values {1}.
TEIID30253=Source UPDATE or DELETE command "{0}" contains non-pushdown constructs and no compensating action can be taken as the table lacks a unique key or the source does not support equality predicates.
-TEIID30255=Source UPDATE or DELETE command "{0}" contains non-pushdown constructs and no compensating action can be taken as the table lacks a unique key or the source does not support equality predicates.
TEIID30275=Join region with unsatisfied access patterns cannot be satisfied by the join criteria, Access patterns: {0}
-TEIID30276=Join region with unsatisfied access patterns cannot be satisfied by the join criteria, Access patterns: {0}
TEIID30314=Unknown compare criteria operator: {0}
TEIID30346=Unable to evaluate {0}: {1}
TEIID30348=Unable to evaluate {0}: {1}
TEIID30349=Unable to evaluate {0}: {1}
-TEIID30375=The specified change set {0} against an inherently updatable view does not map to a key preserving group.
+TEIID30375=The specified insert variables {0} against an inherently updatable view does not map to a key preserving group.
TEIID30377=Parser cannot parse an empty sql statement.
TEIID30390=UDF "{0}" method "{1}" must not return void.
TEIID30391=UDF "{0}" method "{1}" must be public.
TEIID30392=UDF "{0}" method "{1}" must be static.
-TEIID30393=Unknown type signature for evaluating function of: {0} ({1})
-TEIID30394=Unknown type signature for evaluating function of: {0} ({1})
-TEIID30395=Unknown type signature for evaluating function of: {0} ({1})
-TEIID30396=Left count is invalid: {0}
+TEIID30396=Left/Right count {0} is invalid. It must be >= 0.
TEIID30398={0} value must be a single character: [{1}].
TEIID30407=The rowlimit and rowlimitexception functions may only be used in XML queries.
-TEIID30409=Illegal argument for formating: {0}
-TEIID30410=Parse Exception occurs for executing: {0} {1}
+TEIID30409=Illegal date format: {0}
+TEIID30410=Could not parse date using format: {0} {1}
TEIID30413=Unable to evaluate {0}: expected Properties for command payload but got object of type {1}
TEIID30416=Expected a java.sql.Array, or java array type, but got: {0}
TEIID30431={0} has invalid character: {1}
TEIID30449=Invalid escape sequence "{0}" with escape character "{1}"
TEIID30451=Unable to evaluate {0}: {1}
TEIID30452=Wrong type of child node is being added.
-TEIID30453=Wrong type of child node is being added.
-TEIID30454=Wrong type of child node is being added.
-TEIID30455=Wrong type of child node is being added.
-TEIID30456=Wrong type of child node is being added.
-TEIID30458=Wrong type of child node is being added.
-TEIID30459=Wrong type of child node is being added.
TEIID30461=Root node assigned to a document can be null.
TEIID30477=Failed to unwrap the source connection.
TEIID30563=The request {0} has been cancelled.=======
@@ -1027,7 +997,7 @@
TEIID30565=Using collator for locale {0}
TEIID30499=No sources were given for the model {0}
TEIID30523=Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.
-TEIID30519=Unknown flags
+TEIID30519=Unknown START flags
TransactionServer.existing_transaction=Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.
TEIID30517=Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.
Property changes on: trunk/engine/src/test/java/org/teiid/cache
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/cache:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/cache:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/cache:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/cache:4002-4046*
/trunk/engine/src/test/java/org/teiid/cache:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/cache:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/cache:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/cache:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/cache:4002-4046*,4048-4051*
/trunk/engine/src/test/java/org/teiid/cache:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/cache/TestDefaultCache.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:4002-4046
/trunk/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/common
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/common:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/common:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/common:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/common:4002-4046*
/trunk/engine/src/test/java/org/teiid/common:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/common:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/common:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/common:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/common:4002-4046*,4048-4051*
/trunk/engine/src/test/java/org/teiid/common:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/common/buffer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/common/buffer:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/common/buffer:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/common/buffer:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/common/buffer:4002-4046
/trunk/engine/src/test/java/org/teiid/common/buffer:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/common/buffer:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/common/buffer:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/common/buffer:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/common/buffer:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/common/buffer:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/common/queue
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/common/queue:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/common/queue:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/common/queue:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/common/queue:4002-4046
/trunk/engine/src/test/java/org/teiid/common/queue:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/common/queue:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/common/queue:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/common/queue:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/common/queue:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/common/queue:3507-3666
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestTransactionServer.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestTransactionServer.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestTransactionServer.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -35,7 +35,6 @@
import org.teiid.client.xa.XATransactionException;
import org.teiid.client.xa.XidImpl;
import org.teiid.common.queue.FakeWorkManager;
-import org.teiid.dqp.internal.process.TransactionServerImpl;
import org.teiid.dqp.service.TransactionContext;
public class TestTransactionServer {
@@ -234,7 +233,7 @@
server.start(THREAD1, XID1, Integer.MAX_VALUE, 100,false);
fail("exception expected"); //$NON-NLS-1$
} catch (XATransactionException ex) {
- assertEquals("Error Code:TEIID30519 Message:TEIID30519 Unknown flags", ex.getMessage()); //$NON-NLS-1$
+ assertEquals("Error Code:TEIID30519 Message:TEIID30519 Unknown START flags", ex.getMessage()); //$NON-NLS-1$
}
}
Property changes on: trunk/engine/src/test/java/org/teiid/query
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query:4002-4046*
/trunk/engine/src/test/java/org/teiid/query:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query:4002-4046*,4048-4051*
/trunk/engine/src/test/java/org/teiid/query:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/analysis
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/analysis:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/analysis:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/analysis:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/analysis:4002-4046
/trunk/engine/src/test/java/org/teiid/query/analysis:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/analysis:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/analysis:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/analysis:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/analysis:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/analysis:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/function:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/function:4002-4046*
/trunk/engine/src/test/java/org/teiid/query/function:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/function:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/function:4002-4046*,4048-4051*
/trunk/engine/src/test/java/org/teiid/query/function:3507-3666
Modified: trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -1108,12 +1108,6 @@
Double d = (Double)FunctionMethods.rand(new CommandContext(), new Integer(100));
assertEquals(new Double(0.7220096548596434), d);
- try {
- FunctionMethods.rand(new CommandContext(), new Double(34.5));
- fail("should have failed to take a double"); //$NON-NLS-1$
- } catch (FunctionExecutionException e) {
- }
-
FunctionMethods.rand(new CommandContext());
}
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:3281-3325,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:3281-3325,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/metadata
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/metadata:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/metadata:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/metadata:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/metadata:4002-4046
/trunk/engine/src/test/java/org/teiid/query/function/metadata:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/metadata:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/metadata:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/metadata:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/metadata:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/function/metadata:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/source
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/source:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/source:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/source:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/source:4002-4046
/trunk/engine/src/test/java/org/teiid/query/function/source:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/source:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/source:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/source:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/source:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/function/source:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/mapping
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/mapping:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/mapping:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/mapping:4002-4046*
/trunk/engine/src/test/java/org/teiid/query/mapping:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/mapping:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/mapping:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/mapping:4002-4046*,4048-4051*
/trunk/engine/src/test/java/org/teiid/query/mapping:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/mapping/xml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping/xml:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/mapping/xml:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/mapping/xml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/mapping/xml:4002-4046
/trunk/engine/src/test/java/org/teiid/query/mapping/xml:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping/xml:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/mapping/xml:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/mapping/xml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/mapping/xml:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/mapping/xml:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/metadata
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/metadata:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/metadata:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/metadata:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/metadata:4002-4046
/trunk/engine/src/test/java/org/teiid/query/metadata:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/metadata:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/metadata:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/metadata:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/metadata:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/metadata:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer:4002-4046*
/trunk/engine/src/test/java/org/teiid/query/optimizer:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer:4002-4046*,4048-4051*
/trunk/engine/src/test/java/org/teiid/query/optimizer:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3149-3217,3535-3555,3558-3585
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3149-3217,3535-3555,3558-3585
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3673-3711,3754-3769,3776-3813
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3673-3711,3754-3769,3776-3813
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/capabilities
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/capabilities:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/capabilities:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/capabilities:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/capabilities:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/capabilities:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/capabilities:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/capabilities:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/capabilities:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/capabilities:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/capabilities:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/proc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/proc:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/proc:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/proc:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/proc:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/proc:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/proc:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/proc:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/proc:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/proc:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/proc:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational:4002-4046*
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational:4002-4046*,4048-4051*
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/plantree
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/rules:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/rules:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/xml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/xml:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/xml:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/xml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/xml:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/xml:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/xml:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/xml:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/xml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/xml:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/xml:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/parser
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/parser:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/parser:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/parser:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/parser:4002-4046
/trunk/engine/src/test/java/org/teiid/query/parser:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/parser:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/parser:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/parser:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/parser:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/parser:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor:4002-4046*
/trunk/engine/src/test/java/org/teiid/query/processor:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor:4002-4046*,4048-4051*
/trunk/engine/src/test/java/org/teiid/query/processor:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3816-3868,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3816-3868,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3816-3868,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3816-3868,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3149-3217,3535-3555,3558-3585
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3673-3711,3754-3769,3776-3813
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3149-3217,3535-3555,3558-3585
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3673-3711,3754-3769,3776-3813
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java:3507-3666
+ /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3673-3711,3714-3752,3754-3769,3776-3813
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3673-3711,3714-3752,3754-3769,3776-3813
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3149-3217,3220-3275,3281-3325,3340-3349,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3149-3217,3220-3275,3281-3325,3340-3349,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:3598-3666
+ /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:3598-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/eval
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/eval:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/eval:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/eval:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/eval:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/eval:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/eval:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/eval:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/eval:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/eval:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/eval:3507-3666
Modified: trunk/engine/src/test/java/org/teiid/query/processor/eval/TestCriteriaEvaluator.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/eval/TestCriteriaEvaluator.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/test/java/org/teiid/query/processor/eval/TestCriteriaEvaluator.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -39,16 +39,7 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
import org.teiid.query.eval.Evaluator;
-import org.teiid.query.sql.lang.CollectionValueIterator;
-import org.teiid.query.sql.lang.CompareCriteria;
-import org.teiid.query.sql.lang.Criteria;
-import org.teiid.query.sql.lang.ExistsCriteria;
-import org.teiid.query.sql.lang.IsNullCriteria;
-import org.teiid.query.sql.lang.MatchCriteria;
-import org.teiid.query.sql.lang.Query;
-import org.teiid.query.sql.lang.SetCriteria;
-import org.teiid.query.sql.lang.SubqueryCompareCriteria;
-import org.teiid.query.sql.lang.SubqueryContainer;
+import org.teiid.query.sql.lang.*;
import org.teiid.query.sql.symbol.Constant;
import org.teiid.query.sql.symbol.ElementSymbol;
import org.teiid.query.sql.util.ValueIterator;
@@ -327,7 +318,7 @@
try {
helpTestMatch("abc", "a", 'a', true); //$NON-NLS-1$ //$NON-NLS-2$
} catch (ExpressionEvaluationException cee) {
- assertEquals("Error Code:TEIID30450 Message:TEIID30450 Invalid escape sequence \"a\" with escape character \"a\"", cee.getMessage()); //$NON-NLS-1$
+ assertEquals("Error Code:TEIID30449 Message:TEIID30449 Invalid escape sequence \"a\" with escape character \"a\"", cee.getMessage()); //$NON-NLS-1$
}
}
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/proc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/proc:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/proc:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/proc:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/proc:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/proc:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/proc:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/proc:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/proc:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/proc:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/proc:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/relational
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/relational:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/relational:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/relational:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/relational:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/relational:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/relational:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/relational:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/relational:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/relational:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/relational:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/xml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/xml:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/xml:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/xml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/xml:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/xml:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/xml:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/xml:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/xml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/xml:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/xml:3507-3666
Modified: trunk/engine/src/test/java/org/teiid/query/processor/xml/TestXMLProcessor.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/xml/TestXMLProcessor.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/test/java/org/teiid/query/processor/xml/TestXMLProcessor.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -3325,7 +3325,7 @@
"", metadata, dataMgr); //$NON-NLS-1$
fail("Should have failed with QueryPlannerException but didn't"); //$NON-NLS-1$
} catch (QueryPlannerException e) {
- String expectedMsg = "Error Code:TEIID30288 Message:The XML document element [element] name='Suppliers' minOccurs=1 maxOccurs=1 is not mapped to data and cannot be used in the ORDER BY clause: ORDER BY Suppliers"; //$NON-NLS-1$
+ String expectedMsg = "Error Code:TEIID30288 Message:TEIID30288 The XML document element [element] name='Suppliers' minOccurs=1 maxOccurs=1 is not mapped to data and cannot be used in the ORDER BY clause: ORDER BY Suppliers"; //$NON-NLS-1$
assertEquals(expectedMsg, e.getMessage());
}
}
Property changes on: trunk/engine/src/test/java/org/teiid/query/resolver
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/resolver:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/resolver:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/resolver:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/resolver:4002-4046
/trunk/engine/src/test/java/org/teiid/query/resolver:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/resolver:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/resolver:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/resolver:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/resolver:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/resolver:3507-3666
Modified: trunk/engine/src/test/java/org/teiid/query/resolver/TestProcedureResolving.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/resolver/TestProcedureResolving.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/test/java/org/teiid/query/resolver/TestProcedureResolving.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -855,7 +855,7 @@
String userUpdateStr = "UPDATE vm1.g1 SET e1='x'"; //$NON-NLS-1$
- helpFailUpdateProcedure(proc.toString(), userUpdateStr, Table.TriggerEvent.UPDATE, "Error Code:TEIID30120 Message:TEIID30120 Cannot create temporary table \"loopCursor\". An object with the same name already exists."); //$NON-NLS-1$
+ helpFailUpdateProcedure(proc.toString(), userUpdateStr, Table.TriggerEvent.UPDATE, "Error Code:TEIID30118 Message:TEIID30118 Cannot create temporary table \"loopCursor\". An object with the same name already exists."); //$NON-NLS-1$
}
@Test public void testProcedureCreateDrop() {
Modified: trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -1405,7 +1405,7 @@
}
@Test public void testFailedConversion_defect9725() throws Exception{
- helpResolveException("select * from pm3.g1 where pm3.g1.e4 > {b 'true'}", "Error Code:TEIID30073 Message:TEIID30073 The expressions in this criteria are being compared but are of differing types (timestamp and boolean) and no implicit conversion is available: pm3.g1.e4 > TRUE"); //$NON-NLS-1$ //$NON-NLS-2$
+ helpResolveException("select * from pm3.g1 where pm3.g1.e4 > {b 'true'}", "Error Code:TEIID30072 Message:TEIID30072 The expressions in this criteria are being compared but are of differing types (timestamp and boolean) and no implicit conversion is available: pm3.g1.e4 > TRUE"); //$NON-NLS-1$ //$NON-NLS-2$
}
@Test public void testLookupFunction() {
Property changes on: trunk/engine/src/test/java/org/teiid/query/rewriter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/rewriter:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/rewriter:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/rewriter:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/rewriter:4002-4046
/trunk/engine/src/test/java/org/teiid/query/rewriter:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/rewriter:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/rewriter:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/rewriter:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/rewriter:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/rewriter:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/sql:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql:4002-4046*
/trunk/engine/src/test/java/org/teiid/query/sql:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/sql:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql:4002-4046*,4048-4051*
/trunk/engine/src/test/java/org/teiid/query/sql:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/lang
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/lang:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/lang:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/lang:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/lang:4002-4046
/trunk/engine/src/test/java/org/teiid/query/sql/lang:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/lang:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/lang:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/lang:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/lang:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/sql/lang:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/proc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/proc:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/proc:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/proc:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/proc:4002-4046
/trunk/engine/src/test/java/org/teiid/query/sql/proc:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/proc:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/proc:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/proc:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/proc:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/sql/proc:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/symbol
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/symbol:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/symbol:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/symbol:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/symbol:4002-4046
/trunk/engine/src/test/java/org/teiid/query/sql/symbol:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/symbol:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/symbol:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/symbol:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/symbol:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/sql/symbol:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/util:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/util:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/util:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/util:4002-4046
/trunk/engine/src/test/java/org/teiid/query/sql/util:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/util:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/util:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/util:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/util:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/sql/util:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/visitor
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/visitor:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/visitor:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/visitor:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/visitor:4002-4046
/trunk/engine/src/test/java/org/teiid/query/sql/visitor:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/visitor:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/visitor:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/visitor:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/visitor:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/sql/visitor:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/unittest
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/unittest:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/unittest:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/unittest:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/unittest:4002-4046
/trunk/engine/src/test/java/org/teiid/query/unittest:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/unittest:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/unittest:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/unittest:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/unittest:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/unittest:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/util:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/util:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/util:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/util:4002-4046
/trunk/engine/src/test/java/org/teiid/query/util:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/util:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/util:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/util:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/util:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/util:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/validator
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/validator:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/validator:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/validator:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/validator:4002-4046
/trunk/engine/src/test/java/org/teiid/query/validator:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/validator:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/validator:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/validator:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/validator:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/validator:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/vdb
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/vdb:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/vdb:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/vdb:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/vdb:4002-4046*
/trunk/engine/src/test/java/org/teiid/vdb:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/vdb:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/vdb:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/vdb:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/vdb:4002-4046*,4048-4051*
/trunk/engine/src/test/java/org/teiid/vdb:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/vdb/runtime
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/vdb/runtime:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/vdb/runtime:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/vdb/runtime:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/vdb/runtime:4002-4046
/trunk/engine/src/test/java/org/teiid/vdb/runtime:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/vdb/runtime:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/vdb/runtime:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/vdb/runtime:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/vdb/runtime:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/vdb/runtime:3507-3666
Property changes on: trunk/engine/src/test/resources/text
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/resources/text:3535-3555*
/branches/7.6.x/engine/src/test/resources/text:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/resources/text:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/resources/text:4002-4046*
/trunk/engine/src/test/resources/text:3507-3666
+ /branches/7.4.x/engine/src/test/resources/text:3535-3555*
/branches/7.6.x/engine/src/test/resources/text:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/resources/text:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/resources/text:4002-4046*,4048-4051*
/trunk/engine/src/test/resources/text:3507-3666
Property changes on: trunk/engine/src/test/resources/text/TextParts_HeaderRow2.csv
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3535-3555
/branches/7.6.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:4002-4046
/trunk/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3507-3666
+ /branches/7.4.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3535-3555
/branches/7.6.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:4002-4046,4048-4051
/trunk/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3507-3666
Property changes on: trunk/engine/src/test/resources/text/cdm_dos.txt
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/resources/text/cdm_dos.txt:3535-3555
/branches/7.6.x/engine/src/test/resources/text/cdm_dos.txt:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/resources/text/cdm_dos.txt:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/resources/text/cdm_dos.txt:4002-4046
/trunk/engine/src/test/resources/text/cdm_dos.txt:3507-3666
+ /branches/7.4.x/engine/src/test/resources/text/cdm_dos.txt:3535-3555
/branches/7.6.x/engine/src/test/resources/text/cdm_dos.txt:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/resources/text/cdm_dos.txt:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/resources/text/cdm_dos.txt:4002-4046,4048-4051
/trunk/engine/src/test/resources/text/cdm_dos.txt:3507-3666
Property changes on: trunk/engine/src/test/resources/text/cdm_dos_win.txt
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/resources/text/cdm_dos_win.txt:3149-3164,3172-3217,3535-3555
/branches/7.6.x/engine/src/test/resources/text/cdm_dos_win.txt:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/resources/text/cdm_dos_win.txt:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/resources/text/cdm_dos_win.txt:4002-4046
/trunk/engine/src/test/resources/text/cdm_dos_win.txt:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/resources/text/cdm_dos_win.txt:3149-3164,3172-3217,3535-3555
/branches/7.6.x/engine/src/test/resources/text/cdm_dos_win.txt:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/resources/text/cdm_dos_win.txt:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/resources/text/cdm_dos_win.txt:4002-4046,4048-4051
/trunk/engine/src/test/resources/text/cdm_dos_win.txt:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/resources/text/test-file.txt.csv
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/resources/text/test-file.txt.csv:3535-3555
/branches/7.6.x/engine/src/test/resources/text/test-file.txt.csv:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/resources/text/test-file.txt.csv:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/resources/text/test-file.txt.csv:4002-4046
/trunk/engine/src/test/resources/text/test-file.txt.csv:3507-3666
+ /branches/7.4.x/engine/src/test/resources/text/test-file.txt.csv:3535-3555
/branches/7.6.x/engine/src/test/resources/text/test-file.txt.csv:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/resources/text/test-file.txt.csv:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/resources/text/test-file.txt.csv:4002-4046,4048-4051
/trunk/engine/src/test/resources/text/test-file.txt.csv:3507-3666
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -53,8 +53,6 @@
TEIID50011,
TEIID50012, // socket enabled
TEIID50013, // Wrong socket protocol
- TEIID50014, // socket disabled
- TEIID50015, // admin max sessions
TEIID50016, // invalid vdb file
TEIID50017, // vdb.xml parse exception
TEIID50018, // failed VDB dependency processing
@@ -66,11 +64,8 @@
TEIID50024, // failed metadata load
TEIID50025, // VDB deployed
TEIID50026, // VDB undeployed
- TEIID50027, // metadata in-process of loading
- TEIID50028, // failed metadata loading
TEIID50029, // dynamic metadata loaded
TEIID50030,
- TEIID50031, // failed to load cached index files
TEIID50032, // duplicate VDB
TEIID50033, // duplicate source name in vdb
TEIID50034, // Source name mismatch
@@ -89,18 +84,11 @@
TEIID50047,
TEIID50048,
TEIID50049,
- TEIID50050,
TEIID50051,
- TEIID50052,
- TEIID50053,
TEIID50054,
TEIID50055,
TEIID50056,
TEIID50057,
- TEIID50058,
- TEIID50059,
- TEIID50060,
- TEIID50061,
TEIID50062,
TEIID50063,
TEIID50064,
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -1039,12 +1039,8 @@
String mappedRole = operation.get(OperationsConstants.MAPPED_ROLE).asString();
try {
- DataPolicyMetadata policy = vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy = VDBService.getPolicy(vdb, policyName);
- if (policy == null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50050, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50050, policyName, vdb.getName(), vdb.getVersion()));
- }
-
policy.addMappedRoleName(mappedRole);
save(vdb);
} catch (AdminProcessingException e) {
@@ -1087,12 +1083,8 @@
String mappedRole = operation.get(OperationsConstants.MAPPED_ROLE).asString();
try {
- DataPolicyMetadata policy = vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy = VDBService.getPolicy(vdb, policyName);
- if (policy == null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50051, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50051, policyName, vdb.getName(), vdb.getVersion()));
- }
-
policy.removeMappedRoleName(mappedRole);
save(vdb);
} catch (AdminProcessingException e) {
@@ -1130,12 +1122,8 @@
String policyName = operation.get(OperationsConstants.DATA_ROLE).asString();
try {
- DataPolicyMetadata policy = vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy = VDBService.getPolicy(vdb, policyName);
- if (policy == null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50052, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50052, policyName, vdb.getName(), vdb.getVersion()));
- }
-
policy.setAnyAuthenticated(true);
save(vdb);
} catch (AdminProcessingException e) {
@@ -1170,12 +1158,8 @@
String policyName = operation.get(OperationsConstants.DATA_ROLE).asString();
try {
- DataPolicyMetadata policy = vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy = VDBService.getPolicy(vdb, policyName);
- if (policy == null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50053, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50053, policyName, vdb.getName(), vdb.getVersion()));
- }
-
policy.setAnyAuthenticated(false);
save(vdb);
} catch (AdminProcessingException e) {
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -429,45 +429,29 @@
}
public void addDataRole(String policyName, String mappedRole) throws AdminProcessingException{
- DataPolicyMetadata policy = vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy = getPolicy(vdb, policyName);
- if (policy == null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50058, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50058, policyName, this.vdb.getName(), this.vdb.getVersion()));
- }
-
policy.addMappedRoleName(mappedRole);
save();
}
public void remoteDataRole(String policyName, String mappedRole) throws AdminProcessingException{
- DataPolicyMetadata policy = vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy = getPolicy(vdb, policyName);
- if (policy == null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50059, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50059, policyName, this.vdb.getName(), this.vdb.getVersion()));
- }
-
policy.removeMappedRoleName(mappedRole);
save();
}
public void addAnyAuthenticated(String policyName) throws AdminProcessingException{
- DataPolicyMetadata policy = vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy = getPolicy(vdb, policyName);
- if (policy == null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50060, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50060, policyName, this.vdb.getName(), this.vdb.getVersion()));
- }
-
policy.setAnyAuthenticated(true);
save();
}
public void removeAnyAuthenticated(String policyName) throws AdminProcessingException{
- DataPolicyMetadata policy = vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy = getPolicy(vdb, policyName);
- if (policy == null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50061, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50061, policyName, this.vdb.getName(), this.vdb.getVersion()));
- }
-
policy.setAnyAuthenticated(false);
save();
}
@@ -504,6 +488,16 @@
}
}
+ static DataPolicyMetadata getPolicy(VDBMetaData vdb, String policyName)
+ throws AdminProcessingException {
+ DataPolicyMetadata policy = vdb.getDataPolicy(policyName);
+
+ if (policy == null) {
+ throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50051, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50051, policyName, vdb.getName(), vdb.getVersion()));
+ }
+ return policy;
+ }
+
@SuppressWarnings("serial")
static class TranslatorNotFoundException extends TeiidException {
public TranslatorNotFoundException(String msg) {
Property changes on: trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/AddressWrapper.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:4002-4046
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:3507-3666
+ /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:4002-4046,4048-4051
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:3507-3666
Property changes on: trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:4002-4046
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3507-3666
+ /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:4002-4046,4048-4051
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3507-3666
Property changes on: trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:4002-4046
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3507-3666
+ /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:4002-4046,4048-4051
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3507-3666
Property changes on: trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:4002-4046
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3507-3666
+ /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:4002-4046,4048-4051
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3507-3666
Modified: trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties
===================================================================
--- trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2012-05-02 21:36:21 UTC (rev 4055)
@@ -30,14 +30,12 @@
TEIID50002=Teiid Engine stopped {0}
TEIID50062=Model name "{0}" not found in the VDB with name "{1}" version "{2}"
TEIID50062=Source name "{0}" not found for model {1} in the VDB with name "{2}" version "{3}"
-TEIID50061=Policy name "{0}" not found in the VDB with name "{1}" version "{2}"
TEIID50063=Source with name {0} not found in the Model {1} in VDB {2}.{3}
TEIID50062=Model with name {0} not found in the VDB {1}.{2}
event_distributor_bound=org.teiid.events.EventDistributorFactory is bound to {0} for manual control of Teiid events.
TEIID50004=Could not replicate object {0}
TEIID50019=Re-deploying VDB {0}
TEIID50066=Cache system has been shutdown
-TEIID50050=Policy {0} not found in VDB {1}.{2}
TEIID50051=Policy {0} not found in VDB {1}.{2}
TEIID50054=Model {0} not found in VDB {1}.{2}
TEIID50055=Source name {0} not found in Model {1} in VDB {1}.{2}
Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/RuntimeMetadataPlugin.java
===================================================================
--- trunk/metadata/src/main/java/org/teiid/metadata/index/RuntimeMetadataPlugin.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/metadata/src/main/java/org/teiid/metadata/index/RuntimeMetadataPlugin.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -44,7 +44,6 @@
public static enum Event implements BundleUtil.Event {
TEIID80000,
- TEIID80001,
TEIID80002,
TEIID80003,
TEIID80004
Property changes on: trunk/metadata/src/test/java/org/teiid/cdk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/cdk:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk:3673-3711*,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/cdk:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/metadata/src/test/java/org/teiid/cdk:4002-4046*
/trunk/metadata/src/test/java/org/teiid/cdk:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/cdk:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk:3673-3711*,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/cdk:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/metadata/src/test/java/org/teiid/cdk:4002-4046*,4048-4051*
/trunk/metadata/src/test/java/org/teiid/cdk:3507-3666
Property changes on: trunk/metadata/src/test/java/org/teiid/cdk/api
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/api:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk/api:3673-3711,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/cdk/api:3816-3868,3876-3915,3920-3983
/branches/8.0.x/metadata/src/test/java/org/teiid/cdk/api:4002-4046
/trunk/metadata/src/test/java/org/teiid/cdk/api:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/api:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk/api:3673-3711,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/cdk/api:3816-3868,3876-3915,3920-3983
/branches/8.0.x/metadata/src/test/java/org/teiid/cdk/api:4002-4046,4048-4051
/trunk/metadata/src/test/java/org/teiid/cdk/api:3507-3666
Property changes on: trunk/metadata/src/test/java/org/teiid/cdk/unittest
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/unittest:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk/unittest:3673-3711,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/cdk/unittest:3816-3868,3876-3915,3920-3983
/branches/8.0.x/metadata/src/test/java/org/teiid/cdk/unittest:4002-4046
/trunk/metadata/src/test/java/org/teiid/cdk/unittest:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/unittest:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk/unittest:3673-3711,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/cdk/unittest:3816-3868,3876-3915,3920-3983
/branches/8.0.x/metadata/src/test/java/org/teiid/cdk/unittest:4002-4046,4048-4051
/trunk/metadata/src/test/java/org/teiid/cdk/unittest:3507-3666
Property changes on: trunk/metadata/src/test/java/org/teiid/core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/core:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/core:3673-3711*,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/core:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/metadata/src/test/java/org/teiid/core:4002-4046*
/trunk/metadata/src/test/java/org/teiid/core:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/core:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/core:3673-3711*,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/core:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/metadata/src/test/java/org/teiid/core:4002-4046*,4048-4051*
/trunk/metadata/src/test/java/org/teiid/core:3507-3666
Property changes on: trunk/metadata/src/test/java/org/teiid/core/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/core/util:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/core/util:3673-3711,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/core/util:3816-3868,3876-3915,3920-3983
/branches/8.0.x/metadata/src/test/java/org/teiid/core/util:4002-4046
/trunk/metadata/src/test/java/org/teiid/core/util:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/core/util:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/core/util:3673-3711,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/core/util:3816-3868,3876-3915,3920-3983
/branches/8.0.x/metadata/src/test/java/org/teiid/core/util:4002-4046,4048-4051
/trunk/metadata/src/test/java/org/teiid/core/util:3507-3666
Property changes on: trunk/metadata/src/test/java/org/teiid/internal
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/internal:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/internal:3673-3711*,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/internal:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/metadata/src/test/java/org/teiid/internal:4002-4046*
/trunk/metadata/src/test/java/org/teiid/internal:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/internal:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/internal:3673-3711*,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/internal:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/metadata/src/test/java/org/teiid/internal:4002-4046*,4048-4051*
/trunk/metadata/src/test/java/org/teiid/internal:3507-3666
Property changes on: trunk/metadata/src/test/java/org/teiid/internal/core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/internal/core:3673-3711*,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/internal/core:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/metadata/src/test/java/org/teiid/internal/core:4002-4046*
/trunk/metadata/src/test/java/org/teiid/internal/core:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/internal/core:3673-3711*,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/internal/core:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/metadata/src/test/java/org/teiid/internal/core:4002-4046*,4048-4051*
/trunk/metadata/src/test/java/org/teiid/internal/core:3507-3666
Property changes on: trunk/metadata/src/test/java/org/teiid/internal/core/index
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core/index:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/internal/core/index:3673-3711,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/internal/core/index:3816-3868,3876-3915,3920-3983
/branches/8.0.x/metadata/src/test/java/org/teiid/internal/core/index:4002-4046
/trunk/metadata/src/test/java/org/teiid/internal/core/index:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core/index:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/internal/core/index:3673-3711,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/internal/core/index:3816-3868,3876-3915,3920-3983
/branches/8.0.x/metadata/src/test/java/org/teiid/internal/core/index:4002-4046,4048-4051
/trunk/metadata/src/test/java/org/teiid/internal/core/index:3507-3666
Modified: trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -35,13 +35,11 @@
TEIID40001, // undefined translator properties
TEIID40002, // failed to load ODBC metadata
TEIID40003, // VDB Active
- TEIID40004, // VDB validity errors
TEIID40005, // datasource or translator not found
TEIID40006, // VDB inactive
TEIID40007, // keep alive failed
TEIID40008, // expired session
TEIID40009, // terminate session
- TEIID40010, // odbc error
TEIID40011, // processing error
TEIID40012, // data source not found
TEIID40013, // replication failed
Property changes on: trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3535-3555
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3673-3711,3754-3769
/branches/7.7.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:4002-4046
/trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3598-3666
+ /branches/7.4.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3535-3555
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3673-3711,3754-3769
/branches/7.7.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:4002-4046,4048-4051
/trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3598-3666
Property changes on: trunk/runtime/src/main/java/org/teiid/transport/pg
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg:3535-3555*
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/pg:3673-3711*,3754-3769
/branches/7.7.x/runtime/src/main/java/org/teiid/transport/pg:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/runtime/src/main/java/org/teiid/transport/pg:4002-4046*
/trunk/runtime/src/main/java/org/teiid/transport/pg:3507-3666
+ /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg:3535-3555*
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/pg:3673-3711*,3754-3769
/branches/7.7.x/runtime/src/main/java/org/teiid/transport/pg:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/runtime/src/main/java/org/teiid/transport/pg:4002-4046*,4048-4051*
/trunk/runtime/src/main/java/org/teiid/transport/pg:3507-3666
Property changes on: trunk/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3535-3555
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3673-3711,3754-3769
/branches/7.7.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:4002-4046
/trunk/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3507-3666
+ /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3535-3555
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3673-3711,3754-3769
/branches/7.7.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:4002-4046,4048-4051
/trunk/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3507-3666
Modified: trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties
===================================================================
--- trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2012-05-02 21:36:21 UTC (rev 4055)
@@ -46,6 +46,7 @@
TEIID40003=VDB {0}.{1} is set to "active"
TEIID40006=VDB {0}.{1} is set to "inactive"
TEIID40036=System.vdb needs to be loaded before any other VDBs.
+TEIID40013=Replication failed for {0}
TEIID40075=User Defined Function (UDF) model "{0}" not found in the VDB
TEIID40035=VDB with given name and version already exists! {0}.{1}
Property changes on: trunk/runtime/src/main/resources/org/teiid/transport
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/runtime/src/main/resources/org/teiid/transport:3535-3555*
/branches/7.6.x/runtime/src/main/resources/org/teiid/transport:3673-3711*,3754-3769
/branches/7.7.x/runtime/src/main/resources/org/teiid/transport:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/runtime/src/main/resources/org/teiid/transport:4002-4046*
/trunk/runtime/src/main/resources/org/teiid/transport:3507-3666
+ /branches/7.4.x/runtime/src/main/resources/org/teiid/transport:3535-3555*
/branches/7.6.x/runtime/src/main/resources/org/teiid/transport:3673-3711*,3754-3769
/branches/7.7.x/runtime/src/main/resources/org/teiid/transport:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/runtime/src/main/resources/org/teiid/transport:4002-4046*,4048-4051*
/trunk/runtime/src/main/resources/org/teiid/transport:3507-3666
Property changes on: trunk/runtime/src/test/java/org/teiid/dqp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/runtime/src/test/java/org/teiid/dqp:3535-3555*
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp:3673-3711*,3754-3769
/branches/7.7.x/runtime/src/test/java/org/teiid/dqp:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/runtime/src/test/java/org/teiid/dqp:4002-4046*
/trunk/runtime/src/test/java/org/teiid/dqp:3507-3666
+ /branches/7.4.x/runtime/src/test/java/org/teiid/dqp:3535-3555*
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp:3673-3711*,3754-3769
/branches/7.7.x/runtime/src/test/java/org/teiid/dqp:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/runtime/src/test/java/org/teiid/dqp:4002-4046*,4048-4051*
/trunk/runtime/src/test/java/org/teiid/dqp:3507-3666
Property changes on: trunk/runtime/src/test/java/org/teiid/dqp/service
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service:3535-3555*
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp/service:3673-3711*,3754-3769
/branches/7.7.x/runtime/src/test/java/org/teiid/dqp/service:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/runtime/src/test/java/org/teiid/dqp/service:4002-4046*
/trunk/runtime/src/test/java/org/teiid/dqp/service:3507-3666
+ /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service:3535-3555*
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp/service:3673-3711*,3754-3769
/branches/7.7.x/runtime/src/test/java/org/teiid/dqp/service:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/runtime/src/test/java/org/teiid/dqp/service:4002-4046*,4048-4051*
/trunk/runtime/src/test/java/org/teiid/dqp/service:3507-3666
Property changes on: trunk/runtime/src/test/java/org/teiid/dqp/service/buffer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3535-3555
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3673-3711,3754-3769
/branches/7.7.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3816-3868,3876-3915,3920-3983
/branches/8.0.x/runtime/src/test/java/org/teiid/dqp/service/buffer:4002-4046
/trunk/runtime/src/test/java/org/teiid/dqp/service/buffer:3507-3666
+ /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3535-3555
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3673-3711,3754-3769
/branches/7.7.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3816-3868,3876-3915,3920-3983
/branches/8.0.x/runtime/src/test/java/org/teiid/dqp/service/buffer:4002-4046,4048-4051
/trunk/runtime/src/test/java/org/teiid/dqp/service/buffer:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/cdk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/cdk:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/cdk:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/cdk:4002-4046*
/trunk/test-integration/common/src/test/java/org/teiid/cdk:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/cdk:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/cdk:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/cdk:4002-4046*,4048-4051*
/trunk/test-integration/common/src/test/java/org/teiid/cdk:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/cdk/api
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk/api:3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/cdk/api:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/cdk/api:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/cdk/api:4002-4046
/trunk/test-integration/common/src/test/java/org/teiid/cdk/api:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk/api:3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/cdk/api:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/cdk/api:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/cdk/api:4002-4046,4048-4051
/trunk/test-integration/common/src/test/java/org/teiid/cdk/api:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/dqp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/dqp:4002-4046*
/trunk/test-integration/common/src/test/java/org/teiid/dqp:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/dqp:4002-4046*,4048-4051*
/trunk/test-integration/common/src/test/java/org/teiid/dqp:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/dqp/internal
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/internal:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp/internal:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp/internal:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/dqp/internal:4002-4046*
/trunk/test-integration/common/src/test/java/org/teiid/dqp/internal:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/internal:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp/internal:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp/internal:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/dqp/internal:4002-4046*,4048-4051*
/trunk/test-integration/common/src/test/java/org/teiid/dqp/internal:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/dqp/internal/process:4002-4046
/trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/dqp/internal/process:4002-4046,4048-4051
/trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/transport
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/transport:4002-4046*
/trunk/test-integration/common/src/test/java/org/teiid/transport:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/transport:4002-4046*,4048-4051*
/trunk/test-integration/common/src/test/java/org/teiid/transport:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3455-3509,3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3816-3868,3920-3983
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:4002-4046
/trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3455-3509,3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3816-3868,3920-3983
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:4002-4046,4048-4051
/trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:4002-4046
/trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3188-3450,3452-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:4002-4046,4048-4051
/trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3188-3450,3452-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSocketTransport:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestJDBCSocketTransport:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestJDBCSocketTransport:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/resources/TestJDBCSocketTransport:4002-4046*
/trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSocketTransport:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestJDBCSocketTransport:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestJDBCSocketTransport:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/resources/TestJDBCSocketTransport:4002-4046*,4048-4051*
/trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTransport:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTransport:4002-4046*
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTransport:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTransport:4002-4046*,4048-4051*
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3188-3450,3452-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3188-3450,3452-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3188-3450,3452-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3188-3450,3452-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel:4002-4046*
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel:4002-4046*,4048-4051*
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3220-3275,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3188-3450,3452-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3220-3275,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3188-3450,3452-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3220-3275,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3188-3450,3452-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3220-3275,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3188-3450,3452-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3507-3666
Property changes on: trunk/test-integration/db/src/main/java/org/teiid/internal
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal:3535-3555*
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal:3673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/main/java/org/teiid/internal:4002-4046*
/trunk/test-integration/db/src/main/java/org/teiid/internal:3507-3666
+ /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal:3535-3555*
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal:3673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/main/java/org/teiid/internal:4002-4046*,4048-4051*
/trunk/test-integration/db/src/main/java/org/teiid/internal:3507-3666
Property changes on: trunk/test-integration/db/src/main/java/org/teiid/internal/core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/core:3535-3555*
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal/core:3673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal/core:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/main/java/org/teiid/internal/core:4002-4046*
/trunk/test-integration/db/src/main/java/org/teiid/internal/core:3507-3666
+ /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/core:3535-3555*
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal/core:3673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal/core:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/main/java/org/teiid/internal/core:4002-4046*,4048-4051*
/trunk/test-integration/db/src/main/java/org/teiid/internal/core:3507-3666
Property changes on: trunk/test-integration/db/src/main/java/org/teiid/internal/core/xml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/core/xml:3535-3555
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal/core/xml:3673-3711,3754-3769
/branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal/core/xml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/db/src/main/java/org/teiid/internal/core/xml:4002-4046
/trunk/test-integration/db/src/main/java/org/teiid/internal/core/xml:3507-3666
+ /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/core/xml:3535-3555
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal/core/xml:3673-3711,3754-3769
/branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal/core/xml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/db/src/main/java/org/teiid/internal/core/xml:4002-4046,4048-4051
/trunk/test-integration/db/src/main/java/org/teiid/internal/core/xml:3507-3666
Property changes on: trunk/test-integration/db/src/test/java/com
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/db/src/test/java/com:3535-3555*
/branches/7.6.x/test-integration/db/src/test/java/com:3673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/test/java/com:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/test/java/com:4002-4046*
/trunk/test-integration/db/src/test/java/com:3507-3666
+ /branches/7.4.x/test-integration/db/src/test/java/com:3535-3555*
/branches/7.6.x/test-integration/db/src/test/java/com:3673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/test/java/com:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/test/java/com:4002-4046*,4048-4051*
/trunk/test-integration/db/src/test/java/com:3507-3666
Property changes on: trunk/test-integration/db/src/test/java/org/teiid/internal
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal:3535-3555*
/branches/7.6.x/test-integration/db/src/test/java/org/teiid/internal:3673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/test/java/org/teiid/internal:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/test/java/org/teiid/internal:4002-4046*
/trunk/test-integration/db/src/test/java/org/teiid/internal:3507-3666
+ /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal:3535-3555*
/branches/7.6.x/test-integration/db/src/test/java/org/teiid/internal:3673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/test/java/org/teiid/internal:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/test/java/org/teiid/internal:4002-4046*,4048-4051*
/trunk/test-integration/db/src/test/java/org/teiid/internal:3507-3666
Property changes on: trunk/test-integration/db/src/test/java/org/teiid/internal/core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal/core:3535-3555*
/branches/7.6.x/test-integration/db/src/test/java/org/teiid/internal/core:3673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/test/java/org/teiid/internal/core:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/test/java/org/teiid/internal/core:4002-4046*
/trunk/test-integration/db/src/test/java/org/teiid/internal/core:3507-3666
+ /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal/core:3535-3555*
/branches/7.6.x/test-integration/db/src/test/java/org/teiid/internal/core:3673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/test/java/org/teiid/internal/core:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/test/java/org/teiid/internal/core:4002-4046*,4048-4051*
/trunk/test-integration/db/src/test/java/org/teiid/internal/core:3507-3666
13 years, 8 months
- 1
- 0
teiid SVN: r4054 - in branches/8.0.x: admin and 30 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-05-02 15:07:28 -0400 (Wed, 02 May 2012)
New Revision: 4054
Modified:
branches/8.0.x/admin/pom.xml
branches/8.0.x/adminshell/pom.xml
branches/8.0.x/api/pom.xml
branches/8.0.x/build/pom.xml
branches/8.0.x/client-jdk15/pom.xml
branches/8.0.x/client/pom.xml
branches/8.0.x/common-core/pom.xml
branches/8.0.x/connectors/connector-file/pom.xml
branches/8.0.x/connectors/connector-ldap/pom.xml
branches/8.0.x/connectors/connector-salesforce/pom.xml
branches/8.0.x/connectors/connector-ws/pom.xml
branches/8.0.x/connectors/pom.xml
branches/8.0.x/connectors/salesforce-api/pom.xml
branches/8.0.x/connectors/sandbox/pom.xml
branches/8.0.x/connectors/sandbox/translator-yahoo/pom.xml
branches/8.0.x/connectors/translator-file/pom.xml
branches/8.0.x/connectors/translator-hive/pom.xml
branches/8.0.x/connectors/translator-jdbc/pom.xml
branches/8.0.x/connectors/translator-ldap/pom.xml
branches/8.0.x/connectors/translator-loopback/pom.xml
branches/8.0.x/connectors/translator-olap/pom.xml
branches/8.0.x/connectors/translator-salesforce/pom.xml
branches/8.0.x/connectors/translator-ws/pom.xml
branches/8.0.x/engine/pom.xml
branches/8.0.x/hibernate-dialect/pom.xml
branches/8.0.x/jboss-integration/pom.xml
branches/8.0.x/metadata/pom.xml
branches/8.0.x/pom.xml
branches/8.0.x/runtime/pom.xml
branches/8.0.x/test-integration/common/pom.xml
branches/8.0.x/test-integration/db/pom.xml
branches/8.0.x/test-integration/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: branches/8.0.x/admin/pom.xml
===================================================================
--- branches/8.0.x/admin/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/admin/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-admin</artifactId>
Modified: branches/8.0.x/adminshell/pom.xml
===================================================================
--- branches/8.0.x/adminshell/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/adminshell/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: branches/8.0.x/api/pom.xml
===================================================================
--- branches/8.0.x/api/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/api/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-api</artifactId>
Modified: branches/8.0.x/build/pom.xml
===================================================================
--- branches/8.0.x/build/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/build/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid</artifactId>
Modified: branches/8.0.x/client/pom.xml
===================================================================
--- branches/8.0.x/client/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/client/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
Modified: branches/8.0.x/client-jdk15/pom.xml
===================================================================
--- branches/8.0.x/client-jdk15/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/client-jdk15/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client-jdk15</artifactId>
Modified: branches/8.0.x/common-core/pom.xml
===================================================================
--- branches/8.0.x/common-core/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/common-core/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-common-core</artifactId>
Modified: branches/8.0.x/connectors/connector-file/pom.xml
===================================================================
--- branches/8.0.x/connectors/connector-file/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/connectors/connector-file/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-file</artifactId>
Modified: branches/8.0.x/connectors/connector-ldap/pom.xml
===================================================================
--- branches/8.0.x/connectors/connector-ldap/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/connectors/connector-ldap/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ldap</artifactId>
Modified: branches/8.0.x/connectors/connector-salesforce/pom.xml
===================================================================
--- branches/8.0.x/connectors/connector-salesforce/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/connectors/connector-salesforce/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-salesforce</artifactId>
Modified: branches/8.0.x/connectors/connector-ws/pom.xml
===================================================================
--- branches/8.0.x/connectors/connector-ws/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/connectors/connector-ws/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ws</artifactId>
Modified: branches/8.0.x/connectors/pom.xml
===================================================================
--- branches/8.0.x/connectors/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/connectors/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/8.0.x/connectors/salesforce-api/pom.xml
===================================================================
--- branches/8.0.x/connectors/salesforce-api/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/connectors/salesforce-api/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>salesforce-api</artifactId>
Modified: branches/8.0.x/connectors/sandbox/pom.xml
===================================================================
--- branches/8.0.x/connectors/sandbox/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/connectors/sandbox/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
Modified: branches/8.0.x/connectors/sandbox/translator-yahoo/pom.xml
===================================================================
--- branches/8.0.x/connectors/sandbox/translator-yahoo/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/connectors/sandbox/translator-yahoo/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-yahoo</artifactId>
Modified: branches/8.0.x/connectors/translator-file/pom.xml
===================================================================
--- branches/8.0.x/connectors/translator-file/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/connectors/translator-file/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-file</artifactId>
Modified: branches/8.0.x/connectors/translator-hive/pom.xml
===================================================================
--- branches/8.0.x/connectors/translator-hive/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/connectors/translator-hive/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-hive</artifactId>
Modified: branches/8.0.x/connectors/translator-jdbc/pom.xml
===================================================================
--- branches/8.0.x/connectors/translator-jdbc/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/connectors/translator-jdbc/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-jdbc</artifactId>
Modified: branches/8.0.x/connectors/translator-ldap/pom.xml
===================================================================
--- branches/8.0.x/connectors/translator-ldap/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/connectors/translator-ldap/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ldap</artifactId>
Modified: branches/8.0.x/connectors/translator-loopback/pom.xml
===================================================================
--- branches/8.0.x/connectors/translator-loopback/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/connectors/translator-loopback/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-loopback</artifactId>
Modified: branches/8.0.x/connectors/translator-olap/pom.xml
===================================================================
--- branches/8.0.x/connectors/translator-olap/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/connectors/translator-olap/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-olap</artifactId>
Modified: branches/8.0.x/connectors/translator-salesforce/pom.xml
===================================================================
--- branches/8.0.x/connectors/translator-salesforce/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/connectors/translator-salesforce/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-salesforce</artifactId>
Modified: branches/8.0.x/connectors/translator-ws/pom.xml
===================================================================
--- branches/8.0.x/connectors/translator-ws/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/connectors/translator-ws/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ws</artifactId>
Modified: branches/8.0.x/engine/pom.xml
===================================================================
--- branches/8.0.x/engine/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/engine/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-engine</artifactId>
Modified: branches/8.0.x/hibernate-dialect/pom.xml
===================================================================
--- branches/8.0.x/hibernate-dialect/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/hibernate-dialect/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-hibernate-dialect</artifactId>
Modified: branches/8.0.x/jboss-integration/pom.xml
===================================================================
--- branches/8.0.x/jboss-integration/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/jboss-integration/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/8.0.x/metadata/pom.xml
===================================================================
--- branches/8.0.x/metadata/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/metadata/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: branches/8.0.x/pom.xml
===================================================================
--- branches/8.0.x/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -10,7 +10,7 @@
<artifactId>teiid-parent</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
<description>Federated SQL and XML query engine.</description>
<properties>
<ant.version>1.7.0</ant.version>
@@ -37,9 +37,9 @@
<version.junit>4.10</version.junit>
</properties>
<scm>
- <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-8.0.0.Final</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-8.0.0.Final</developerConnection>
- <url>http://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-8.0.0.Final</url>
+ <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/branches/8.0.x</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/branches/8.0.x</developerConnection>
+ <url>http://anonsvn.jboss.org/repos/teiid/branches/8.0.x</url>
</scm>
<licenses>
<license>
Modified: branches/8.0.x/runtime/pom.xml
===================================================================
--- branches/8.0.x/runtime/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/runtime/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/8.0.x/test-integration/common/pom.xml
===================================================================
--- branches/8.0.x/test-integration/common/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/test-integration/common/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-integration-common</artifactId>
Modified: branches/8.0.x/test-integration/db/pom.xml
===================================================================
--- branches/8.0.x/test-integration/db/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/test-integration/db/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -9,7 +9,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/8.0.x/test-integration/pom.xml
===================================================================
--- branches/8.0.x/test-integration/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/test-integration/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final</version>
+ <version>8.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
13 years, 8 months
- 1
- 0
teiid SVN: r4053 - tags.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-05-02 15:07:05 -0400 (Wed, 02 May 2012)
New Revision: 4053
Added:
tags/teiid-parent-8.0.0.Final/
Log:
[maven-release-plugin] copy for tag teiid-parent-8.0.0.Final
13 years, 8 months
- 1
- 0
teiid SVN: r4052 - in branches/8.0.x: admin and 30 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-05-02 15:06:52 -0400 (Wed, 02 May 2012)
New Revision: 4052
Modified:
branches/8.0.x/admin/pom.xml
branches/8.0.x/adminshell/pom.xml
branches/8.0.x/api/pom.xml
branches/8.0.x/build/pom.xml
branches/8.0.x/client-jdk15/pom.xml
branches/8.0.x/client/pom.xml
branches/8.0.x/common-core/pom.xml
branches/8.0.x/connectors/connector-file/pom.xml
branches/8.0.x/connectors/connector-ldap/pom.xml
branches/8.0.x/connectors/connector-salesforce/pom.xml
branches/8.0.x/connectors/connector-ws/pom.xml
branches/8.0.x/connectors/pom.xml
branches/8.0.x/connectors/salesforce-api/pom.xml
branches/8.0.x/connectors/sandbox/pom.xml
branches/8.0.x/connectors/sandbox/translator-yahoo/pom.xml
branches/8.0.x/connectors/translator-file/pom.xml
branches/8.0.x/connectors/translator-hive/pom.xml
branches/8.0.x/connectors/translator-jdbc/pom.xml
branches/8.0.x/connectors/translator-ldap/pom.xml
branches/8.0.x/connectors/translator-loopback/pom.xml
branches/8.0.x/connectors/translator-olap/pom.xml
branches/8.0.x/connectors/translator-salesforce/pom.xml
branches/8.0.x/connectors/translator-ws/pom.xml
branches/8.0.x/engine/pom.xml
branches/8.0.x/hibernate-dialect/pom.xml
branches/8.0.x/jboss-integration/pom.xml
branches/8.0.x/metadata/pom.xml
branches/8.0.x/pom.xml
branches/8.0.x/runtime/pom.xml
branches/8.0.x/test-integration/common/pom.xml
branches/8.0.x/test-integration/db/pom.xml
branches/8.0.x/test-integration/pom.xml
Log:
[maven-release-plugin] prepare release teiid-parent-8.0.0.Final
Modified: branches/8.0.x/admin/pom.xml
===================================================================
--- branches/8.0.x/admin/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/admin/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-admin</artifactId>
Modified: branches/8.0.x/adminshell/pom.xml
===================================================================
--- branches/8.0.x/adminshell/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/adminshell/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: branches/8.0.x/api/pom.xml
===================================================================
--- branches/8.0.x/api/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/api/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-api</artifactId>
Modified: branches/8.0.x/build/pom.xml
===================================================================
--- branches/8.0.x/build/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/build/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid</artifactId>
Modified: branches/8.0.x/client/pom.xml
===================================================================
--- branches/8.0.x/client/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/client/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
Modified: branches/8.0.x/client-jdk15/pom.xml
===================================================================
--- branches/8.0.x/client-jdk15/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/client-jdk15/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client-jdk15</artifactId>
Modified: branches/8.0.x/common-core/pom.xml
===================================================================
--- branches/8.0.x/common-core/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/common-core/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-common-core</artifactId>
Modified: branches/8.0.x/connectors/connector-file/pom.xml
===================================================================
--- branches/8.0.x/connectors/connector-file/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/connectors/connector-file/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-file</artifactId>
Modified: branches/8.0.x/connectors/connector-ldap/pom.xml
===================================================================
--- branches/8.0.x/connectors/connector-ldap/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/connectors/connector-ldap/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ldap</artifactId>
Modified: branches/8.0.x/connectors/connector-salesforce/pom.xml
===================================================================
--- branches/8.0.x/connectors/connector-salesforce/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/connectors/connector-salesforce/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-salesforce</artifactId>
Modified: branches/8.0.x/connectors/connector-ws/pom.xml
===================================================================
--- branches/8.0.x/connectors/connector-ws/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/connectors/connector-ws/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ws</artifactId>
Modified: branches/8.0.x/connectors/pom.xml
===================================================================
--- branches/8.0.x/connectors/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/connectors/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/8.0.x/connectors/salesforce-api/pom.xml
===================================================================
--- branches/8.0.x/connectors/salesforce-api/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/connectors/salesforce-api/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>salesforce-api</artifactId>
Modified: branches/8.0.x/connectors/sandbox/pom.xml
===================================================================
--- branches/8.0.x/connectors/sandbox/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/connectors/sandbox/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
Modified: branches/8.0.x/connectors/sandbox/translator-yahoo/pom.xml
===================================================================
--- branches/8.0.x/connectors/sandbox/translator-yahoo/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/connectors/sandbox/translator-yahoo/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-yahoo</artifactId>
Modified: branches/8.0.x/connectors/translator-file/pom.xml
===================================================================
--- branches/8.0.x/connectors/translator-file/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/connectors/translator-file/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-file</artifactId>
Modified: branches/8.0.x/connectors/translator-hive/pom.xml
===================================================================
--- branches/8.0.x/connectors/translator-hive/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/connectors/translator-hive/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-hive</artifactId>
Modified: branches/8.0.x/connectors/translator-jdbc/pom.xml
===================================================================
--- branches/8.0.x/connectors/translator-jdbc/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/connectors/translator-jdbc/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-jdbc</artifactId>
Modified: branches/8.0.x/connectors/translator-ldap/pom.xml
===================================================================
--- branches/8.0.x/connectors/translator-ldap/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/connectors/translator-ldap/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ldap</artifactId>
Modified: branches/8.0.x/connectors/translator-loopback/pom.xml
===================================================================
--- branches/8.0.x/connectors/translator-loopback/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/connectors/translator-loopback/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-loopback</artifactId>
Modified: branches/8.0.x/connectors/translator-olap/pom.xml
===================================================================
--- branches/8.0.x/connectors/translator-olap/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/connectors/translator-olap/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-olap</artifactId>
Modified: branches/8.0.x/connectors/translator-salesforce/pom.xml
===================================================================
--- branches/8.0.x/connectors/translator-salesforce/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/connectors/translator-salesforce/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-salesforce</artifactId>
Modified: branches/8.0.x/connectors/translator-ws/pom.xml
===================================================================
--- branches/8.0.x/connectors/translator-ws/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/connectors/translator-ws/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ws</artifactId>
Modified: branches/8.0.x/engine/pom.xml
===================================================================
--- branches/8.0.x/engine/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/engine/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-engine</artifactId>
Modified: branches/8.0.x/hibernate-dialect/pom.xml
===================================================================
--- branches/8.0.x/hibernate-dialect/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/hibernate-dialect/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-hibernate-dialect</artifactId>
Modified: branches/8.0.x/jboss-integration/pom.xml
===================================================================
--- branches/8.0.x/jboss-integration/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/jboss-integration/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/8.0.x/metadata/pom.xml
===================================================================
--- branches/8.0.x/metadata/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/metadata/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: branches/8.0.x/pom.xml
===================================================================
--- branches/8.0.x/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -10,7 +10,7 @@
<artifactId>teiid-parent</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
<description>Federated SQL and XML query engine.</description>
<properties>
<ant.version>1.7.0</ant.version>
@@ -37,9 +37,9 @@
<version.junit>4.10</version.junit>
</properties>
<scm>
- <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/branches/8.0.x</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/branches/8.0.x</developerConnection>
- <url>http://anonsvn.jboss.org/repos/teiid/branches/8.0.x</url>
+ <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-8.0.0.Final</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-8.0.0.Final</developerConnection>
+ <url>http://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-8.0.0.Final</url>
</scm>
<licenses>
<license>
Modified: branches/8.0.x/runtime/pom.xml
===================================================================
--- branches/8.0.x/runtime/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/runtime/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/8.0.x/test-integration/common/pom.xml
===================================================================
--- branches/8.0.x/test-integration/common/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/test-integration/common/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-integration-common</artifactId>
Modified: branches/8.0.x/test-integration/db/pom.xml
===================================================================
--- branches/8.0.x/test-integration/db/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/test-integration/db/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -9,7 +9,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/8.0.x/test-integration/pom.xml
===================================================================
--- branches/8.0.x/test-integration/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/test-integration/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Final-SNAPSHOT</version>
+ <version>8.0.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
13 years, 8 months
- 1
- 0
teiid SVN: r4051 - in trunk: runtime/src/main/java/org/teiid/transport and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-05-02 13:06:23 -0400 (Wed, 02 May 2012)
New Revision: 4051
Modified:
trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java
trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
Log:
TEIID-2025 using getCharacterStream for pg_text
Modified: trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java 2012-05-02 17:05:07 UTC (rev 4050)
+++ trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java 2012-05-02 17:06:23 UTC (rev 4051)
@@ -102,8 +102,6 @@
case Types.LONGVARCHAR:
case Types.CLOB:
- return PG_TYPE_TEXT;
-
case Types.SQLXML:
return PG_TYPE_TEXT;
Modified: trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java 2012-05-02 17:05:07 UTC (rev 4050)
+++ trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java 2012-05-02 17:06:23 UTC (rev 4051)
@@ -32,7 +32,6 @@
import java.nio.charset.Charset;
import java.security.GeneralSecurityException;
import java.sql.Blob;
-import java.sql.Clob;
import java.sql.ParameterMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -482,9 +481,8 @@
break;
case PG_TYPE_TEXT:
- Clob clob = rs.getClob(column);
- if (clob != null) {
- Reader r = clob.getCharacterStream();
+ Reader r = rs.getCharacterStream(column);
+ if (r != null) {
try {
ObjectConverterUtil.write(writer, r, this.maxLobSize, false);
} finally {
Modified: trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2012-05-02 17:05:07 UTC (rev 4050)
+++ trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2012-05-02 17:06:23 UTC (rev 4051)
@@ -345,4 +345,25 @@
assertTrue(s.execute("select * from tables order by name"));
TestMMDatabaseMetaData.compareResultSet("TestODBCSocketTransport/testSelect", s.getResultSet());
}
+
+ @Test public void testPayload() throws Exception {
+ Statement s = conn.createStatement();
+ assertFalse(s.execute("SET PAYLOAD x y"));
+ assertTrue(s.execute("SELECT commandpayload('x')"));
+ ResultSet rs = s.getResultSet();
+ assertTrue(rs.next());
+ String str = rs.getString(1);
+ assertEquals("y", str);
+ }
+
+ @Test public void testShowPlan() throws Exception {
+ Statement s = conn.createStatement();
+ assertFalse(s.execute("SET SHOWPLAN ON"));
+ assertTrue(s.execute("SELECT 1"));
+ assertTrue(s.execute("SHOW PLAN"));
+ ResultSet rs = s.getResultSet();
+ assertTrue(rs.next());
+ String str = rs.getString(1);
+ assertEquals("ProjectNode\n + Output Columns:expr1 (integer)\n + Statistics:\n 0: Node Output Rows: 1\n 1: Node Process Time: 0\n 2: Node Cumulative Process Time: 0\n 3: Node Cumulative Next Batch Process Time: 0\n 4: Node Next Batch Calls: 1\n 5: Node Blocks: 0\n + Cost Estimates:Estimated Node Cardinality: 1.0\n + Select Columns:1\n", str);
+ }
}
13 years, 8 months
- 1
- 0