teiid SVN: r942 - in trunk: engine/src/main/java/com/metamatrix/query/validator and 2 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-05-14 22:55:01 -0400 (Thu, 14 May 2009)
New Revision: 942
Removed:
trunk/console/src/main/java/com/metamatrix/console/ui/views/users/InheritedRole.java
Modified:
trunk/engine/src/main/java/com/metamatrix/query/validator/ValidationVisitor.java
trunk/engine/src/main/resources/com/metamatrix/query/i18n.properties
trunk/engine/src/test/java/com/metamatrix/query/validator/TestValidator.java
Log:
TEIID-599 ensuring that the validation message for non-comparable types is correct
Deleted: trunk/console/src/main/java/com/metamatrix/console/ui/views/users/InheritedRole.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/users/InheritedRole.java 2009-05-14 19:00:51 UTC (rev 941)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/users/InheritedRole.java 2009-05-15 02:55:01 UTC (rev 942)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership. Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-package com.metamatrix.console.ui.views.users;
-
-public class InheritedRole {
- private RoleDisplay role;
- private String inheritedThroughGroup;
-
- public InheritedRole(RoleDisplay role, String group) {
- super();
- this.role = role;
- this.inheritedThroughGroup = group;
- }
-
- public RoleDisplay getRoleDisplay() {
- return role;
- }
-
- public String getInheritedThroughGroup() {
- return inheritedThroughGroup;
- }
-}
Modified: trunk/engine/src/main/java/com/metamatrix/query/validator/ValidationVisitor.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/query/validator/ValidationVisitor.java 2009-05-14 19:00:51 UTC (rev 941)
+++ trunk/engine/src/main/java/com/metamatrix/query/validator/ValidationVisitor.java 2009-05-15 02:55:01 UTC (rev 942)
@@ -224,7 +224,7 @@
public void visit(SubquerySetCriteria obj) {
if (isNonComparable(obj.getExpression())) {
- handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VALIDATOR_0027),obj);
+ handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VALIDATOR_0027, obj),obj);
}
this.validateRowLimitFunctionNotInInvalidCriteria(obj);
@@ -932,7 +932,7 @@
*/
public void visit(BetweenCriteria obj) {
if (isNonComparable(obj.getExpression())) {
- handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VALIDATOR_0027),obj);
+ handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VALIDATOR_0027, obj),obj);
}
this.validateRowLimitFunctionNotInInvalidCriteria(obj);
}
@@ -967,7 +967,7 @@
*/
public void visit(SetCriteria obj) {
if (isNonComparable(obj.getExpression())) {
- handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VALIDATOR_0027),obj);
+ handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VALIDATOR_0027, obj),obj);
}
this.validateRowLimitFunctionNotInInvalidCriteria(obj);
}
@@ -978,7 +978,7 @@
*/
public void visit(SubqueryCompareCriteria obj) {
if (isNonComparable(obj.getLeftExpression())) {
- handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VALIDATOR_0027),obj);
+ handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VALIDATOR_0027, obj),obj);
}
this.validateRowLimitFunctionNotInInvalidCriteria(obj);
}
@@ -1027,7 +1027,7 @@
@Override
public void visit(CompareCriteria obj) {
if (isNonComparable(obj.getLeftExpression())) {
- handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VALIDATOR_0027),obj);
+ handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VALIDATOR_0027, obj),obj);
}
}
Modified: trunk/engine/src/main/resources/com/metamatrix/query/i18n.properties
===================================================================
--- trunk/engine/src/main/resources/com/metamatrix/query/i18n.properties 2009-05-14 19:00:51 UTC (rev 941)
+++ trunk/engine/src/main/resources/com/metamatrix/query/i18n.properties 2009-05-15 02:55:01 UTC (rev 942)
@@ -276,8 +276,8 @@
ERR.015.012.0023 = Unable to translate criteria on the update command against the virtual group, the element {0} is mapped to an expression whose elements are not present on the command in the procedure using the translated criteria.
ERR.015.012.0024 = The following data elements are not supported in the SELECT clause: {0}.
ERR.015.012.0025 = Command must project at least one symbol
-ERR.015.012.0026 = Expressions of type OBJECT, CLOB, BLOB, or XML cannot be used in SELECT DISTINCT, ORDER BY, GROUP BY, or UNION: [{0}]
-ERR.015.012.0027 = Expressions of type OBJECT, CLOB, BLOB, or XML cannot be used in comparison criteria: {0}.
+ERR.015.012.0026 = Expressions of type OBJECT, CLOB, BLOB, or XML cannot be used in SELECT DISTINCT, ORDER BY, GROUP BY, or non-all set queries: [{0}]
+ERR.015.012.0027 = Expressions of type OBJECT, CLOB, BLOB, or XML cannot be used in comparison: {0}.
ValidationVisitor.invalid_lookup_key=Expressions of type OBJECT, CLOB, BLOB, or XML cannot be used as LOOKUP key columns: {0}.
ValidationVisitor.limit_not_valid_for_xml=The limit clause cannot be used on an XML document query.
ValidateCriteriaVistitor.element_not_comparable = The following data elements are not supported in comparison criteria: {0}.
Modified: trunk/engine/src/test/java/com/metamatrix/query/validator/TestValidator.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/query/validator/TestValidator.java 2009-05-14 19:00:51 UTC (rev 941)
+++ trunk/engine/src/test/java/com/metamatrix/query/validator/TestValidator.java 2009-05-15 02:55:01 UTC (rev 942)
@@ -344,16 +344,15 @@
return command;
}
- static void helpValidate(String sql, String[] expectedStringArray, QueryMetadataInterface metadata) {
+ static ValidatorReport helpValidate(String sql, String[] expectedStringArray, QueryMetadataInterface metadata) {
Command command = helpResolve(sql, metadata);
- helpRunValidator(command, expectedStringArray, metadata);
+ return helpRunValidator(command, expectedStringArray, metadata);
}
- public static void helpRunValidator(Command command, String[] expectedStringArray, QueryMetadataInterface metadata) {
+ public static ValidatorReport helpRunValidator(Command command, String[] expectedStringArray, QueryMetadataInterface metadata) {
try {
ValidatorReport report = Validator.validate(command, metadata);
- //System.out.println("\nReport = \n" + report);
ValidatorReport report3 = Validator.validate(command, metadata, new ValueValidationVisitor(), true);
@@ -372,12 +371,13 @@
}
if(expectedStrings.size() == 0 && actualStrings.size() > 0) {
- fail("Expected no failures but got some: " + report.getFailureMessage() + ", " + report3.getFailureMessage()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ fail("Expected no failures but got some: " + report.getFailureMessage() + ", " + report3.getFailureMessage()); //$NON-NLS-1$ //$NON-NLS-2$
} else if(actualStrings.size() == 0 && expectedStrings.size() > 0) {
fail("Expected some failures but got none for sql = " + command); //$NON-NLS-1$
} else {
assertEquals("Expected and actual sets of strings are not the same: ", expectedStrings, actualStrings); //$NON-NLS-1$
}
+ return report;
} catch(MetaMatrixException e) {
throw new MetaMatrixRuntimeException(e);
}
@@ -441,11 +441,11 @@
}
public void testValidateCompare1() {
- helpValidate("SELECT e2 FROM vTest.vMap WHERE e2 = 'a'", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
+ helpValidate("SELECT e2 FROM vTest.vMap WHERE e2 = 'a'", new String[] {}, exampleMetadata()); //$NON-NLS-1$
}
public void testValidateCompare4() {
- helpValidate("SELECT e3 FROM vTest.vMap WHERE e3 LIKE 'a'", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
+ helpValidate("SELECT e3 FROM vTest.vMap WHERE e3 LIKE 'a'", new String[] {}, exampleMetadata()); //$NON-NLS-1$
}
public void testValidateCompare6() {
@@ -453,19 +453,19 @@
}
public void testValidateCompareInHaving2() {
- helpValidate("SELECT e2 FROM vTest.vMap GROUP BY e2 HAVING e2 IS NULL", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
+ helpValidate("SELECT e2 FROM vTest.vMap GROUP BY e2 HAVING e2 IS NULL", new String[] {}, exampleMetadata()); //$NON-NLS-1$
}
public void testValidateCompareInHaving3() {
- helpValidate("SELECT e2 FROM vTest.vMap GROUP BY e2 HAVING e2 IN ('a')", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
+ helpValidate("SELECT e2 FROM vTest.vMap GROUP BY e2 HAVING e2 IN ('a')", new String[] {}, exampleMetadata()); //$NON-NLS-1$
}
public void testValidateCompareInHaving4() {
- helpValidate("SELECT e3 FROM vTest.vMap GROUP BY e3 HAVING e3 LIKE 'a'", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
+ helpValidate("SELECT e3 FROM vTest.vMap GROUP BY e3 HAVING e3 LIKE 'a'", new String[] {}, exampleMetadata()); //$NON-NLS-1$
}
public void testValidateCompareInHaving5() {
- helpValidate("SELECT e2 FROM vTest.vMap GROUP BY e2 HAVING e2 BETWEEN 1000 AND 2000", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
+ helpValidate("SELECT e2 FROM vTest.vMap GROUP BY e2 HAVING e2 BETWEEN 1000 AND 2000", new String[] {}, exampleMetadata()); //$NON-NLS-1$
}
public void testInvalidAggregate1() {
@@ -1019,11 +1019,11 @@
}
public void testValidateSubquery1() {
- helpValidate("SELECT e2 FROM (SELECT e2 FROM vTest.vMap WHERE e2 = 'a') AS x", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
+ helpValidate("SELECT e2 FROM (SELECT e2 FROM vTest.vMap WHERE e2 = 'a') AS x", new String[] {}, exampleMetadata()); //$NON-NLS-1$
}
public void testValidateSubquery2() {
- helpValidate("SELECT e2 FROM (SELECT e3 FROM vTest.vMap) AS x, vTest.vMap WHERE e2 = 'a'", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
+ helpValidate("SELECT e2 FROM (SELECT e3 FROM vTest.vMap) AS x, vTest.vMap WHERE e2 = 'a'", new String[] {}, exampleMetadata()); //$NON-NLS-1$
}
public void testValidateSubquery3() {
@@ -1035,11 +1035,11 @@
}
public void testValidateExistsSubquery() {
- helpValidate("SELECT e2 FROM test.group2 WHERE EXISTS (SELECT e2 FROM vTest.vMap WHERE e2 = 'a')", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
+ helpValidate("SELECT e2 FROM test.group2 WHERE EXISTS (SELECT e2 FROM vTest.vMap WHERE e2 = 'a')", new String[] {}, exampleMetadata()); //$NON-NLS-1$
}
public void testValidateScalarSubquery() {
- helpValidate("SELECT e2, (SELECT e1 FROM vTest.vMap WHERE e2 = '3') FROM test.group2", new String[] {"e1"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ helpValidate("SELECT e2, (SELECT e1 FROM vTest.vMap WHERE e2 = '3') FROM test.group2", new String[] {"e1"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testValidateAnyCompareSubquery() {
@@ -1633,6 +1633,8 @@
public void testValidateObjectInComparison() throws Exception {
String sql = "SELECT IntKey FROM BQT1.SmallA WHERE ObjectValue = 5"; //$NON-NLS-1$
+ ValidatorReport report = helpValidate(sql, new String[] {"ObjectValue = 5"}, FakeMetadataFactory.exampleBQTCached()); //$NON-NLS-1$
+ assertEquals("Expressions of type OBJECT, CLOB, BLOB, or XML cannot be used in comparison: ObjectValue = 5.", report.toString()); //$NON-NLS-1$
}
public void testValidateAssignmentWithFunctionOnParameter_InServer() throws Exception{
@@ -1737,7 +1739,7 @@
QueryMetadataInterface metadata = FakeMetadataFactory.exampleBQTCached();
// Validate
- helpValidate(sql, new String[] {"BQT1.SmallA.ObjectValue = BQT2.SmallB.ObjectValue"}, metadata); //$NON-NLS-1$ //$NON-NLS-2$
+ helpValidate(sql, new String[] {"BQT1.SmallA.ObjectValue = BQT2.SmallB.ObjectValue"}, metadata); //$NON-NLS-1$
}
public void testDefect16772() throws Exception{
@@ -1958,7 +1960,7 @@
}
public void testClobEquals() {
- TestValidator.helpValidate("SELECT * FROM test.group where e4 = '1'", new String[] {"e4 = '1'"}, TestValidator.exampleMetadata2()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ TestValidator.helpValidate("SELECT * FROM test.group where e4 = '1'", new String[] {"e4 = '1'"}, TestValidator.exampleMetadata2()); //$NON-NLS-1$ //$NON-NLS-2$
}
/**
@@ -1969,11 +1971,11 @@
}
public void testBlobLessThan() {
- TestValidator.helpValidate("SELECT * FROM test.group where e3 < ?", new String[] {"e3 < ?"}, TestValidator.exampleMetadata2()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ TestValidator.helpValidate("SELECT * FROM test.group where e3 < ?", new String[] {"e3 < ?"}, TestValidator.exampleMetadata2()); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testValidateCompare2() {
- helpValidate("SELECT e2 FROM test.group WHERE e4 IS NULL", new String[] {}, exampleMetadata2()); //$NON-NLS-1$ //$NON-NLS-2$
+ helpValidate("SELECT e2 FROM test.group WHERE e4 IS NULL", new String[] {}, exampleMetadata2()); //$NON-NLS-1$
}
public void testValidateCompare3() {
14 years, 11 months
- 1
- 0
teiid SVN: r941 - in branches/6.0.x: adminshell and 37 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-05-14 15:00:51 -0400 (Thu, 14 May 2009)
New Revision: 941
Modified:
branches/6.0.x/adminshell/pom.xml
branches/6.0.x/cache-jbosscache/pom.xml
branches/6.0.x/client-jdbc/pom.xml
branches/6.0.x/client/pom.xml
branches/6.0.x/common-core/pom.xml
branches/6.0.x/common-internal/pom.xml
branches/6.0.x/connector-api/pom.xml
branches/6.0.x/connector-metadata/pom.xml
branches/6.0.x/connector-sdk/pom.xml
branches/6.0.x/connectors/connector-jdbc/pom.xml
branches/6.0.x/connectors/connector-ldap/pom.xml
branches/6.0.x/connectors/connector-loopback/pom.xml
branches/6.0.x/connectors/connector-salesforce/pom.xml
branches/6.0.x/connectors/connector-text/pom.xml
branches/6.0.x/connectors/connector-xml-common/pom.xml
branches/6.0.x/connectors/connector-xml/pom.xml
branches/6.0.x/connectors/pom.xml
branches/6.0.x/connectors/salesforce-api/pom.xml
branches/6.0.x/connectors/sandbox/connector-exec/pom.xml
branches/6.0.x/connectors/sandbox/connector-object/pom.xml
branches/6.0.x/connectors/sandbox/connector-oracle-spatial/pom.xml
branches/6.0.x/connectors/sandbox/connector-yahoo/pom.xml
branches/6.0.x/connectors/sandbox/pom.xml
branches/6.0.x/console/pom.xml
branches/6.0.x/documentation/admin-guide/pom.xml
branches/6.0.x/documentation/connector-developer-guide/pom.xml
branches/6.0.x/documentation/pom.xml
branches/6.0.x/documentation/quick-start-example/pom.xml
branches/6.0.x/documentation/reference/pom.xml
branches/6.0.x/documentation/server-extensions-guide/pom.xml
branches/6.0.x/embedded/pom.xml
branches/6.0.x/engine/pom.xml
branches/6.0.x/metadata/pom.xml
branches/6.0.x/pom.xml
branches/6.0.x/server-installer/pom.xml
branches/6.0.x/server/pom.xml
branches/6.0.x/soap/pom.xml
branches/6.0.x/test-integration/pom.xml
branches/6.0.x/txn-jbossts/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: branches/6.0.x/adminshell/pom.xml
===================================================================
--- branches/6.0.x/adminshell/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/adminshell/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: branches/6.0.x/cache-jbosscache/pom.xml
===================================================================
--- branches/6.0.x/cache-jbosscache/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/cache-jbosscache/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-cache-jbosscache</artifactId>
Modified: branches/6.0.x/client/pom.xml
===================================================================
--- branches/6.0.x/client/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/client/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
Modified: branches/6.0.x/client-jdbc/pom.xml
===================================================================
--- branches/6.0.x/client-jdbc/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/client-jdbc/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client-jdbc</artifactId>
Modified: branches/6.0.x/common-core/pom.xml
===================================================================
--- branches/6.0.x/common-core/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/common-core/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-common-core</artifactId>
Modified: branches/6.0.x/common-internal/pom.xml
===================================================================
--- branches/6.0.x/common-internal/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/common-internal/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-common-internal</artifactId>
Modified: branches/6.0.x/connector-api/pom.xml
===================================================================
--- branches/6.0.x/connector-api/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/connector-api/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-connector-api</artifactId>
Modified: branches/6.0.x/connector-metadata/pom.xml
===================================================================
--- branches/6.0.x/connector-metadata/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/connector-metadata/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/6.0.x/connector-sdk/pom.xml
===================================================================
--- branches/6.0.x/connector-sdk/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/connector-sdk/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-connector-sdk</artifactId>
Modified: branches/6.0.x/connectors/connector-jdbc/pom.xml
===================================================================
--- branches/6.0.x/connectors/connector-jdbc/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/connectors/connector-jdbc/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-jdbc</artifactId>
Modified: branches/6.0.x/connectors/connector-ldap/pom.xml
===================================================================
--- branches/6.0.x/connectors/connector-ldap/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/connectors/connector-ldap/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ldap</artifactId>
Modified: branches/6.0.x/connectors/connector-loopback/pom.xml
===================================================================
--- branches/6.0.x/connectors/connector-loopback/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/connectors/connector-loopback/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-loopback</artifactId>
Modified: branches/6.0.x/connectors/connector-salesforce/pom.xml
===================================================================
--- branches/6.0.x/connectors/connector-salesforce/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/connectors/connector-salesforce/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-salesforce</artifactId>
Modified: branches/6.0.x/connectors/connector-text/pom.xml
===================================================================
--- branches/6.0.x/connectors/connector-text/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/connectors/connector-text/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-text</artifactId>
Modified: branches/6.0.x/connectors/connector-xml/pom.xml
===================================================================
--- branches/6.0.x/connectors/connector-xml/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/connectors/connector-xml/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-xml</artifactId>
Modified: branches/6.0.x/connectors/connector-xml-common/pom.xml
===================================================================
--- branches/6.0.x/connectors/connector-xml-common/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/connectors/connector-xml-common/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-xml-common</artifactId>
Modified: branches/6.0.x/connectors/pom.xml
===================================================================
--- branches/6.0.x/connectors/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/connectors/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/6.0.x/connectors/salesforce-api/pom.xml
===================================================================
--- branches/6.0.x/connectors/salesforce-api/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/connectors/salesforce-api/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>salesforce-api</artifactId>
Modified: branches/6.0.x/connectors/sandbox/connector-exec/pom.xml
===================================================================
--- branches/6.0.x/connectors/sandbox/connector-exec/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/connectors/sandbox/connector-exec/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-exec</artifactId>
Modified: branches/6.0.x/connectors/sandbox/connector-object/pom.xml
===================================================================
--- branches/6.0.x/connectors/sandbox/connector-object/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/connectors/sandbox/connector-object/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-object</artifactId>
Modified: branches/6.0.x/connectors/sandbox/connector-oracle-spatial/pom.xml
===================================================================
--- branches/6.0.x/connectors/sandbox/connector-oracle-spatial/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/connectors/sandbox/connector-oracle-spatial/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-oracle-spatial</artifactId>
Modified: branches/6.0.x/connectors/sandbox/connector-yahoo/pom.xml
===================================================================
--- branches/6.0.x/connectors/sandbox/connector-yahoo/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/connectors/sandbox/connector-yahoo/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-yahoo</artifactId>
Modified: branches/6.0.x/connectors/sandbox/pom.xml
===================================================================
--- branches/6.0.x/connectors/sandbox/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/connectors/sandbox/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
Modified: branches/6.0.x/console/pom.xml
===================================================================
--- branches/6.0.x/console/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/console/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-console</artifactId>
Modified: branches/6.0.x/documentation/admin-guide/pom.xml
===================================================================
--- branches/6.0.x/documentation/admin-guide/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/documentation/admin-guide/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid.documentation</groupId>
<artifactId>documentation</artifactId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>admin-guide</artifactId>
Modified: branches/6.0.x/documentation/connector-developer-guide/pom.xml
===================================================================
--- branches/6.0.x/documentation/connector-developer-guide/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/documentation/connector-developer-guide/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid.documentation</groupId>
<artifactId>documentation</artifactId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-developer-guide</artifactId>
Modified: branches/6.0.x/documentation/pom.xml
===================================================================
--- branches/6.0.x/documentation/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/documentation/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.documentation</groupId>
Modified: branches/6.0.x/documentation/quick-start-example/pom.xml
===================================================================
--- branches/6.0.x/documentation/quick-start-example/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/documentation/quick-start-example/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid.documentation</groupId>
<artifactId>documentation</artifactId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>quick-start-guide</artifactId>
Modified: branches/6.0.x/documentation/reference/pom.xml
===================================================================
--- branches/6.0.x/documentation/reference/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/documentation/reference/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid.documentation</groupId>
<artifactId>documentation</artifactId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>reference</artifactId>
Modified: branches/6.0.x/documentation/server-extensions-guide/pom.xml
===================================================================
--- branches/6.0.x/documentation/server-extensions-guide/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/documentation/server-extensions-guide/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid.documentation</groupId>
<artifactId>documentation</artifactId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>server-extensions-guide</artifactId>
Modified: branches/6.0.x/embedded/pom.xml
===================================================================
--- branches/6.0.x/embedded/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/embedded/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/6.0.x/engine/pom.xml
===================================================================
--- branches/6.0.x/engine/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/engine/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-engine</artifactId>
Modified: branches/6.0.x/metadata/pom.xml
===================================================================
--- branches/6.0.x/metadata/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/metadata/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: branches/6.0.x/pom.xml
===================================================================
--- branches/6.0.x/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -5,14 +5,14 @@
<artifactId>teiid</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
<description>Federated SQL and XML query engine.</description>
<properties>
<ant.version>1.7.0</ant.version>
<site.url>http://www.jboss.org/teiid</site.url>
</properties>
<scm>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-6.0.1</developerConnection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/branches/6.0.x</developerConnection>
</scm>
<licenses>
<license>
Modified: branches/6.0.x/server/pom.xml
===================================================================
--- branches/6.0.x/server/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/server/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-server</artifactId>
Modified: branches/6.0.x/server-installer/pom.xml
===================================================================
--- branches/6.0.x/server-installer/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/server-installer/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/6.0.x/soap/pom.xml
===================================================================
--- branches/6.0.x/soap/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/soap/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-soap</artifactId>
Modified: branches/6.0.x/test-integration/pom.xml
===================================================================
--- branches/6.0.x/test-integration/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/test-integration/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
Modified: branches/6.0.x/txn-jbossts/pom.xml
===================================================================
--- branches/6.0.x/txn-jbossts/pom.xml 2009-05-14 19:00:35 UTC (rev 940)
+++ branches/6.0.x/txn-jbossts/pom.xml 2009-05-14 19:00:51 UTC (rev 941)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1</version>
+ <version>6.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-txn-jbossts</artifactId>
14 years, 11 months
- 1
- 0
teiid SVN: r940 - tags.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-05-14 15:00:35 -0400 (Thu, 14 May 2009)
New Revision: 940
Added:
tags/teiid-6.0.1/
Log:
[maven-release-plugin] copy for tag teiid-6.0.1
Copied: tags/teiid-6.0.1 (from rev 938, branches/6.0.x)
14 years, 11 months
- 1
- 0
teiid SVN: r939 - trunk/client-jdbc/src/main/java/com/metamatrix/jdbc.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-05-14 14:58:19 -0400 (Thu, 14 May 2009)
New Revision: 939
Modified:
trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java
Log:
TEIID-590: Adding "PostDelegationLibraries" to define the fine grained approach to the classloading for Embedded.
Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java
===================================================================
--- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java 2009-05-14 18:34:43 UTC (rev 938)
+++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java 2009-05-14 18:58:19 UTC (rev 939)
@@ -26,6 +26,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
+import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.sql.Connection;
@@ -38,6 +39,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Properties;
+import java.util.StringTokenizer;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -72,7 +74,8 @@
static final String URL_PATTERN = "jdbc:metamatrix:(\\w+)@(([^;]*)[;]?)((.*)*)"; //$NON-NLS-1$
static final String BASE_PATTERN = "jdbc:metamatrix:((\\w+)[;]?)(;([^@])+)*"; //$NON-NLS-1$
public static final String DRIVER_NAME = "Teiid Embedded JDBC Driver"; //$NON-NLS-1$
-
+ public static final String POST_DELEGATION_LIBRARIES = "PostDelegationLibraries"; //$NON-NLS-1$
+
static final String DQP_IDENTITY = "dqp.identity"; //$NON-NLS-1$
static final String MM_IO_TMPDIR = "mm.io.tmpdir"; //$NON-NLS-1$
private static Logger logger = Logger.getLogger("org.teiid.jdbc"); //$NON-NLS-1$
@@ -343,7 +346,7 @@
* @since 4.3
*/
static class EmbeddedTransport {
- private EmbeddedConnectionFactory connectionFactory;
+ private EmbeddedConnectionFactory connectionFactory;
private ClassLoader classLoader;
private String workspaceDirectory;
private URL url;
@@ -358,11 +361,12 @@
//Load the properties from dqp.properties file
Properties props = loadDQPProperties(dqpURL);
props.putAll(info);
-
+
this.classLoader = this.getClass().getClassLoader();
// a non-delegating class loader will be created from where all third party dependent jars can be loaded
- ArrayList<URL> runtimeClasspath = new ArrayList<URL>();
+ ArrayList<URL> runtimeClasspathList = new ArrayList<URL>();
+ ArrayList<URL> postDelegationClasspathList = null;
String libLocation = info.getProperty("dqp.lib", "./lib/"); //$NON-NLS-1$ //$NON-NLS-2$
if (!libLocation.endsWith("/")) { //$NON-NLS-1$
libLocation = libLocation + "/"; //$NON-NLS-1$
@@ -370,18 +374,25 @@
// find jars in the "lib" directory; patches is reverse alpaha and not case sensitive so small letters then capitals
if (!EmbeddedDriver.getDefaultConnectionURL().equals(dqpURL.toString())) {
- runtimeClasspath.addAll(libClassPath(dqpURL, libLocation+"patches/", MMURLConnection.REVERSEALPHA)); //$NON-NLS-1$
- runtimeClasspath.addAll(libClassPath(dqpURL, libLocation, MMURLConnection.DATE));
+ runtimeClasspathList.addAll(libClassPath(dqpURL, libLocation+"patches/", MMURLConnection.REVERSEALPHA)); //$NON-NLS-1$
+ runtimeClasspathList.addAll(libClassPath(dqpURL, libLocation, MMURLConnection.DATE));
+
+ // check if a specific post delegation rules specified for loading
+ String postDelgationLibraries = info.getProperty(POST_DELEGATION_LIBRARIES);
+ if (postDelgationLibraries != null) {
+ postDelegationClasspathList = resolvePath(dqpURL, libLocation, postDelgationLibraries);
+ runtimeClasspathList.removeAll(postDelegationClasspathList);
+ }
}
- URL[] dqpClassPath = runtimeClasspath.toArray(new URL[runtimeClasspath.size()]);
- boolean useNondelegation = Boolean.parseBoolean(info.getProperty("dqp.useNonDelegateClassloader", "false")); //$NON-NLS-1$ //$NON-NLS-2$
- if (useNondelegation) {
- this.classLoader = new NonDelegatingClassLoader(dqpClassPath, Thread.currentThread().getContextClassLoader(), new MetaMatrixURLStreamHandlerFactory());
+ URL[] dqpClassPath = runtimeClasspathList.toArray(new URL[runtimeClasspathList.size()]);
+ this.classLoader = new URLClassLoader(dqpClassPath, Thread.currentThread().getContextClassLoader(), new MetaMatrixURLStreamHandlerFactory());
+
+ if (postDelegationClasspathList != null && !postDelegationClasspathList.isEmpty()) {
+ URL[] path = postDelegationClasspathList.toArray(new URL[postDelegationClasspathList.size()]);
+ this.classLoader = new NonDelegatingClassLoader(path, this.classLoader, new MetaMatrixURLStreamHandlerFactory());
}
- else {
- this.classLoader = new URLClassLoader(dqpClassPath, Thread.currentThread().getContextClassLoader(), new MetaMatrixURLStreamHandlerFactory());
- }
+
String logMsg = BaseDataSource.getResourceMessage("EmbeddedDriver.use_classpath"); //$NON-NLS-1$
DriverManager.println(logMsg);
for (int i = 0; i < dqpClassPath.length; i++) {
@@ -422,12 +433,7 @@
in = new ObjectInputStream(dqpURL.openStream());
String[] urls = (String[])in.readObject();
for (int i = 0; i < urls.length; i++) {
-
- boolean add = true;
- URL jarURL = URLHelper.buildURL(urls[i]);
- if (add) {
- urlList.add(jarURL);
- }
+ urlList.add(URLHelper.buildURL(urls[i]));
}
} catch(IOException e) {
//ignore, treat as if lib does not exist
@@ -441,6 +447,19 @@
return urlList;
}
+ private ArrayList<URL> resolvePath(URL dqpURL, String directory, String path) throws SQLException {
+ StringTokenizer st = new StringTokenizer(path, ","); //$NON-NLS-1$
+ ArrayList<URL> urlList = new ArrayList<URL>();
+ while (st.hasMoreTokens()) {
+ try {
+ urlList.add(URLHelper.buildURL(dqpURL, directory+st.nextToken()));
+ } catch (MalformedURLException e) {
+ throw new EmbeddedSQLException(e);
+ }
+ }
+ return urlList;
+ }
+
/**
* Load DQP Properties from the URL supplied.
* @param dqpURL - URL to the "dqp.properties" object
@@ -489,7 +508,7 @@
}
/**
- * Create a connection to the DQP defined by this transport object beased on
+ * Create a connection to the DQP defined by this transport object based on
* properties supplied
* @param info
* @return Connection
@@ -520,7 +539,7 @@
/**
* Create the temporary workspace directory for the dqp
- * @param identity - idenity of the dqp
+ * @param identity - identity of the dqp
*/
String createWorkspace(String identity) {
String dir = System.getProperty("java.io.tmpdir")+"/metamatrix/"+identity; //$NON-NLS-1$ //$NON-NLS-2$
14 years, 11 months
- 1
- 0
teiid SVN: r938 - in branches/6.0.x: adminshell and 37 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-05-14 14:34:43 -0400 (Thu, 14 May 2009)
New Revision: 938
Modified:
branches/6.0.x/adminshell/pom.xml
branches/6.0.x/cache-jbosscache/pom.xml
branches/6.0.x/client-jdbc/pom.xml
branches/6.0.x/client/pom.xml
branches/6.0.x/common-core/pom.xml
branches/6.0.x/common-internal/pom.xml
branches/6.0.x/connector-api/pom.xml
branches/6.0.x/connector-metadata/pom.xml
branches/6.0.x/connector-sdk/pom.xml
branches/6.0.x/connectors/connector-jdbc/pom.xml
branches/6.0.x/connectors/connector-ldap/pom.xml
branches/6.0.x/connectors/connector-loopback/pom.xml
branches/6.0.x/connectors/connector-salesforce/pom.xml
branches/6.0.x/connectors/connector-text/pom.xml
branches/6.0.x/connectors/connector-xml-common/pom.xml
branches/6.0.x/connectors/connector-xml/pom.xml
branches/6.0.x/connectors/pom.xml
branches/6.0.x/connectors/salesforce-api/pom.xml
branches/6.0.x/connectors/sandbox/connector-exec/pom.xml
branches/6.0.x/connectors/sandbox/connector-object/pom.xml
branches/6.0.x/connectors/sandbox/connector-oracle-spatial/pom.xml
branches/6.0.x/connectors/sandbox/connector-yahoo/pom.xml
branches/6.0.x/connectors/sandbox/pom.xml
branches/6.0.x/console/pom.xml
branches/6.0.x/documentation/admin-guide/pom.xml
branches/6.0.x/documentation/connector-developer-guide/pom.xml
branches/6.0.x/documentation/pom.xml
branches/6.0.x/documentation/quick-start-example/pom.xml
branches/6.0.x/documentation/reference/pom.xml
branches/6.0.x/documentation/server-extensions-guide/pom.xml
branches/6.0.x/embedded/pom.xml
branches/6.0.x/engine/pom.xml
branches/6.0.x/metadata/pom.xml
branches/6.0.x/pom.xml
branches/6.0.x/server-installer/pom.xml
branches/6.0.x/server/pom.xml
branches/6.0.x/soap/pom.xml
branches/6.0.x/test-integration/pom.xml
branches/6.0.x/txn-jbossts/pom.xml
Log:
[maven-release-plugin] prepare release teiid-6.0.1
Modified: branches/6.0.x/adminshell/pom.xml
===================================================================
--- branches/6.0.x/adminshell/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/adminshell/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: branches/6.0.x/cache-jbosscache/pom.xml
===================================================================
--- branches/6.0.x/cache-jbosscache/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/cache-jbosscache/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-cache-jbosscache</artifactId>
Modified: branches/6.0.x/client/pom.xml
===================================================================
--- branches/6.0.x/client/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/client/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
Modified: branches/6.0.x/client-jdbc/pom.xml
===================================================================
--- branches/6.0.x/client-jdbc/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/client-jdbc/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client-jdbc</artifactId>
Modified: branches/6.0.x/common-core/pom.xml
===================================================================
--- branches/6.0.x/common-core/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/common-core/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-common-core</artifactId>
Modified: branches/6.0.x/common-internal/pom.xml
===================================================================
--- branches/6.0.x/common-internal/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/common-internal/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-common-internal</artifactId>
Modified: branches/6.0.x/connector-api/pom.xml
===================================================================
--- branches/6.0.x/connector-api/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/connector-api/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-connector-api</artifactId>
Modified: branches/6.0.x/connector-metadata/pom.xml
===================================================================
--- branches/6.0.x/connector-metadata/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/connector-metadata/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/6.0.x/connector-sdk/pom.xml
===================================================================
--- branches/6.0.x/connector-sdk/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/connector-sdk/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-connector-sdk</artifactId>
Modified: branches/6.0.x/connectors/connector-jdbc/pom.xml
===================================================================
--- branches/6.0.x/connectors/connector-jdbc/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/connectors/connector-jdbc/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-jdbc</artifactId>
Modified: branches/6.0.x/connectors/connector-ldap/pom.xml
===================================================================
--- branches/6.0.x/connectors/connector-ldap/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/connectors/connector-ldap/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ldap</artifactId>
Modified: branches/6.0.x/connectors/connector-loopback/pom.xml
===================================================================
--- branches/6.0.x/connectors/connector-loopback/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/connectors/connector-loopback/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-loopback</artifactId>
Modified: branches/6.0.x/connectors/connector-salesforce/pom.xml
===================================================================
--- branches/6.0.x/connectors/connector-salesforce/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/connectors/connector-salesforce/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-salesforce</artifactId>
Modified: branches/6.0.x/connectors/connector-text/pom.xml
===================================================================
--- branches/6.0.x/connectors/connector-text/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/connectors/connector-text/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-text</artifactId>
Modified: branches/6.0.x/connectors/connector-xml/pom.xml
===================================================================
--- branches/6.0.x/connectors/connector-xml/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/connectors/connector-xml/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-xml</artifactId>
Modified: branches/6.0.x/connectors/connector-xml-common/pom.xml
===================================================================
--- branches/6.0.x/connectors/connector-xml-common/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/connectors/connector-xml-common/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-xml-common</artifactId>
Modified: branches/6.0.x/connectors/pom.xml
===================================================================
--- branches/6.0.x/connectors/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/connectors/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/6.0.x/connectors/salesforce-api/pom.xml
===================================================================
--- branches/6.0.x/connectors/salesforce-api/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/connectors/salesforce-api/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>salesforce-api</artifactId>
Modified: branches/6.0.x/connectors/sandbox/connector-exec/pom.xml
===================================================================
--- branches/6.0.x/connectors/sandbox/connector-exec/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/connectors/sandbox/connector-exec/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-exec</artifactId>
Modified: branches/6.0.x/connectors/sandbox/connector-object/pom.xml
===================================================================
--- branches/6.0.x/connectors/sandbox/connector-object/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/connectors/sandbox/connector-object/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-object</artifactId>
Modified: branches/6.0.x/connectors/sandbox/connector-oracle-spatial/pom.xml
===================================================================
--- branches/6.0.x/connectors/sandbox/connector-oracle-spatial/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/connectors/sandbox/connector-oracle-spatial/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-oracle-spatial</artifactId>
Modified: branches/6.0.x/connectors/sandbox/connector-yahoo/pom.xml
===================================================================
--- branches/6.0.x/connectors/sandbox/connector-yahoo/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/connectors/sandbox/connector-yahoo/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-yahoo</artifactId>
Modified: branches/6.0.x/connectors/sandbox/pom.xml
===================================================================
--- branches/6.0.x/connectors/sandbox/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/connectors/sandbox/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
Modified: branches/6.0.x/console/pom.xml
===================================================================
--- branches/6.0.x/console/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/console/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-console</artifactId>
Modified: branches/6.0.x/documentation/admin-guide/pom.xml
===================================================================
--- branches/6.0.x/documentation/admin-guide/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/documentation/admin-guide/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid.documentation</groupId>
<artifactId>documentation</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>admin-guide</artifactId>
Modified: branches/6.0.x/documentation/connector-developer-guide/pom.xml
===================================================================
--- branches/6.0.x/documentation/connector-developer-guide/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/documentation/connector-developer-guide/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid.documentation</groupId>
<artifactId>documentation</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-developer-guide</artifactId>
Modified: branches/6.0.x/documentation/pom.xml
===================================================================
--- branches/6.0.x/documentation/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/documentation/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.documentation</groupId>
Modified: branches/6.0.x/documentation/quick-start-example/pom.xml
===================================================================
--- branches/6.0.x/documentation/quick-start-example/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/documentation/quick-start-example/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid.documentation</groupId>
<artifactId>documentation</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>quick-start-guide</artifactId>
Modified: branches/6.0.x/documentation/reference/pom.xml
===================================================================
--- branches/6.0.x/documentation/reference/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/documentation/reference/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid.documentation</groupId>
<artifactId>documentation</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>reference</artifactId>
Modified: branches/6.0.x/documentation/server-extensions-guide/pom.xml
===================================================================
--- branches/6.0.x/documentation/server-extensions-guide/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/documentation/server-extensions-guide/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid.documentation</groupId>
<artifactId>documentation</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>server-extensions-guide</artifactId>
Modified: branches/6.0.x/embedded/pom.xml
===================================================================
--- branches/6.0.x/embedded/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/embedded/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/6.0.x/engine/pom.xml
===================================================================
--- branches/6.0.x/engine/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/engine/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-engine</artifactId>
Modified: branches/6.0.x/metadata/pom.xml
===================================================================
--- branches/6.0.x/metadata/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/metadata/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: branches/6.0.x/pom.xml
===================================================================
--- branches/6.0.x/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -5,14 +5,14 @@
<artifactId>teiid</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
<description>Federated SQL and XML query engine.</description>
<properties>
<ant.version>1.7.0</ant.version>
<site.url>http://www.jboss.org/teiid</site.url>
</properties>
<scm>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/branches/6.0.x</developerConnection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-6.0.1</developerConnection>
</scm>
<licenses>
<license>
Modified: branches/6.0.x/server/pom.xml
===================================================================
--- branches/6.0.x/server/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/server/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-server</artifactId>
Modified: branches/6.0.x/server-installer/pom.xml
===================================================================
--- branches/6.0.x/server-installer/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/server-installer/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/6.0.x/soap/pom.xml
===================================================================
--- branches/6.0.x/soap/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/soap/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-soap</artifactId>
Modified: branches/6.0.x/test-integration/pom.xml
===================================================================
--- branches/6.0.x/test-integration/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/test-integration/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
Modified: branches/6.0.x/txn-jbossts/pom.xml
===================================================================
--- branches/6.0.x/txn-jbossts/pom.xml 2009-05-14 17:16:25 UTC (rev 937)
+++ branches/6.0.x/txn-jbossts/pom.xml 2009-05-14 18:34:43 UTC (rev 938)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-txn-jbossts</artifactId>
14 years, 11 months
- 1
- 0
teiid SVN: r937 - branches/6.0.x/build/kit-embedded/deploy.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-05-14 13:16:25 -0400 (Thu, 14 May 2009)
New Revision: 937
Added:
branches/6.0.x/build/kit-embedded/deploy/Admin.vdb
Log:
TEIID-573
Added: branches/6.0.x/build/kit-embedded/deploy/Admin.vdb
===================================================================
(Binary files differ)
Property changes on: branches/6.0.x/build/kit-embedded/deploy/Admin.vdb
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 11 months
- 1
- 0
teiid SVN: r936 - trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-05-13 20:58:44 -0400 (Wed, 13 May 2009)
New Revision: 936
Modified:
trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/WebServicesPanel.java
Log:
TEIID-482: fixing the license header to correct one.
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/WebServicesPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/WebServicesPanel.java 2009-05-13 20:45:07 UTC (rev 935)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/WebServicesPanel.java 2009-05-14 00:58:44 UTC (rev 936)
@@ -1,6 +1,25 @@
/*
- * Copyright � 2000-2008 MetaMatrix, Inc. All rights reserved.
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
*/
+
package com.metamatrix.console.ui.views.vdb;
import java.awt.GridBagConstraints;
14 years, 11 months
- 1
- 0
teiid SVN: r935 - in trunk/console/src/main/java/com/metamatrix/console/ui: views/deploy and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: tejones
Date: 2009-05-13 16:45:07 -0400 (Wed, 13 May 2009)
New Revision: 935
Modified:
trunk/console/src/main/java/com/metamatrix/console/ui/layout/PanelsTreeModel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/ServiceDefinitionPanel.java
Log:
JBEDSP-1040 Changed title for the Services panel to use the static constant for Services.
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/layout/PanelsTreeModel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/layout/PanelsTreeModel.java 2009-05-13 20:18:25 UTC (rev 934)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/layout/PanelsTreeModel.java 2009-05-13 20:45:07 UTC (rev 935)
@@ -252,7 +252,7 @@
props.setToolTipText(tipText);
configuration.add(props);
- // connector bindings panel node
+ // services panel node
PanelsTreeNode services = new PanelsTreeNode(SERVICE_DEFINTIONS,
SERVICE_DEFINITION_PANEL_CLASS, connection, false);
tipText = ConsolePlugin.Util.getString("PanelsTreeModel.servicesPanel.tooltip"); //$NON-NLS-1$
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/ServiceDefinitionPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/ServiceDefinitionPanel.java 2009-05-13 20:18:25 UTC (rev 934)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/ServiceDefinitionPanel.java 2009-05-13 20:45:07 UTC (rev 935)
@@ -55,6 +55,7 @@
import com.metamatrix.console.security.UserCapabilities;
import com.metamatrix.console.ui.ViewManager;
import com.metamatrix.console.ui.layout.BasePanel;
+import com.metamatrix.console.ui.layout.PanelsTreeModel;
import com.metamatrix.console.ui.layout.WorkspacePanel;
import com.metamatrix.console.ui.views.deploy.event.ConfigurationChangeEvent;
import com.metamatrix.console.ui.views.deploy.event.ConfigurationChangeListener;
@@ -453,7 +454,7 @@
}
public String getTitle() {
- return "Connector Bindings"; //$NON-NLS-1$
+ return PanelsTreeModel.SERVICE_DEFINTIONS;
}
public ConnectionInfo getConnection() {
14 years, 11 months
- 1
- 0
teiid SVN: r934 - in branches/6.0.x/engine/src: test/java/com/metamatrix/query/optimizer/relational/rules and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-05-13 16:18:25 -0400 (Wed, 13 May 2009)
New Revision: 934
Modified:
branches/6.0.x/engine/src/main/java/com/metamatrix/query/optimizer/relational/rules/FrameUtil.java
branches/6.0.x/engine/src/main/java/com/metamatrix/query/optimizer/relational/rules/RuleMergeVirtual.java
branches/6.0.x/engine/src/main/java/com/metamatrix/query/optimizer/relational/rules/RulePlaceAccess.java
branches/6.0.x/engine/src/main/java/com/metamatrix/query/optimizer/relational/rules/RuleRemoveOptionalJoins.java
branches/6.0.x/engine/src/test/java/com/metamatrix/query/optimizer/relational/rules/TestFrameUtil.java
Log:
TEIID-568 porting join group fix from 6.1.0
Modified: branches/6.0.x/engine/src/main/java/com/metamatrix/query/optimizer/relational/rules/FrameUtil.java
===================================================================
--- branches/6.0.x/engine/src/main/java/com/metamatrix/query/optimizer/relational/rules/FrameUtil.java 2009-05-13 20:07:21 UTC (rev 933)
+++ branches/6.0.x/engine/src/main/java/com/metamatrix/query/optimizer/relational/rules/FrameUtil.java 2009-05-13 20:18:25 UTC (rev 934)
@@ -72,17 +72,17 @@
public class FrameUtil {
- static void convertFrame(PlanNode startNode, GroupSymbol oldGroup, GroupSymbol newGroup, Map symbolMap, QueryMetadataInterface metadata)
+ static void convertFrame(PlanNode startNode, GroupSymbol oldGroup, Set<GroupSymbol> newGroups, Map symbolMap, QueryMetadataInterface metadata)
throws QueryPlannerException {
PlanNode current = startNode;
- PlanNode endNode = NodeEditor.findParent(startNode.getParent(), NodeConstants.Types.SOURCE);
+ PlanNode endNode = NodeEditor.findParent(startNode.getType()==NodeConstants.Types.SOURCE?startNode.getParent():startNode, NodeConstants.Types.SOURCE);
while(current != endNode) {
- // Make translations as defined in vnode in each current node
- convertNode(current, oldGroup, newGroup, symbolMap);
+ // Make translations as defined in node in each current node
+ convertNode(current, oldGroup, newGroups, symbolMap);
PlanNode parent = current.getParent();
@@ -164,12 +164,16 @@
// symbols. In that case, some additional work can be done because we can assume
// that an oldElement isn't being replaced by an expression using elements from
// multiple new groups.
- static void convertNode(PlanNode node, GroupSymbol oldGroup, GroupSymbol newGroup, Map symbolMap)
+ static void convertNode(PlanNode node, GroupSymbol oldGroup, Set<GroupSymbol> newGroups, Map symbolMap)
throws QueryPlannerException {
// Update groups for current node
Set groups = node.getGroups();
+ boolean hasOld = groups.remove(oldGroup);
+
+ int type = node.getType();
+
// Convert expressions from correlated subquery references;
// currently only for SELECT or PROJECT nodes
List refs = (List)node.getProperty(NodeConstants.Info.CORRELATED_REFERENCES);
@@ -183,28 +187,27 @@
}
}
- boolean hasOld = groups.remove(oldGroup);
+ boolean singleMapping = newGroups != null && newGroups.size() == 1;
- if(newGroup != null) {
+ if(singleMapping) {
if (!hasOld) {
return;
}
- groups.add(newGroup);
+ groups.addAll(newGroups);
+ } else if ((type & (NodeConstants.Types.ACCESS | NodeConstants.Types.JOIN | NodeConstants.Types.SOURCE)) == type) {
+ if (newGroups != null) {
+ groups.addAll(newGroups);
+ }
+ } else {
+ groups.clear();
}
- // Updated elements
- List newElementSymbols = null;
- if (newGroup == null) {
- newElementSymbols = new ArrayList();
- }
-
- int type = node.getType();
if(type == NodeConstants.Types.SELECT) {
Criteria crit = (Criteria) node.getProperty(NodeConstants.Info.SELECT_CRITERIA);
convertCriteria(crit, symbolMap);
- if (newGroup == null) {
- ElementCollectorVisitor.getElements(crit, newElementSymbols);
+ if (!singleMapping) {
+ GroupsUsedByElementsVisitor.getGroups(crit, groups);
}
} else if(type == NodeConstants.Types.PROJECT) {
@@ -217,8 +220,8 @@
SingleElementSymbol mappedSymbol = convertSingleElementSymbol(symbol, symbolMap, true);
newElements.add(mappedSymbol);
- if (newGroup == null) {
- ElementCollectorVisitor.getElements(mappedSymbol, newElementSymbols);
+ if (!singleMapping) {
+ GroupsUsedByElementsVisitor.getGroups(mappedSymbol, groups);
}
}
@@ -232,10 +235,6 @@
while(critIter.hasNext()) {
Criteria crit = (Criteria) critIter.next();
convertCriteria(crit, symbolMap);
-
- if (newGroup == null) {
- ElementCollectorVisitor.getElements(crit, newElementSymbols);
- }
}
}
@@ -251,8 +250,8 @@
SingleElementSymbol mappedSymbol = convertSingleElementSymbol(symbol, symbolMap, true);
newElements.add( mappedSymbol );
- if (newGroup == null) {
- ElementCollectorVisitor.getElements(mappedSymbol, newElementSymbols);
+ if (!singleMapping) {
+ GroupsUsedByElementsVisitor.getGroups(mappedSymbol, groups);
}
}
@@ -269,8 +268,8 @@
Expression mappedCol = convertSingleElementSymbol(groupCol, symbolMap, false);
newGroupCols.add( mappedCol );
- if (newGroup == null) {
- ElementCollectorVisitor.getElements(mappedCol, newElementSymbols);
+ if (!singleMapping) {
+ GroupsUsedByElementsVisitor.getGroups(mappedCol, groups);
}
}
node.setProperty(NodeConstants.Info.GROUP_COLS, newGroupCols);
@@ -278,10 +277,6 @@
} else if (type == NodeConstants.Types.SOURCE || type == NodeConstants.Types.ACCESS) {
convertAccessPatterns(symbolMap, node);
}
-
- if (newGroup == null) {
- GroupsUsedByElementsVisitor.getGroups(newElementSymbols, groups);
- }
}
static SingleElementSymbol convertSingleElementSymbol(SingleElementSymbol symbol, Map symbolMap, boolean shouldAlias) {
Modified: branches/6.0.x/engine/src/main/java/com/metamatrix/query/optimizer/relational/rules/RuleMergeVirtual.java
===================================================================
--- branches/6.0.x/engine/src/main/java/com/metamatrix/query/optimizer/relational/rules/RuleMergeVirtual.java 2009-05-13 20:07:21 UTC (rev 933)
+++ branches/6.0.x/engine/src/main/java/com/metamatrix/query/optimizer/relational/rules/RuleMergeVirtual.java 2009-05-13 20:18:25 UTC (rev 934)
@@ -130,10 +130,10 @@
// Convert parent frame before merge
SymbolMap symbolMap = (SymbolMap)frame.getProperty(NodeConstants.Info.SYMBOL_MAP);
- FrameUtil.convertFrame(frame, virtualGroup, null, symbolMap.asMap(), metadata);
+ FrameUtil.convertFrame(frame, virtualGroup, FrameUtil.findJoinSourceNode(projectNode).getGroups(), symbolMap.asMap(), metadata);
PlanNode parentBottom = frame.getParent();
- prepareFrame(frame, parentJoin);
+ prepareFrame(frame);
// Remove top 2 nodes (SOURCE, PROJECT) of virtual group - they're no longer needed
NodeEditor.removeChildNode(parentBottom, frame);
@@ -142,8 +142,7 @@
return root;
}
- private static void prepareFrame(PlanNode frame,
- PlanNode parentJoin) {
+ private static void prepareFrame(PlanNode frame) {
// find the new root of the frame so that access patterns can be propagated
PlanNode newRoot = FrameUtil.findJoinSourceNode(frame.getFirstChild());
if (newRoot != null) {
@@ -157,18 +156,6 @@
}
}
RulePlaceAccess.copyDependentHints(frame, newRoot);
-
- // correct the upper join with the groups introduced in the lower join
- if (parentJoin != null) {
- PlanNode upperJoin = newRoot.getParent();
- while (upperJoin != parentJoin) {
- if (upperJoin.getType() == NodeConstants.Types.JOIN) {
- upperJoin.addGroups(newRoot.getGroups());
- }
- upperJoin = upperJoin.getParent();
- }
- upperJoin.addGroups(newRoot.getGroups());
- }
}
}
@@ -257,7 +244,7 @@
sort.addGroups(GroupsUsedByElementsVisitor.getGroups(newElements));
}
- prepareFrame(frame, null);
+ prepareFrame(frame);
//remove the parent project and the source node
NodeEditor.removeChildNode(parentProject, frame);
@@ -300,7 +287,7 @@
checkForNullDependent = true;
break;
}
- joinToTest = NodeEditor.findParent(joinToTest.getParent(), NodeConstants.Types.JOIN);
+ joinToTest = NodeEditor.findParent(joinToTest.getParent(), NodeConstants.Types.JOIN, NodeConstants.Types.SOURCE);
}
}
Modified: branches/6.0.x/engine/src/main/java/com/metamatrix/query/optimizer/relational/rules/RulePlaceAccess.java
===================================================================
--- branches/6.0.x/engine/src/main/java/com/metamatrix/query/optimizer/relational/rules/RulePlaceAccess.java 2009-05-13 20:07:21 UTC (rev 933)
+++ branches/6.0.x/engine/src/main/java/com/metamatrix/query/optimizer/relational/rules/RulePlaceAccess.java 2009-05-13 20:18:25 UTC (rev 934)
@@ -22,7 +22,9 @@
package com.metamatrix.query.optimizer.relational.rules;
+import java.util.Arrays;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -199,7 +201,7 @@
//the expressions in the map will all be element symbols
Map<ElementSymbol, Expression> replacementSymbols = FrameUtil.buildSymbolMap(group, newGroup, metadata);
- FrameUtil.convertFrame(sourceNode, group, newGroup, replacementSymbols, metadata);
+ FrameUtil.convertFrame(sourceNode, group, new HashSet<GroupSymbol>(Arrays.asList(newGroup)), replacementSymbols, metadata);
// correct the lower symbol map
if (childProjects != null) {
Modified: branches/6.0.x/engine/src/main/java/com/metamatrix/query/optimizer/relational/rules/RuleRemoveOptionalJoins.java
===================================================================
--- branches/6.0.x/engine/src/main/java/com/metamatrix/query/optimizer/relational/rules/RuleRemoveOptionalJoins.java 2009-05-13 20:07:21 UTC (rev 933)
+++ branches/6.0.x/engine/src/main/java/com/metamatrix/query/optimizer/relational/rules/RuleRemoveOptionalJoins.java 2009-05-13 20:18:25 UTC (rev 934)
@@ -22,11 +22,11 @@
package com.metamatrix.query.optimizer.relational.rules;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import com.metamatrix.api.exception.MetaMatrixComponentException;
@@ -48,13 +48,13 @@
import com.metamatrix.query.sql.lang.Criteria;
import com.metamatrix.query.sql.lang.JoinType;
import com.metamatrix.query.sql.symbol.AggregateSymbol;
+import com.metamatrix.query.sql.symbol.Constant;
import com.metamatrix.query.sql.symbol.ElementSymbol;
import com.metamatrix.query.sql.symbol.Expression;
import com.metamatrix.query.sql.symbol.GroupSymbol;
import com.metamatrix.query.sql.symbol.Reference;
import com.metamatrix.query.sql.util.SymbolMap;
import com.metamatrix.query.sql.visitor.ElementCollectorVisitor;
-import com.metamatrix.query.sql.visitor.GroupsUsedByElementsVisitor;
import com.metamatrix.query.util.CommandContext;
/**
@@ -214,9 +214,10 @@
/**
* remove the optional node if possible
+ * @throws QueryPlannerException
*/
private boolean removedJoin(PlanNode joinNode, PlanNode optionalNode,
- Set elements, QueryMetadataInterface metadata) throws QueryMetadataException, MetaMatrixComponentException {
+ Set elements, QueryMetadataInterface metadata) throws QueryMetadataException, MetaMatrixComponentException, QueryPlannerException {
Set groups = optionalNode.getGroups();
Assertion.isNotNull(elements);
@@ -240,13 +241,15 @@
NodeEditor.removeChildNode(parentNode, joinNode);
// correct the parent nodes that may be using optional elements
- HashSet optionElements = new HashSet();
- for (Iterator i = optionalNode.getGroups().iterator(); i.hasNext();) {
- optionElements.addAll(ResolverUtil.resolveElementsInGroup((GroupSymbol) i.next(), metadata));
+ for (GroupSymbol optionalGroup : optionalNode.getGroups()) {
+ List<ElementSymbol> optionalElements = ResolverUtil.resolveElementsInGroup(optionalGroup, metadata);
+ List<Constant> replacements = new ArrayList<Constant>(optionalElements.size());
+ for (ElementSymbol elementSymbol : optionalElements) {
+ replacements.add(new Constant(null, elementSymbol.getType()));
+ }
+ FrameUtil.convertFrame(parentNode, optionalGroup, null, SymbolMap.createSymbolMap(optionalElements, replacements).asMap(), metadata);
}
- correctParents(optionalNode.getGroups(), parentNode, optionElements);
-
return true;
}
@@ -282,88 +285,6 @@
return false;
}
- private void correctParents(Set groups,
- PlanNode parentNode,
- HashSet optionElements) {
- boolean done = false;
- boolean correctJoinGroups = true; //true until the first source node is reached
-
- while (!done && parentNode != null) {
-
- switch (parentNode.getType()) {
-
- case NodeConstants.Types.SET_OP:
- {
- done = true;
- break;
- }
- case NodeConstants.Types.SOURCE:
- {
- HashSet parentOptionalElements = new HashSet();
- SymbolMap symbolMap = (SymbolMap)parentNode.getProperty(NodeConstants.Info.SYMBOL_MAP);
- for (Map.Entry<ElementSymbol, Expression> entry : symbolMap.asMap().entrySet()) {
- Expression parentExpression = entry.getValue();
- Collection parentElements = ElementCollectorVisitor.getElements(parentExpression, true);
- parentElements.retainAll(optionElements);
- if (!parentElements.isEmpty()) {
- parentOptionalElements.add(entry.getKey());
- }
- }
- correctJoinGroups = false;
- optionElements = parentOptionalElements;
- if (optionElements.isEmpty()) {
- done = true;
- }
- break;
- }
- case NodeConstants.Types.JOIN:
- {
- List joinCriteria = (List)parentNode.getProperty(NodeConstants.Info.JOIN_CRITERIA);
- removeOptionalEntries(optionElements, joinCriteria, null);
- if (correctJoinGroups) {
- parentNode.getGroups().removeAll(groups);
- }
- break;
- }
- case NodeConstants.Types.PROJECT:
- {
- if (parentNode.getParent() == null || parentNode.getProperty(NodeConstants.Info.INTO_GROUP) != null) {
- done = true;
- }
- break;
- }
- }
-
- parentNode = parentNode.getParent();
- }
- }
-
- /**
- * Will remove the optional entries from the list of languageObjects. This will
- * also correct the groups on the parentNode if it is non-null.
- *
- * @param optionElements
- * @param languageObjects
- */
- private void removeOptionalEntries(HashSet optionElements,
- List languageObjects, PlanNode parentNode) {
- if (languageObjects != null && !languageObjects.isEmpty()) {
- if (parentNode != null) {
- parentNode.getGroups().clear();
- }
- for (Iterator i = languageObjects.iterator(); i.hasNext();) {
- LanguageObject object = (LanguageObject)i.next();
- if (isOptional(optionElements, object)) {
- i.remove();
- continue;
- }
- if (parentNode != null) {
- parentNode.addGroups(GroupsUsedByElementsVisitor.getGroups(object));
- }
- }
- }
- }
-
private boolean isOptional(HashSet optionElements,
LanguageObject languageObject) {
Collection elementsUsed = ElementCollectorVisitor.getElements(languageObject, true);
Modified: branches/6.0.x/engine/src/test/java/com/metamatrix/query/optimizer/relational/rules/TestFrameUtil.java
===================================================================
--- branches/6.0.x/engine/src/test/java/com/metamatrix/query/optimizer/relational/rules/TestFrameUtil.java 2009-05-13 20:07:21 UTC (rev 933)
+++ branches/6.0.x/engine/src/test/java/com/metamatrix/query/optimizer/relational/rules/TestFrameUtil.java 2009-05-13 20:18:25 UTC (rev 934)
@@ -22,24 +22,33 @@
package com.metamatrix.query.optimizer.relational.rules;
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
+import org.junit.Test;
+
import com.metamatrix.query.optimizer.relational.plantree.NodeConstants;
+import com.metamatrix.query.optimizer.relational.plantree.NodeEditor;
import com.metamatrix.query.optimizer.relational.plantree.NodeFactory;
import com.metamatrix.query.optimizer.relational.plantree.PlanNode;
+import com.metamatrix.query.optimizer.relational.plantree.NodeConstants.Info;
+import com.metamatrix.query.sql.lang.IsNullCriteria;
import com.metamatrix.query.sql.lang.JoinType;
+import com.metamatrix.query.sql.symbol.Constant;
+import com.metamatrix.query.sql.symbol.ElementSymbol;
import com.metamatrix.query.sql.symbol.GroupSymbol;
+import com.metamatrix.query.sql.util.SymbolMap;
-import junit.framework.TestCase;
-
-public class TestFrameUtil extends TestCase {
+public class TestFrameUtil {
static GroupSymbol getGroup(int id) {
return new GroupSymbol(String.valueOf(id));
}
- public void testFindJoinSourceNode() {
+ @Test public void testFindJoinSourceNode() {
PlanNode root = getExamplePlan();
PlanNode joinSource = FrameUtil.findJoinSourceNode(root);
@@ -47,7 +56,7 @@
assertSame(root, joinSource);
}
- public void testFindJoinSourceNode1() {
+ @Test public void testFindJoinSourceNode1() {
PlanNode root = getExamplePlan();
PlanNode joinSource = FrameUtil.findJoinSourceNode(root.getLastChild());
@@ -55,10 +64,10 @@
assertEquals(NodeConstants.Types.JOIN, joinSource.getType());
}
- public void testFindSourceNode() {
+ @Test public void testFindSourceNode() {
PlanNode root = getExamplePlan();
- Set groups = new HashSet();
+ Set<GroupSymbol> groups = new HashSet<GroupSymbol>();
groups.add(getGroup(1));
@@ -70,10 +79,10 @@
/**
* Access nodes are not eligible originating nodes
*/
- public void testFindSourceNodeWithAccessSource() {
+ @Test public void testFindSourceNodeWithAccessSource() {
PlanNode root = getExamplePlan();
- Set groups = new HashSet();
+ Set<GroupSymbol> groups = new HashSet<GroupSymbol>();
groups.add(getGroup(2));
@@ -82,10 +91,10 @@
assertEquals(NodeConstants.Types.JOIN, originatingNode.getType());
}
- public void testFindSourceNode2() {
+ @Test public void testFindSourceNode2() {
PlanNode root = getExamplePlan();
- Set groups = new HashSet();
+ Set<GroupSymbol> groups = new HashSet<GroupSymbol>();
groups.add(getGroup(3));
@@ -94,10 +103,10 @@
assertEquals(NodeConstants.Types.SOURCE, originatingNode.getType());
}
- public void testNonExistentSource() {
+ @Test public void testNonExistentSource() {
PlanNode root = getExamplePlan();
- Set groups = new HashSet();
+ Set<GroupSymbol> groups = new HashSet<GroupSymbol>();
groups.add(getGroup(4));
@@ -105,6 +114,66 @@
assertNull(originatingNode);
}
+
+ @Test public void testJoinGroups() throws Exception {
+ PlanNode joinNode = getExamplePlan();
+ PlanNode projectNode = NodeFactory.getNewNode(NodeConstants.Types.PROJECT);
+ ElementSymbol e1 = new ElementSymbol("e1"); //$NON-NLS-1$
+ e1.setGroupSymbol(getGroup(3));
+ projectNode.setProperty(Info.PROJECT_COLS, Arrays.asList(e1));
+ projectNode.addFirstChild(joinNode);
+ projectNode.addGroup(getGroup(3));
+ PlanNode sourceNode = NodeFactory.getNewNode(NodeConstants.Types.SOURCE);
+ sourceNode.addFirstChild(projectNode);
+ GroupSymbol four = getGroup(4);
+ sourceNode.addGroup(four);
+ ElementSymbol e2 = new ElementSymbol("e2"); //$NON-NLS-1$
+ e2.setGroupSymbol(four);
+ SymbolMap sm = SymbolMap.createSymbolMap(Arrays.asList(e2), Arrays.asList(e1));
+ sourceNode.setProperty(Info.SYMBOL_MAP, sm);
+ PlanNode projectNode1 = NodeFactory.getNewNode(NodeConstants.Types.PROJECT);
+ projectNode1.addFirstChild(sourceNode);
+ projectNode1.addGroup(four);
+ projectNode1.setProperty(Info.PROJECT_COLS, Arrays.asList(e2));
+
+ //removing source node 3 completely
+ SymbolMap replacement = SymbolMap.createSymbolMap(Arrays.asList(e1), Arrays.asList(new Constant(null)));
+ FrameUtil.convertFrame(NodeEditor.findNodePreOrder(joinNode, NodeConstants.Types.SOURCE), getGroup(3), null, replacement.asMap(), null);
+ assertEquals(2, joinNode.getGroups().size()); //even though this is a cross join it should still retain its groups
+ assertEquals(0, NodeEditor.findNodePreOrder(joinNode, NodeConstants.Types.SELECT).getGroups().size());
+ assertEquals(1, projectNode1.getGroups().size());
+ assertEquals(0, projectNode.getGroups().size());
+ }
+
+ @Test public void testJoinGroups1() throws Exception {
+ PlanNode joinNode = getExamplePlan();
+ PlanNode projectNode = NodeFactory.getNewNode(NodeConstants.Types.PROJECT);
+ ElementSymbol e1 = new ElementSymbol("e1"); //$NON-NLS-1$
+ e1.setGroupSymbol(getGroup(3));
+ projectNode.setProperty(Info.PROJECT_COLS, Arrays.asList(e1));
+ projectNode.addFirstChild(joinNode);
+ projectNode.addGroup(getGroup(3));
+ PlanNode sourceNode = NodeFactory.getNewNode(NodeConstants.Types.SOURCE);
+ sourceNode.addFirstChild(projectNode);
+ GroupSymbol four = getGroup(4);
+ sourceNode.addGroup(four);
+ ElementSymbol e2 = new ElementSymbol("e2"); //$NON-NLS-1$
+ e2.setGroupSymbol(four);
+ SymbolMap sm = SymbolMap.createSymbolMap(Arrays.asList(e2), Arrays.asList(e1));
+ sourceNode.setProperty(Info.SYMBOL_MAP, sm);
+ PlanNode projectNode1 = NodeFactory.getNewNode(NodeConstants.Types.PROJECT);
+ projectNode1.addFirstChild(sourceNode);
+ projectNode1.addGroup(four);
+ projectNode1.setProperty(Info.PROJECT_COLS, Arrays.asList(e2));
+
+ //replace source 3 with groups 5, 6
+ SymbolMap replacement = SymbolMap.createSymbolMap(Arrays.asList(e1), Arrays.asList(new Constant(null)));
+ FrameUtil.convertFrame(NodeEditor.findNodePreOrder(joinNode, NodeConstants.Types.SOURCE), getGroup(3), new HashSet<GroupSymbol>(Arrays.asList(getGroup(5), getGroup(6))), replacement.asMap(), null);
+ assertEquals(4, joinNode.getGroups().size()); //even though this is a cross join it should still retain its groups
+ assertEquals(0, NodeEditor.findNodePreOrder(joinNode, NodeConstants.Types.SELECT).getGroups().size());
+ assertEquals(1, projectNode1.getGroups().size());
+ assertEquals(0, projectNode.getGroups().size());
+ }
/**
* <pre>
@@ -129,7 +198,7 @@
joinNode.addFirstChild(nullNode);
PlanNode childCriteria = NodeFactory.getNewNode(NodeConstants.Types.SELECT);
-
+ childCriteria.setProperty(Info.SELECT_CRITERIA, new IsNullCriteria(new Constant(1)));
childCriteria.addGroup(getGroup(2));
joinNode.addLastChild(childCriteria);
14 years, 11 months
- 1
- 0
teiid SVN: r933 - trunk/common-core/src/main/java/com/metamatrix/api/exception.
by teiid-commits＠lists.jboss.org
Author: vhalbert(a)redhat.com
Date: 2009-05-13 16:07:21 -0400 (Wed, 13 May 2009)
New Revision: 933
Modified:
trunk/common-core/src/main/java/com/metamatrix/api/exception/MultipleException.java
Log:
Teiid-592 - added the no-arg constructore to fix the exception.
Modified: trunk/common-core/src/main/java/com/metamatrix/api/exception/MultipleException.java
===================================================================
--- trunk/common-core/src/main/java/com/metamatrix/api/exception/MultipleException.java 2009-05-13 19:38:15 UTC (rev 932)
+++ trunk/common-core/src/main/java/com/metamatrix/api/exception/MultipleException.java 2009-05-13 20:07:21 UTC (rev 933)
@@ -44,7 +44,15 @@
/** An error code. */
private String code;
+
/**
+ * No-arg Constructor
+ */
+ public MultipleException() {
+ super();
+ }
+
+ /**
* Construct an instance with the set of exceptions and error message
* specified.
*
14 years, 11 months
- 1
- 0