[teiid-commits] teiid SVN: r2110 - in trunk: connector-api/src/main/java/org/teiid/resource/cci and 6 other directories.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2010-05-10 13:50:13 -0400 (Mon, 10 May 2010)
New Revision: 2110

Removed:
   trunk/connector-api/src/main/java/org/teiid/connector/api/
   trunk/connector-api/src/main/java/org/teiid/connector/basic/
Modified:
   trunk/connector-api/src/main/java/org/teiid/resource/cci/SourceSystemFunctions.java
   trunk/engine/src/main/java/com/metamatrix/query/function/source/SystemSource.java
   trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.java
   trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/SQLStringVisitor.java
   trunk/engine/src/main/java/com/metamatrix/query/validator/ValidationVisitor.java
   trunk/engine/src/test/java/com/metamatrix/query/function/TestFunctionLibrary.java
   trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestOptimizer.java
Log:
consolidating sourcesystemfunctions

Modified: trunk/connector-api/src/main/java/org/teiid/resource/cci/SourceSystemFunctions.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/resource/cci/SourceSystemFunctions.java	2010-05-10 17:42:42 UTC (rev 2109)
+++ trunk/connector-api/src/main/java/org/teiid/resource/cci/SourceSystemFunctions.java	2010-05-10 17:50:13 UTC (rev 2110)
@@ -136,9 +136,10 @@
 	
 	//xml
 	public static final String XPATHVALUE = "xpathvalue"; //$NON-NLS-1$
+	public static final String XPATHQUERY = "xpathquery"; //$NON-NLS-1$
 	public static final String XSLTRANSFORM = "xsltransform"; //$NON-NLS-1$
-	public static final String XMLELEMENT = "xmlelement"; //$NON-NLS-1$
 	public static final String XMLCONCAT = "xmlconcat"; //$NON-NLS-1$
 	public static final String XMLCOMMENT = "xmlcomment"; //$NON-NLS-1$
 	public static final String XMLPI = "xmlpi"; //$NON-NLS-1$
+
 }

Modified: trunk/engine/src/main/java/com/metamatrix/query/function/source/SystemSource.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/query/function/source/SystemSource.java	2010-05-10 17:42:42 UTC (rev 2109)
+++ trunk/engine/src/main/java/com/metamatrix/query/function/source/SystemSource.java	2010-05-10 17:50:13 UTC (rev 2110)
@@ -26,7 +26,7 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.teiid.connector.api.SourceSystemFunctions;
+import org.teiid.resource.cci.SourceSystemFunctions;
 
 import com.metamatrix.common.types.DataTypeManager;
 import com.metamatrix.query.QueryPlugin;

Modified: trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.java	2010-05-10 17:42:42 UTC (rev 2109)
+++ trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.java	2010-05-10 17:50:13 UTC (rev 2110)
@@ -41,8 +41,8 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 
-import org.teiid.connector.api.SourceSystemFunctions;
 import org.teiid.connector.language.SQLReservedWords;
+import org.teiid.resource.cci.SourceSystemFunctions;
 
 import com.metamatrix.api.exception.MetaMatrixComponentException;
 import com.metamatrix.api.exception.MetaMatrixException;

Modified: trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/SQLStringVisitor.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/SQLStringVisitor.java	2010-05-10 17:42:42 UTC (rev 2109)
+++ trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/SQLStringVisitor.java	2010-05-10 17:50:13 UTC (rev 2110)
@@ -29,9 +29,9 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.teiid.connector.api.SourceSystemFunctions;
 import org.teiid.connector.language.SQLReservedWords;
 import org.teiid.connector.language.SQLReservedWords.Tokens;
+import org.teiid.resource.cci.SourceSystemFunctions;
 
 import com.metamatrix.common.types.DataTypeManager;
 import com.metamatrix.core.util.StringUtil;

Modified: trunk/engine/src/main/java/com/metamatrix/query/validator/ValidationVisitor.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/query/validator/ValidationVisitor.java	2010-05-10 17:42:42 UTC (rev 2109)
+++ trunk/engine/src/main/java/com/metamatrix/query/validator/ValidationVisitor.java	2010-05-10 17:50:13 UTC (rev 2110)
@@ -33,7 +33,7 @@
 
 import javax.xml.xpath.XPathExpressionException;
 
-import org.teiid.connector.api.SourceSystemFunctions;
+import org.teiid.resource.cci.SourceSystemFunctions;
 
 import com.metamatrix.api.exception.MetaMatrixComponentException;
 import com.metamatrix.api.exception.MetaMatrixProcessingException;

Modified: trunk/engine/src/test/java/com/metamatrix/query/function/TestFunctionLibrary.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/query/function/TestFunctionLibrary.java	2010-05-10 17:42:42 UTC (rev 2109)
+++ trunk/engine/src/test/java/com/metamatrix/query/function/TestFunctionLibrary.java	2010-05-10 17:50:13 UTC (rev 2110)
@@ -39,8 +39,8 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.teiid.connector.api.SourceSystemFunctions;
 import org.teiid.connector.language.SQLReservedWords;
+import org.teiid.resource.cci.SourceSystemFunctions;
 
 import com.metamatrix.api.exception.query.FunctionExecutionException;
 import com.metamatrix.common.buffer.BufferManagerFactory;

Modified: trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestOptimizer.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestOptimizer.java	2010-05-10 17:42:42 UTC (rev 2109)
+++ trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestOptimizer.java	2010-05-10 17:50:13 UTC (rev 2110)
@@ -32,7 +32,7 @@
 import java.util.Set;
 
 import org.junit.Test;
-import org.teiid.connector.api.SourceSystemFunctions;
+import org.teiid.resource.cci.SourceSystemFunctions;
 
 import com.metamatrix.api.exception.MetaMatrixComponentException;
 import com.metamatrix.api.exception.MetaMatrixException;