teiid SVN: r3150 - in trunk: adminshell and 38 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-05-04 11:03:22 -0400 (Wed, 04 May 2011)
New Revision: 3150
Modified:
trunk/adminshell/pom.xml
trunk/api/pom.xml
trunk/build/pom.xml
trunk/cache-jbosscache/pom.xml
trunk/client-jdk15/pom.xml
trunk/client/pom.xml
trunk/common-core/pom.xml
trunk/connectors/connector-file/pom.xml
trunk/connectors/connector-ldap/pom.xml
trunk/connectors/connector-salesforce/pom.xml
trunk/connectors/connector-ws/pom.xml
trunk/connectors/pom.xml
trunk/connectors/salesforce-api/pom.xml
trunk/connectors/sandbox/pom.xml
trunk/connectors/sandbox/translator-yahoo/pom.xml
trunk/connectors/translator-file/pom.xml
trunk/connectors/translator-jdbc/pom.xml
trunk/connectors/translator-ldap/pom.xml
trunk/connectors/translator-loopback/pom.xml
trunk/connectors/translator-olap/pom.xml
trunk/connectors/translator-salesforce/pom.xml
trunk/connectors/translator-ws/pom.xml
trunk/console/pom.xml
trunk/documentation/admin-guide/pom.xml
trunk/documentation/caching-guide/pom.xml
trunk/documentation/client-developers-guide/pom.xml
trunk/documentation/developer-guide/pom.xml
trunk/documentation/docbook/custom.dtd
trunk/documentation/pom.xml
trunk/documentation/quick-start-example/pom.xml
trunk/documentation/reference/pom.xml
trunk/engine/pom.xml
trunk/hibernate-dialect/pom.xml
trunk/jboss-integration/pom.xml
trunk/metadata/pom.xml
trunk/pom.xml
trunk/runtime/pom.xml
trunk/test-integration/common/pom.xml
trunk/test-integration/db/pom.xml
trunk/test-integration/pom.xml
Log:
updating trunk to 7.5
Modified: trunk/adminshell/pom.xml
===================================================================
--- trunk/adminshell/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/adminshell/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: trunk/api/pom.xml
===================================================================
--- trunk/api/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/api/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-api</artifactId>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/build/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid</artifactId>
Modified: trunk/cache-jbosscache/pom.xml
===================================================================
--- trunk/cache-jbosscache/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/cache-jbosscache/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-cache-jbosscache</artifactId>
Modified: trunk/client/pom.xml
===================================================================
--- trunk/client/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/client/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
Modified: trunk/client-jdk15/pom.xml
===================================================================
--- trunk/client-jdk15/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/client-jdk15/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client-jdk15</artifactId>
Modified: trunk/common-core/pom.xml
===================================================================
--- trunk/common-core/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/common-core/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-common-core</artifactId>
Modified: trunk/connectors/connector-file/pom.xml
===================================================================
--- trunk/connectors/connector-file/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/connector-file/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-file</artifactId>
Modified: trunk/connectors/connector-ldap/pom.xml
===================================================================
--- trunk/connectors/connector-ldap/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/connector-ldap/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ldap</artifactId>
Modified: trunk/connectors/connector-salesforce/pom.xml
===================================================================
--- trunk/connectors/connector-salesforce/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/connector-salesforce/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-salesforce</artifactId>
Modified: trunk/connectors/connector-ws/pom.xml
===================================================================
--- trunk/connectors/connector-ws/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/connector-ws/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ws</artifactId>
Modified: trunk/connectors/pom.xml
===================================================================
--- trunk/connectors/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/connectors/salesforce-api/pom.xml
===================================================================
--- trunk/connectors/salesforce-api/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/salesforce-api/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>salesforce-api</artifactId>
Modified: trunk/connectors/sandbox/pom.xml
===================================================================
--- trunk/connectors/sandbox/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/sandbox/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
Modified: trunk/connectors/sandbox/translator-yahoo/pom.xml
===================================================================
--- trunk/connectors/sandbox/translator-yahoo/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/sandbox/translator-yahoo/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-yahoo</artifactId>
Modified: trunk/connectors/translator-file/pom.xml
===================================================================
--- trunk/connectors/translator-file/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/translator-file/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-file</artifactId>
Modified: trunk/connectors/translator-jdbc/pom.xml
===================================================================
--- trunk/connectors/translator-jdbc/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/translator-jdbc/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-jdbc</artifactId>
Modified: trunk/connectors/translator-ldap/pom.xml
===================================================================
--- trunk/connectors/translator-ldap/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/translator-ldap/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ldap</artifactId>
Modified: trunk/connectors/translator-loopback/pom.xml
===================================================================
--- trunk/connectors/translator-loopback/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/translator-loopback/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-loopback</artifactId>
Modified: trunk/connectors/translator-olap/pom.xml
===================================================================
--- trunk/connectors/translator-olap/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/translator-olap/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-olap</artifactId>
Modified: trunk/connectors/translator-salesforce/pom.xml
===================================================================
--- trunk/connectors/translator-salesforce/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/translator-salesforce/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-salesforce</artifactId>
Modified: trunk/connectors/translator-ws/pom.xml
===================================================================
--- trunk/connectors/translator-ws/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/translator-ws/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ws</artifactId>
Modified: trunk/console/pom.xml
===================================================================
--- trunk/console/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/console/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/documentation/admin-guide/pom.xml
===================================================================
--- trunk/documentation/admin-guide/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/documentation/admin-guide/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>admin-guide</artifactId>
Modified: trunk/documentation/caching-guide/pom.xml
===================================================================
--- trunk/documentation/caching-guide/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/documentation/caching-guide/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>caching-guide</artifactId>
Modified: trunk/documentation/client-developers-guide/pom.xml
===================================================================
--- trunk/documentation/client-developers-guide/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/documentation/client-developers-guide/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>client-developers-guide</artifactId>
Modified: trunk/documentation/developer-guide/pom.xml
===================================================================
--- trunk/documentation/developer-guide/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/documentation/developer-guide/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>developer-guide</artifactId>
Modified: trunk/documentation/docbook/custom.dtd
===================================================================
--- trunk/documentation/docbook/custom.dtd 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/documentation/docbook/custom.dtd 2011-05-04 15:03:22 UTC (rev 3150)
@@ -1,4 +1,4 @@
-<!ENTITY versionNumber "7.4">
+<!ENTITY versionNumber "7.5">
<!ENTITY copyrightYear "2011">
<!ENTITY copyrightHolder "Red Hat, Inc.">
<!ENTITY url "http://www.jboss.org/teiid/">
Modified: trunk/documentation/pom.xml
===================================================================
--- trunk/documentation/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/documentation/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/documentation/quick-start-example/pom.xml
===================================================================
--- trunk/documentation/quick-start-example/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/documentation/quick-start-example/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>quick-start-example</artifactId>
Modified: trunk/documentation/reference/pom.xml
===================================================================
--- trunk/documentation/reference/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/documentation/reference/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>reference</artifactId>
Modified: trunk/engine/pom.xml
===================================================================
--- trunk/engine/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/engine/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-engine</artifactId>
Modified: trunk/hibernate-dialect/pom.xml
===================================================================
--- trunk/hibernate-dialect/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/hibernate-dialect/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-hibernate-dialect</artifactId>
Modified: trunk/jboss-integration/pom.xml
===================================================================
--- trunk/jboss-integration/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/jboss-integration/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/metadata/pom.xml
===================================================================
--- trunk/metadata/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/metadata/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -5,7 +5,7 @@
<artifactId>teiid-parent</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
<description>Federated SQL and XML query engine.</description>
<properties>
<ant.version>1.7.0</ant.version>
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/runtime/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/test-integration/common/pom.xml
===================================================================
--- trunk/test-integration/common/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/test-integration/common/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-integration-common</artifactId>
Modified: trunk/test-integration/db/pom.xml
===================================================================
--- trunk/test-integration/db/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/test-integration/db/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -9,7 +9,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/test-integration/pom.xml
===================================================================
--- trunk/test-integration/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/test-integration/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
13 years, 7 months
- 1
- 0
teiid SVN: r3149 - branches.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-05-04 10:41:19 -0400 (Wed, 04 May 2011)
New Revision: 3149
Added:
branches/7.4.x/
Log:
adding 7.4.x branch
13 years, 7 months
- 1
- 0
teiid SVN: r3148 - trunk/client/src/main/java/org/teiid/jdbc.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-05-04 10:39:32 -0400 (Wed, 04 May 2011)
New Revision: 3148
Modified:
trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
Log:
TEIID-908 minor correction to client statement regex
Modified: trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2011-05-04 14:35:56 UTC (rev 3147)
+++ trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2011-05-04 14:39:32 UTC (rev 3148)
@@ -162,9 +162,9 @@
//Map<out/inout/return param index --> index in results>
protected Map outParamIndexMap = new HashMap();
- private static Pattern TRANSACTION_STATEMENT = Pattern.compile("\\s*(commit|rollback|(start\\s*transaction))\\s*;?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
- private static Pattern SET_STATEMENT = Pattern.compile("\\s*set\\s*(\\w+)\\s*([^;]*);?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
- private static Pattern SHOW_STATEMENT = Pattern.compile("\\s*show\\s*(\\w*);?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
+ private static Pattern TRANSACTION_STATEMENT = Pattern.compile("\\s*(commit|rollback|(start\\s+transaction))\\s*;?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
+ private static Pattern SET_STATEMENT = Pattern.compile("\\s*set\\s+(\\w+)\\s*([^;]*);?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
+ private static Pattern SHOW_STATEMENT = Pattern.compile("\\s*show\\s+(\\w*);?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
/**
* Factory Constructor
* @param driverConnection
13 years, 7 months
- 1
- 0
teiid SVN: r3147 - in trunk/engine/src: test/java/org/teiid/query/processor/relational and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-05-04 10:35:56 -0400 (Wed, 04 May 2011)
New Revision: 3147
Modified:
trunk/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java
trunk/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java
Log:
TEIID-1576 minor enhancement to more eagerly use the index join.
Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java 2011-05-04 14:34:23 UTC (rev 3146)
+++ trunk/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java 2011-05-04 14:35:56 UTC (rev 3147)
@@ -224,7 +224,8 @@
int schemaSize = this.joinNode.getBufferManager().getSchemaSize(other.getSource().getOutputElements());
int toReserve = this.joinNode.getBufferManager().getMaxProcessingKB();
//check if the other side can be sorted in memory
- if (other.getRowCount()/this.joinNode.getBatchSize() < toReserve/schemaSize) {
+ if (other.getRowCount() <= this.joinNode.getBatchSize()
+ || (possibleIndex.getRowCount() > this.joinNode.getBatchSize() && other.getRowCount()/this.joinNode.getBatchSize() < toReserve/schemaSize)) {
return false;
}
boolean useIndex = false;
Modified: trunk/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java 2011-05-04 14:34:23 UTC (rev 3146)
+++ trunk/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java 2011-05-04 14:35:56 UTC (rev 3147)
@@ -247,11 +247,10 @@
while(true) {
try {
TupleBatch batch = join.nextBatch();
- for(int row = currentRow; row <= batch.getEndRow(); row++) {
- List tuple = batch.getTuple(row);
- assertEquals("Rows don't match at " + row, expectedResults[row-1], tuple); //$NON-NLS-1$
+ for(;currentRow <= batch.getEndRow(); currentRow++) {
+ List tuple = batch.getTuple(currentRow);
+ assertEquals("Rows don't match at " + currentRow, expectedResults[currentRow-1], tuple); //$NON-NLS-1$
}
- currentRow += batch.getRowCount();
if(batch.getTerminationFlag()) {
break;
}
@@ -599,7 +598,7 @@
}
@Test public void testMergeJoinOptimization() throws Exception {
- helpTestEnhancedSortMergeJoin(100);
+ helpTestEnhancedSortMergeJoin(99);
}
private void helpTestEnhancedSortMergeJoin(int batchSize)
@@ -679,13 +678,13 @@
Arrays.asList(new Object[] { 7, 7 }),
Arrays.asList(new Object[] { 2, 2 }),
Arrays.asList(new Object[] { 6, 6 }),
- Arrays.asList(new Object[] { 1, 1 })
+ Arrays.asList(new Object[] { 1, 1 }),
};
helpCreateJoin();
this.joinStrategy = new EnhancedSortMergeJoinStrategy(SortOption.SORT, SortOption.SORT);
this.join.setJoinStrategy(joinStrategy);
//this.join.setRightDistinct(true);
- helpTestJoinDirect(expected, 100, 1);
+ helpTestJoinDirect(expected, 40, 1);
}
@Test public void testMergeJoinOptimizationWithDistinctAlreadySorted() throws Exception {
@@ -717,7 +716,7 @@
helpCreateJoin();
this.joinStrategy = new EnhancedSortMergeJoinStrategy(SortOption.SORT, SortOption.ALREADY_SORTED);
this.join.setJoinStrategy(joinStrategy);
- helpTestJoinDirect(expected, 100, 1);
+ helpTestJoinDirect(expected, 40, 1);
}
@Test public void testRepeatedMerge() throws Exception {
13 years, 7 months
- 1
- 0
teiid SVN: r3146 - in trunk: documentation/admin-guide/src/main/docbook/en-US/content and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-05-04 10:34:23 -0400 (Wed, 04 May 2011)
New Revision: 3146
Modified:
trunk/build/kits/jboss-container/teiid-releasenotes.html
trunk/documentation/admin-guide/src/main/docbook/en-US/content/clustering.xml
trunk/documentation/admin-guide/src/main/docbook/en-US/content/installation.xml
Log:
minor doc updates
Modified: trunk/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- trunk/build/kits/jboss-container/teiid-releasenotes.html 2011-05-04 13:32:31 UTC (rev 3145)
+++ trunk/build/kits/jboss-container/teiid-releasenotes.html 2011-05-04 14:34:23 UTC (rev 3146)
@@ -53,8 +53,8 @@
<LI><B>Enhanced Sort Join</B> - the partitioned merge join was replaced with an enhanced sort join. The enhanced sort join will use the actual row counts from each side of the relation to perform a index based join if one side is small enough, a partial sort of the larger side and a repeated merge join if the tuples are unbalanced but one side is not small enough to form an index, or a standard sort merge join if the tuples are balanced.
<LI><B>JDK1.5 JDBC Client JAR</B> - A retro-translated Teiid client JDBC jar now available to use with JDK 1.5 VM. Note only the JDBC API is supported, not the Admin API, or retrieving query plans as XML.
<LI><B>Security Improvements</B> - UDF and pushdown functions can now be protected with data roles. Also the CommandContext can provide the Subject for custom security checks in UDFs.
- <LI><B>Cache Invalidation</B> - Prepared plan and result set caches can have a maxStaleness value, which will invalidate entries based upon metadata and data changes respectively. See the Admin Guide for more.
- <LI><B>Runtime-updates of Metadata</B> - Alter statements have been added to change view/procedure/INSTEAD OF trigger (update procedure) definitions have been added. A create statement was also added to add INSTEAD OF trigger (update procedures) to views.
+ <LI><B>Cache Invalidation</B> - Prepared plan and result set caches have will invalidate entries based upon metadata and data changes respectively. See the cache configuration maxStaleness setting and the Admin and Developer Guides for more.
+ <LI><B>Runtime-updates of Metadata</B> - ALTER statements have been added to change view/procedure/INSTEAD OF trigger (update procedure) definitions. A CREATE TRIGGER statement is also available to add an INSTEAD OF trigger (update procedures) to views.
System procedures were added to set extension metadata and stat values. By default all effects of metadata updates happen only on running vdbs across the cluster. To make the changes persistent see the Developers Guide Runtime Updates section.
</UL>
Modified: trunk/documentation/admin-guide/src/main/docbook/en-US/content/clustering.xml
===================================================================
--- trunk/documentation/admin-guide/src/main/docbook/en-US/content/clustering.xml 2011-05-04 13:32:31 UTC (rev 3145)
+++ trunk/documentation/admin-guide/src/main/docbook/en-US/content/clustering.xml 2011-05-04 14:34:23 UTC (rev 3146)
@@ -16,6 +16,7 @@
<listitem> <para>Load Balancing: Take look at the Client developers guide on how to use load balancing between multiple nodes.</para> </listitem>
<listitem> <para>Fail Over: Take look at the Client developers guide on how to use fail over between multiple nodes.</para> </listitem>
<listitem> <para>Distributed Caching: This is automatically done for you once you configure it as specified above. </para> </listitem>
+ <listitem> <para>Event distribution: metadata and data modifications will be distributed to all cluster members. </para> </listitem>
</orderedlist>
</para>
Modified: trunk/documentation/admin-guide/src/main/docbook/en-US/content/installation.xml
===================================================================
--- trunk/documentation/admin-guide/src/main/docbook/en-US/content/installation.xml 2011-05-04 13:32:31 UTC (rev 3145)
+++ trunk/documentation/admin-guide/src/main/docbook/en-US/content/installation.xml 2011-05-04 14:34:23 UTC (rev 3146)
@@ -28,6 +28,7 @@
profiles is required. The default profile is the typical installation location, for example "<jboss-install>/server/default".
The Teiid runtime directory structure matches JBoss profiles directly - it is just an overlay.
</para>
+ <para>The all profile is recommended in a clustered environment to take advantage of clustered caching and cluster safe distribution of events.</para>
</listitem>
<listitem>
13 years, 7 months
- 1
- 0
teiid SVN: r3145 - trunk/build/kits/jboss-container.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2011-05-04 09:32:31 -0400 (Wed, 04 May 2011)
New Revision: 3145
Modified:
trunk/build/kits/jboss-container/teiid-releasenotes.html
Log:
TEIID-1511: Adding KI about too many open files
Modified: trunk/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- trunk/build/kits/jboss-container/teiid-releasenotes.html 2011-05-04 00:01:35 UTC (rev 3144)
+++ trunk/build/kits/jboss-container/teiid-releasenotes.html 2011-05-04 13:32:31 UTC (rev 3145)
@@ -177,7 +177,8 @@
<li>TEIID-1281 - Negative start indexing is not supported by DB2 and Derby databases. Usage of the Teiid SUBSTRING against these sources should not use negative start values.
<li>TEIID-1008 - Most versions of Oracle and MySQL do not support deeply nested correlated references. There is currently no workaround for this issue.
<li>For compatibility with the 7.0 release if a stored procedure parameter list begins with identifier=, then it will be parsed as a named parameter invocation even if the intent was to use a comparison predicate
- as the first parameter value. The workaround is to use nesting parens, e.g. call proc((identifier=value), ...), which clarifies that this is positional value. This workaround will not be needed in later releases.
+ as the first parameter value. The workaround is to use nesting parens, e.g. call proc((identifier=value), ...), which clarifies that this is positional value. This workaround will not be needed in later releases.
+ <li><a url="https://issues.jboss.org/browse/TEIID-1511">TEIID-1511<a/> - When a VDB is deployed and undeployed a socket is left open, which may lead to "too manay open files". Check the defect comments for details.
</ul>
<h4>from 7.0</h4>
<ul>
13 years, 7 months
- 1
- 0
teiid SVN: r3144 - in trunk/connectors/translator-jdbc/src: test/java/org/teiid/translator/jdbc/teradata and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2011-05-03 20:01:35 -0400 (Tue, 03 May 2011)
New Revision: 3144
Modified:
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teradata/TeradataExecutionFactory.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/teradata/TestTeradataTranslator.java
Log:
TEIID-1495
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teradata/TeradataExecutionFactory.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teradata/TeradataExecutionFactory.java 2011-05-03 21:08:27 UTC (rev 3143)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teradata/TeradataExecutionFactory.java 2011-05-04 00:01:35 UTC (rev 3144)
@@ -291,12 +291,18 @@
public static class NumericToStringModifier extends FunctionModifier {
private int charSize;
+ private String formatCode;
public NumericToStringModifier(int size) {
this.charSize = size;
+ StringBuilder sb = new StringBuilder();
+ for(int i = 0; i < size; i++) {
+ sb.append('Z');
+ }
+ this.formatCode = sb.toString();
}
@Override
public List<?> translate(Function function) {
- return Arrays.asList("TRIM(BOTH FROM ",function.getParameters().get(0), " (FORMAT 'Z')(CHAR("+this.charSize+")))"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ return Arrays.asList("TRIM(BOTH FROM ",function.getParameters().get(0), " (FORMAT '"+this.formatCode+"')(CHAR("+this.charSize+")))"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
}
}
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/teradata/TestTeradataTranslator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/teradata/TestTeradataTranslator.java 2011-05-03 21:08:27 UTC (rev 3143)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/teradata/TestTeradataTranslator.java 2011-05-04 00:01:35 UTC (rev 3144)
@@ -75,11 +75,11 @@
}
@Test public void testByteToString() throws Exception {
- helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class), "string", "TRIM(BOTH FROM 1 (FORMAT 'Z')(CHAR(4)))");
+ helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class), "string", "TRIM(BOTH FROM 1 (FORMAT 'ZZZZ')(CHAR(4)))");
}
@Test public void testDoubleToString() throws Exception {
- helpTest(LANG_FACTORY.createLiteral(new Double(1.0), Double.class), "string", "TRIM(BOTH FROM 1.0 (FORMAT 'Z')(CHAR(25)))");
+ helpTest(LANG_FACTORY.createLiteral(new Double(1.0), Double.class), "string", "TRIM(BOTH FROM 1.0 (FORMAT 'ZZZZZZZZZZZZZZZZZZZZZZZZZ')(CHAR(25)))");
}
@Test public void testInDecompose() throws Exception {
13 years, 7 months
- 1
- 0
teiid SVN: r3143 - in trunk/engine/src: test/java/org/teiid/query/processor and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-05-03 17:08:27 -0400 (Tue, 03 May 2011)
New Revision: 3143
Modified:
trunk/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java
trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java
trunk/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java
Log:
TEIID-1576 fix for incorrect results with enhanced sort merge join
Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java 2011-05-03 16:48:28 UTC (rev 3142)
+++ trunk/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java 2011-05-03 21:08:27 UTC (rev 3143)
@@ -293,10 +293,10 @@
List outputTuple = outputTuple(this.processingSortLeft==SortOption.NOT_SORTED?partitionedTuple:reorderedTuple,
this.processingSortLeft==SortOption.NOT_SORTED?reorderedTuple:partitionedTuple);
boolean matches = this.joinNode.matchesCriteria(outputTuple);
+ this.sortedTuple = null;
if (matches) {
this.joinNode.addBatchRow(outputTuple);
}
- this.sortedTuple = null;
}
}
Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2011-05-03 16:48:28 UTC (rev 3142)
+++ trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2011-05-03 21:08:27 UTC (rev 3143)
@@ -223,17 +223,21 @@
}
public static void doProcess(ProcessorPlan plan, ProcessorDataManager dataManager, List[] expectedResults, CommandContext context) throws Exception {
- BufferManagerImpl bufferMgr = BufferManagerFactory.createBufferManager();
- bufferMgr.setProcessorBatchSize(context.getProcessorBatchSize());
- bufferMgr.setConnectorBatchSize(context.getProcessorBatchSize());
- context.getNextRand(0);
+ BufferManager bufferMgr = context.getBufferManager();
+ if (bufferMgr == null) {
+ BufferManagerImpl bm = BufferManagerFactory.createBufferManager();
+ bm.setProcessorBatchSize(context.getProcessorBatchSize());
+ bm.setConnectorBatchSize(context.getProcessorBatchSize());
+ context.setBufferManager(bm);
+ bufferMgr = bm;
+ }
+ context.getNextRand(0);
if (context.getTempTableStore() == null) {
context.setTempTableStore(new TempTableStore(context.getConnectionID()));
}
if (context.getGlobalTableStore() == null) {
context.setGlobalTableStore(new TempTableStore("SYSTEM"));
}
- context.setBufferManager(bufferMgr);
if (!(dataManager instanceof TempTableDataManager)) {
SessionAwareCache<CachedResults> cache = new SessionAwareCache<CachedResults>();
cache.setBufferManager(bufferMgr);
Modified: trunk/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java 2011-05-03 16:48:28 UTC (rev 3142)
+++ trunk/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java 2011-05-03 21:08:27 UTC (rev 3143)
@@ -599,7 +599,12 @@
}
@Test public void testMergeJoinOptimization() throws Exception {
- this.joinType = JoinType.JOIN_INNER;
+ helpTestEnhancedSortMergeJoin(100);
+ }
+
+ private void helpTestEnhancedSortMergeJoin(int batchSize)
+ throws TeiidComponentException, TeiidProcessingException {
+ this.joinType = JoinType.JOIN_INNER;
int rows = 100;
List[] data = new List[rows];
for(int i=0; i<rows; i++) {
@@ -632,7 +637,11 @@
helpCreateJoin();
this.joinStrategy = new EnhancedSortMergeJoinStrategy(SortOption.SORT, SortOption.SORT);
this.join.setJoinStrategy(joinStrategy);
- helpTestJoinDirect(expected, 100, 1);
+ helpTestJoinDirect(expected, batchSize, 1);
+ }
+
+ @Test public void testMergeJoinOptimizationMultiBatch() throws Exception {
+ helpTestEnhancedSortMergeJoin(10);
}
@Test public void testMergeJoinOptimizationNoRows() throws Exception {
13 years, 7 months
- 1
- 0
teiid SVN: r3142 - in trunk: adminshell and 37 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-05-03 12:48:28 -0400 (Tue, 03 May 2011)
New Revision: 3142
Modified:
trunk/adminshell/pom.xml
trunk/api/pom.xml
trunk/build/pom.xml
trunk/cache-jbosscache/pom.xml
trunk/client-jdk15/pom.xml
trunk/client/pom.xml
trunk/common-core/pom.xml
trunk/connectors/connector-file/pom.xml
trunk/connectors/connector-ldap/pom.xml
trunk/connectors/connector-salesforce/pom.xml
trunk/connectors/connector-ws/pom.xml
trunk/connectors/pom.xml
trunk/connectors/salesforce-api/pom.xml
trunk/connectors/sandbox/pom.xml
trunk/connectors/sandbox/translator-yahoo/pom.xml
trunk/connectors/translator-file/pom.xml
trunk/connectors/translator-jdbc/pom.xml
trunk/connectors/translator-ldap/pom.xml
trunk/connectors/translator-loopback/pom.xml
trunk/connectors/translator-olap/pom.xml
trunk/connectors/translator-salesforce/pom.xml
trunk/connectors/translator-ws/pom.xml
trunk/console/pom.xml
trunk/documentation/admin-guide/pom.xml
trunk/documentation/caching-guide/pom.xml
trunk/documentation/client-developers-guide/pom.xml
trunk/documentation/developer-guide/pom.xml
trunk/documentation/pom.xml
trunk/documentation/quick-start-example/pom.xml
trunk/documentation/reference/pom.xml
trunk/engine/pom.xml
trunk/hibernate-dialect/pom.xml
trunk/jboss-integration/pom.xml
trunk/metadata/pom.xml
trunk/pom.xml
trunk/runtime/pom.xml
trunk/test-integration/common/pom.xml
trunk/test-integration/db/pom.xml
trunk/test-integration/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: trunk/adminshell/pom.xml
===================================================================
--- trunk/adminshell/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/adminshell/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: trunk/api/pom.xml
===================================================================
--- trunk/api/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/api/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-api</artifactId>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/build/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid</artifactId>
Modified: trunk/cache-jbosscache/pom.xml
===================================================================
--- trunk/cache-jbosscache/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/cache-jbosscache/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-cache-jbosscache</artifactId>
Modified: trunk/client/pom.xml
===================================================================
--- trunk/client/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/client/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
Modified: trunk/client-jdk15/pom.xml
===================================================================
--- trunk/client-jdk15/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/client-jdk15/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client-jdk15</artifactId>
Modified: trunk/common-core/pom.xml
===================================================================
--- trunk/common-core/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/common-core/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-common-core</artifactId>
Modified: trunk/connectors/connector-file/pom.xml
===================================================================
--- trunk/connectors/connector-file/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/connector-file/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-file</artifactId>
Modified: trunk/connectors/connector-ldap/pom.xml
===================================================================
--- trunk/connectors/connector-ldap/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/connector-ldap/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ldap</artifactId>
Modified: trunk/connectors/connector-salesforce/pom.xml
===================================================================
--- trunk/connectors/connector-salesforce/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/connector-salesforce/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-salesforce</artifactId>
Modified: trunk/connectors/connector-ws/pom.xml
===================================================================
--- trunk/connectors/connector-ws/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/connector-ws/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ws</artifactId>
Modified: trunk/connectors/pom.xml
===================================================================
--- trunk/connectors/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/connectors/salesforce-api/pom.xml
===================================================================
--- trunk/connectors/salesforce-api/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/salesforce-api/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>salesforce-api</artifactId>
Modified: trunk/connectors/sandbox/pom.xml
===================================================================
--- trunk/connectors/sandbox/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/sandbox/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
Modified: trunk/connectors/sandbox/translator-yahoo/pom.xml
===================================================================
--- trunk/connectors/sandbox/translator-yahoo/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/sandbox/translator-yahoo/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-yahoo</artifactId>
Modified: trunk/connectors/translator-file/pom.xml
===================================================================
--- trunk/connectors/translator-file/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/translator-file/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-file</artifactId>
Modified: trunk/connectors/translator-jdbc/pom.xml
===================================================================
--- trunk/connectors/translator-jdbc/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/translator-jdbc/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-jdbc</artifactId>
Modified: trunk/connectors/translator-ldap/pom.xml
===================================================================
--- trunk/connectors/translator-ldap/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/translator-ldap/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ldap</artifactId>
Modified: trunk/connectors/translator-loopback/pom.xml
===================================================================
--- trunk/connectors/translator-loopback/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/translator-loopback/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-loopback</artifactId>
Modified: trunk/connectors/translator-olap/pom.xml
===================================================================
--- trunk/connectors/translator-olap/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/translator-olap/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-olap</artifactId>
Modified: trunk/connectors/translator-salesforce/pom.xml
===================================================================
--- trunk/connectors/translator-salesforce/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/translator-salesforce/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-salesforce</artifactId>
Modified: trunk/connectors/translator-ws/pom.xml
===================================================================
--- trunk/connectors/translator-ws/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/translator-ws/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ws</artifactId>
Modified: trunk/console/pom.xml
===================================================================
--- trunk/console/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/console/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/documentation/admin-guide/pom.xml
===================================================================
--- trunk/documentation/admin-guide/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/documentation/admin-guide/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>admin-guide</artifactId>
Modified: trunk/documentation/caching-guide/pom.xml
===================================================================
--- trunk/documentation/caching-guide/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/documentation/caching-guide/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>caching-guide</artifactId>
Modified: trunk/documentation/client-developers-guide/pom.xml
===================================================================
--- trunk/documentation/client-developers-guide/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/documentation/client-developers-guide/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>client-developers-guide</artifactId>
Modified: trunk/documentation/developer-guide/pom.xml
===================================================================
--- trunk/documentation/developer-guide/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/documentation/developer-guide/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>developer-guide</artifactId>
Modified: trunk/documentation/pom.xml
===================================================================
--- trunk/documentation/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/documentation/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/documentation/quick-start-example/pom.xml
===================================================================
--- trunk/documentation/quick-start-example/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/documentation/quick-start-example/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>quick-start-example</artifactId>
Modified: trunk/documentation/reference/pom.xml
===================================================================
--- trunk/documentation/reference/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/documentation/reference/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>reference</artifactId>
Modified: trunk/engine/pom.xml
===================================================================
--- trunk/engine/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/engine/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-engine</artifactId>
Modified: trunk/hibernate-dialect/pom.xml
===================================================================
--- trunk/hibernate-dialect/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/hibernate-dialect/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-hibernate-dialect</artifactId>
Modified: trunk/jboss-integration/pom.xml
===================================================================
--- trunk/jboss-integration/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/jboss-integration/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/metadata/pom.xml
===================================================================
--- trunk/metadata/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/metadata/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -5,15 +5,15 @@
<artifactId>teiid-parent</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-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>
- <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-7.4.0.CR1</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-7.4.0.CR1</developerConnection>
+ <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/trunk</developerConnection>
</scm>
<licenses>
<license>
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/runtime/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/test-integration/common/pom.xml
===================================================================
--- trunk/test-integration/common/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/test-integration/common/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-integration-common</artifactId>
Modified: trunk/test-integration/db/pom.xml
===================================================================
--- trunk/test-integration/db/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/test-integration/db/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -9,7 +9,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/test-integration/pom.xml
===================================================================
--- trunk/test-integration/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/test-integration/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
13 years, 7 months
- 1
- 0
teiid SVN: r3141 - in tags: teiid-parent-7.4.0.CR1 and 49 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-05-03 12:47:11 -0400 (Tue, 03 May 2011)
New Revision: 3141
Added:
tags/teiid-parent-7.4.0.CR1/
tags/teiid-parent-7.4.0.CR1/adminshell/pom.xml
tags/teiid-parent-7.4.0.CR1/api/pom.xml
tags/teiid-parent-7.4.0.CR1/api/src/main/java/org/teiid/metadata/MetadataRepository.java
tags/teiid-parent-7.4.0.CR1/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml
tags/teiid-parent-7.4.0.CR1/build/pom.xml
tags/teiid-parent-7.4.0.CR1/cache-jbosscache/pom.xml
tags/teiid-parent-7.4.0.CR1/client-jdk15/pom.xml
tags/teiid-parent-7.4.0.CR1/client/pom.xml
tags/teiid-parent-7.4.0.CR1/common-core/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/connector-file/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/connector-ldap/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/connector-salesforce/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/connector-ws/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/salesforce-api/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/sandbox/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/sandbox/translator-yahoo/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/translator-file/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/translator-jdbc/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/translator-ldap/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/translator-loopback/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/translator-olap/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/translator-salesforce/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/translator-ws/pom.xml
tags/teiid-parent-7.4.0.CR1/console/pom.xml
tags/teiid-parent-7.4.0.CR1/documentation/admin-guide/pom.xml
tags/teiid-parent-7.4.0.CR1/documentation/caching-guide/pom.xml
tags/teiid-parent-7.4.0.CR1/documentation/caching-guide/src/main/docbook/en-US/content/results.xml
tags/teiid-parent-7.4.0.CR1/documentation/client-developers-guide/pom.xml
tags/teiid-parent-7.4.0.CR1/documentation/client-developers-guide/src/main/docbook/en-US/content/prepared-statements.xml
tags/teiid-parent-7.4.0.CR1/documentation/developer-guide/pom.xml
tags/teiid-parent-7.4.0.CR1/documentation/developer-guide/src/main/docbook/en-US/Developer_Guide.xml
tags/teiid-parent-7.4.0.CR1/documentation/developer-guide/src/main/docbook/en-US/content/runtime-updates.xml
tags/teiid-parent-7.4.0.CR1/documentation/docbook/custom.dtd
tags/teiid-parent-7.4.0.CR1/documentation/pom.xml
tags/teiid-parent-7.4.0.CR1/documentation/quick-start-example/pom.xml
tags/teiid-parent-7.4.0.CR1/documentation/reference/pom.xml
tags/teiid-parent-7.4.0.CR1/documentation/reference/src/main/docbook/en-US/content/grammar.xml
tags/teiid-parent-7.4.0.CR1/documentation/reference/src/main/docbook/en-US/content/system_schema.xml
tags/teiid-parent-7.4.0.CR1/documentation/reference/src/main/docbook/en-US/content/translators.xml
tags/teiid-parent-7.4.0.CR1/engine/pom.xml
tags/teiid-parent-7.4.0.CR1/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
tags/teiid-parent-7.4.0.CR1/engine/src/main/java/org/teiid/query/processor/DdlPlan.java
tags/teiid-parent-7.4.0.CR1/hibernate-dialect/pom.xml
tags/teiid-parent-7.4.0.CR1/jboss-integration/pom.xml
tags/teiid-parent-7.4.0.CR1/metadata/pom.xml
tags/teiid-parent-7.4.0.CR1/pom.xml
tags/teiid-parent-7.4.0.CR1/runtime/pom.xml
tags/teiid-parent-7.4.0.CR1/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
tags/teiid-parent-7.4.0.CR1/test-integration/common/pom.xml
tags/teiid-parent-7.4.0.CR1/test-integration/db/pom.xml
tags/teiid-parent-7.4.0.CR1/test-integration/pom.xml
Removed:
tags/teiid-parent-7.4.0.CR1/adminshell/pom.xml
tags/teiid-parent-7.4.0.CR1/api/pom.xml
tags/teiid-parent-7.4.0.CR1/api/src/main/java/org/teiid/metadata/MetadataRepository.java
tags/teiid-parent-7.4.0.CR1/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml
tags/teiid-parent-7.4.0.CR1/build/pom.xml
tags/teiid-parent-7.4.0.CR1/cache-jbosscache/pom.xml
tags/teiid-parent-7.4.0.CR1/client-jdk15/pom.xml
tags/teiid-parent-7.4.0.CR1/client/pom.xml
tags/teiid-parent-7.4.0.CR1/common-core/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/connector-file/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/connector-ldap/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/connector-salesforce/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/connector-ws/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/salesforce-api/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/sandbox/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/sandbox/translator-yahoo/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/translator-file/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/translator-jdbc/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/translator-ldap/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/translator-loopback/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/translator-olap/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/translator-salesforce/pom.xml
tags/teiid-parent-7.4.0.CR1/connectors/translator-ws/pom.xml
tags/teiid-parent-7.4.0.CR1/console/pom.xml
tags/teiid-parent-7.4.0.CR1/documentation/admin-guide/pom.xml
tags/teiid-parent-7.4.0.CR1/documentation/caching-guide/pom.xml
tags/teiid-parent-7.4.0.CR1/documentation/caching-guide/src/main/docbook/en-US/content/results.xml
tags/teiid-parent-7.4.0.CR1/documentation/client-developers-guide/pom.xml
tags/teiid-parent-7.4.0.CR1/documentation/client-developers-guide/src/main/docbook/en-US/content/prepared-statements.xml
tags/teiid-parent-7.4.0.CR1/documentation/developer-guide/pom.xml
tags/teiid-parent-7.4.0.CR1/documentation/developer-guide/src/main/docbook/en-US/Developer_Guide.xml
tags/teiid-parent-7.4.0.CR1/documentation/docbook/custom.dtd
tags/teiid-parent-7.4.0.CR1/documentation/pom.xml
tags/teiid-parent-7.4.0.CR1/documentation/quick-start-example/pom.xml
tags/teiid-parent-7.4.0.CR1/documentation/reference/pom.xml
tags/teiid-parent-7.4.0.CR1/documentation/reference/src/main/docbook/en-US/content/grammar.xml
tags/teiid-parent-7.4.0.CR1/documentation/reference/src/main/docbook/en-US/content/system_schema.xml
tags/teiid-parent-7.4.0.CR1/documentation/reference/src/main/docbook/en-US/content/translators.xml
tags/teiid-parent-7.4.0.CR1/engine/pom.xml
tags/teiid-parent-7.4.0.CR1/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
tags/teiid-parent-7.4.0.CR1/engine/src/main/java/org/teiid/query/processor/DdlPlan.java
tags/teiid-parent-7.4.0.CR1/hibernate-dialect/pom.xml
tags/teiid-parent-7.4.0.CR1/jboss-integration/pom.xml
tags/teiid-parent-7.4.0.CR1/metadata/pom.xml
tags/teiid-parent-7.4.0.CR1/pom.xml
tags/teiid-parent-7.4.0.CR1/runtime/pom.xml
tags/teiid-parent-7.4.0.CR1/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
tags/teiid-parent-7.4.0.CR1/test-integration/common/pom.xml
tags/teiid-parent-7.4.0.CR1/test-integration/db/pom.xml
tags/teiid-parent-7.4.0.CR1/test-integration/pom.xml
Log:
[maven-release-plugin] copy for tag teiid-parent-7.4.0.CR1
Deleted: tags/teiid-parent-7.4.0.CR1/adminshell/pom.xml
===================================================================
--- trunk/adminshell/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/adminshell/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>teiid-parent</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>teiid-adminshell</artifactId>
- <name>Adminshell</name>
- <description>Adminshell for Teiid</description>
- <dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-client</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>1.7.2</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>0.9.94</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.fusesource.jansi</groupId>
- <artifactId>jansi</artifactId>
- <version>1.2.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/adminshell/pom.xml (from rev 3140, trunk/adminshell/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/adminshell/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/adminshell/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>teiid-parent</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>teiid-adminshell</artifactId>
+ <name>Adminshell</name>
+ <description>Adminshell for Teiid</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-client</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>1.7.2</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>0.9.94</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.fusesource.jansi</groupId>
+ <artifactId>jansi</artifactId>
+ <version>1.2.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/api/pom.xml
===================================================================
--- trunk/api/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/api/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>teiid-parent</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>teiid-api</artifactId>
- <name>Teiid Translator API</name>
- <description>API for creating Translators and other common extenders in Teiid</description>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-</project>
Copied: tags/teiid-parent-7.4.0.CR1/api/pom.xml (from rev 3140, trunk/api/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/api/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/api/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>teiid-parent</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>teiid-api</artifactId>
+ <name>Teiid Translator API</name>
+ <description>API for creating Translators and other common extenders in Teiid</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+</project>
Deleted: tags/teiid-parent-7.4.0.CR1/api/src/main/java/org/teiid/metadata/MetadataRepository.java
===================================================================
--- trunk/api/src/main/java/org/teiid/metadata/MetadataRepository.java 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/api/src/main/java/org/teiid/metadata/MetadataRepository.java 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,151 +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 org.teiid.metadata;
-import java.util.LinkedHashMap;
-
-/**
- * A hook for externalizing view, procedure, and other metadata.
- */
-public interface MetadataRepository {
-
- /**
- * Returns an updated view definition (AS SQL only) or null if the current view definition should be used
- * should be used.
- */
- String getViewDefinition(String vdbName, int vdbVersion, Table table);
-
- /**
- * Set the view definition
- * @param vdbName
- * @param vdbVersion
- * @param table
- * @param viewDefinition
- */
- void setViewDefinition(String vdbName, int vdbVersion, Table table, String viewDefinition);
-
- /**
- * Returns an updated trigger definition (FOR EACH ROW ...) or null if the current view definition should be used
- * should be used.
- */
- String getInsteadOfTriggerDefinition(String vdbName, int vdbVersion, Table table, Table.TriggerEvent triggerOperation);
-
- /**
- *
- * @param vdbName
- * @param vdbVersion
- * @param table
- * @param triggerOperation
- * @param triggerDefinition
- */
- void setInsteadOfTriggerDefinition(String vdbName, int vdbVersion, Table table, Table.TriggerEvent triggerOperation, String triggerDefinition);
-
- /**
- * Returns whether the trigger is enabled
- * @param vdbName
- * @param vdbVersion
- * @param table
- * @param triggerOperation
- * @return
- */
- boolean isInsteadOfTriggerEnabled(String vdbName, int vdbVersion, Table table, Table.TriggerEvent triggerOperation);
-
- /**
- * Set the given trigger enabled.
- * @param vdbName
- * @param vdbVersion
- * @param table
- * @param triggerOperation
- * @param enabled
- */
- void setInsteadOfTriggerEnabled(String vdbName, int vdbVersion, Table table, Table.TriggerEvent triggerOperation, boolean enabled);
-
- /**
- * Returns an updated procedure definition (CREATE PROCEDURE ...) or null if the current procedure definition should be used
- * should be used.
- */
- String getProcedureDefinition(String vdbName, int vdbVersion, Procedure procedure);
-
- /**
- * Set the procedure definition
- * @param vdbName
- * @param vdbVersion
- * @param table
- * @param procedureDefinition
- */
- void setProcedureDefinition(String vdbName, int vdbVersion, Procedure procedure, String procedureDefinition);
-
- /**
- * Get updated {@link TableStats} for the given table
- * @param vdbName
- * @param vdbVersion
- * @param table
- * @return the stats. a null result or a null stat indicates that the current value should be used
- */
- TableStats getTableStats(String vdbName, int vdbVersion, Table table);
-
- /**
- * Set the {@link TableStats} for the given table
- * @param vdbName
- * @param vdbVersion
- * @param table
- * @param tableStats
- */
- void setTableStats(String vdbName, int vdbVersion, Table table, TableStats tableStats);
-
- /**
- * Get updated {@link ColumnStats} for the given column
- * @param vdbName
- * @param vdbVersion
- * @param column
- * @return the stats. a null result or a null stat indicates that the default should be used
- */
- ColumnStats getColumnStats(String vdbName, int vdbVersion, Column column);
-
- /**
- * Set the {@link ColumnStats} for a given column
- * @param vdbName
- * @param vdbVersion
- * @param column
- * @param columnStats
- */
- void setColumnStats(String vdbName, int vdbVersion, Column column, ColumnStats columnStats);
-
- /**
- * Get the extension metadata for a given record.
- * @param vdbName
- * @param vdbVersion
- * @param record
- * @return
- */
- LinkedHashMap<String, String> getProperties(String vdbName, int vdbVersion, AbstractMetadataRecord record);
-
- /**
- * Set an extension metadata property for a given record.
- * @param vdbName
- * @param vdbVersion
- * @param record
- * @param name
- * @param value
- */
- void setProperty(String vdbName, int vdbVersion, AbstractMetadataRecord record, String name, String value);
-}
Copied: tags/teiid-parent-7.4.0.CR1/api/src/main/java/org/teiid/metadata/MetadataRepository.java (from rev 3138, trunk/api/src/main/java/org/teiid/metadata/MetadataRepository.java)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/api/src/main/java/org/teiid/metadata/MetadataRepository.java (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/api/src/main/java/org/teiid/metadata/MetadataRepository.java 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,165 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+package org.teiid.metadata;
+import java.util.LinkedHashMap;
+
+/**
+ * A hook for externalizing view, procedure, and other metadata.
+ */
+public interface MetadataRepository {
+
+ /**
+ * Marks the start of vdb metadata loading
+ * @param vdbName
+ * @param vdbVersion
+ */
+ void startLoadVdb(String vdbName, int vdbVersion);
+
+ /**
+ * Marks the end of vdb metadata loading
+ * @param vdbName
+ * @param vdbVersion
+ */
+ void endLoadVdb(String vdbName, int vdbVersion);
+
+ /**
+ * Returns an updated view definition (AS SQL only) or null if the current view definition should be used
+ * should be used.
+ */
+ String getViewDefinition(String vdbName, int vdbVersion, Table table);
+
+ /**
+ * Set the view definition
+ * @param vdbName
+ * @param vdbVersion
+ * @param table
+ * @param viewDefinition
+ */
+ void setViewDefinition(String vdbName, int vdbVersion, Table table, String viewDefinition);
+
+ /**
+ * Returns an updated trigger definition (FOR EACH ROW ...) or null if the current view definition should be used
+ * should be used.
+ */
+ String getInsteadOfTriggerDefinition(String vdbName, int vdbVersion, Table table, Table.TriggerEvent triggerOperation);
+
+ /**
+ *
+ * @param vdbName
+ * @param vdbVersion
+ * @param table
+ * @param triggerOperation
+ * @param triggerDefinition
+ */
+ void setInsteadOfTriggerDefinition(String vdbName, int vdbVersion, Table table, Table.TriggerEvent triggerOperation, String triggerDefinition);
+
+ /**
+ * Returns whether the trigger is enabled
+ * @param vdbName
+ * @param vdbVersion
+ * @param table
+ * @param triggerOperation
+ * @return
+ */
+ Boolean isInsteadOfTriggerEnabled(String vdbName, int vdbVersion, Table table, Table.TriggerEvent triggerOperation);
+
+ /**
+ * Set the given trigger enabled.
+ * @param vdbName
+ * @param vdbVersion
+ * @param table
+ * @param triggerOperation
+ * @param enabled
+ */
+ void setInsteadOfTriggerEnabled(String vdbName, int vdbVersion, Table table, Table.TriggerEvent triggerOperation, boolean enabled);
+
+ /**
+ * Returns an updated procedure definition (CREATE PROCEDURE ...) or null if the current procedure definition should be used
+ * should be used.
+ */
+ String getProcedureDefinition(String vdbName, int vdbVersion, Procedure procedure);
+
+ /**
+ * Set the procedure definition
+ * @param vdbName
+ * @param vdbVersion
+ * @param table
+ * @param procedureDefinition
+ */
+ void setProcedureDefinition(String vdbName, int vdbVersion, Procedure procedure, String procedureDefinition);
+
+ /**
+ * Get updated {@link TableStats} for the given table
+ * @param vdbName
+ * @param vdbVersion
+ * @param table
+ * @return the stats. a null result or a null stat indicates that the current value should be used
+ */
+ TableStats getTableStats(String vdbName, int vdbVersion, Table table);
+
+ /**
+ * Set the {@link TableStats} for the given table
+ * @param vdbName
+ * @param vdbVersion
+ * @param table
+ * @param tableStats
+ */
+ void setTableStats(String vdbName, int vdbVersion, Table table, TableStats tableStats);
+
+ /**
+ * Get updated {@link ColumnStats} for the given column
+ * @param vdbName
+ * @param vdbVersion
+ * @param column
+ * @return the stats. a null result or a null stat indicates that the default should be used
+ */
+ ColumnStats getColumnStats(String vdbName, int vdbVersion, Column column);
+
+ /**
+ * Set the {@link ColumnStats} for a given column
+ * @param vdbName
+ * @param vdbVersion
+ * @param column
+ * @param columnStats
+ */
+ void setColumnStats(String vdbName, int vdbVersion, Column column, ColumnStats columnStats);
+
+ /**
+ * Get the extension metadata for a given record.
+ * @param vdbName
+ * @param vdbVersion
+ * @param record
+ * @return
+ */
+ LinkedHashMap<String, String> getProperties(String vdbName, int vdbVersion, AbstractMetadataRecord record);
+
+ /**
+ * Set an extension metadata property for a given record.
+ * @param vdbName
+ * @param vdbVersion
+ * @param record
+ * @param name
+ * @param value
+ */
+ void setProperty(String vdbName, int vdbVersion, AbstractMetadataRecord record, String name, String value);
+}
Deleted: tags/teiid-parent-7.4.0.CR1/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml
===================================================================
--- trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- Deployer specific Stuff -->
- <bean name="VDBStructure" class="org.teiid.deployers.VDBStructure" />
-
- <bean name="SystemFunctionManager" class="org.teiid.query.function.SystemFunctionManager">
- <property name="allowEnvFunction">false</property>
- </bean>
-
- <bean name="VDBRepository" class="org.teiid.deployers.VDBRepository">
- <property name="systemFunctionManager"><inject bean="SystemFunctionManager"/></property>
- </bean>
-
- <bean name="SecurityHelper" class="org.teiid.jboss.JBossSecurityHelper"/>
-
- <bean name="JBossLifeCycleListener" class="org.teiid.jboss.JBossLifeCycleListener"/>
-
- <bean name="VDBParserDeployer" class="org.teiid.deployers.VDBParserDeployer">
- <property name="vdbRepository"><inject bean="VDBRepository"/></property>
- <property name="objectSerializer"><inject bean="ObjectSerializer"/></property>
- <property name="managedObjectFactory"><inject bean="ManagedObjectFactory"/></property>
- </bean>
-
- <bean name="VDBMetaDataInstanceClassFactory" class="org.teiid.jboss.deployers.VDBMetaDataInstanceClassFactory">
- <constructor>
- <parameter><inject bean="ManagedObjectFactory"/></parameter>
- </constructor>
- </bean>
-
- <bean name="DynamicVDBDeployer" class="org.teiid.deployers.DynamicVDBDeployer">
- </bean>
-
-
- <bean name="ObjectSerializer" class="org.teiid.deployers.ObjectSerializer">
- <property name="attachmentStoreRoot">${jboss.server.data.dir}/teiid</property>
- </bean>
-
- <bean name="VDBDeployer" class="org.teiid.deployers.VDBDeployer">
- <install bean="ManagedDeploymentCreator" method="addAttachmentType">
- <parameter>
- <value>org.teiid.adminapi.impl.VDBMetaData</value>
- </parameter>
- <parameter>
- <value>teiid-vdb</value>
- </parameter>
- </install>
- <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
- <parameter>
- <value>org.teiid.adminapi.impl.VDBMetaData</value>
- </parameter>
- </uninstall>
- <property name="VDBRepository"><inject bean="VDBRepository"/></property>
- <property name="objectSerializer"><inject bean="ObjectSerializer"/></property>
- <property name="translatorRepository"><inject bean="translatorRepository"/></property>
- <property name="containerLifeCycleListener"><inject bean="JBossLifeCycleListener"/></property>
- <property name="threadPool"><inject bean="jboss.system:service=ThreadPool"/></property>
- <depends>SystemVDBDeployer</depends>
- </bean>
-
- <bean name="SystemVDBDeployer" class="org.teiid.deployers.SystemVDBDeployer">
- <property name="VDBRepository"><inject bean="VDBRepository"/></property>
- </bean>
-
- <bean name="ConnectionFactoryDeployer" class="org.teiid.jboss.deployers.ConnectionFactoryDeployer">
- <property name="VDBStatusChecker"><inject bean="VDBStatusChecker"/></property>
- </bean>
-
- <bean name="translatorRepository" class="org.teiid.dqp.internal.datamgr.TranslatorRepository"/>
-
- <bean name="TranslatorParserDeployer" class="org.teiid.deployers.TranslatorParserDeployer"/>
- <bean name="TranslatorDeployer" class="org.teiid.deployers.TranslatorDeployer">
- <property name="translatorRepository"><inject bean="translatorRepository"/></property>
- <property name="VDBStatusChecker"><inject bean="VDBStatusChecker"/></property>
- </bean>
-
- <bean name="TranslatorAnnotationScanner" class="org.teiid.deployers.TranslatorAnnotationScanningDeployer">
- <property name="translatorRepository"><inject bean="translatorRepository"/></property>
- <property name="VDBStatusChecker"><inject bean="VDBStatusChecker"/></property>
- <property name="managedObjectFactory"><inject bean="ManagedObjectFactory"/></property>
- </bean>
-
- <bean name="VDBStatusChecker" class="org.teiid.deployers.VDBStatusChecker">
- <property name="VDBRepository"><inject bean="VDBRepository"/></property>
- <property name="threadPool"><inject bean="jboss.system:service=ThreadPool"/></property>
- </bean>
-
- <!-- Persistence class for the VDB deployment file -->
- <bean name="VDBMetadataComponentMapper" class="org.teiid.jboss.deployers.VDBMetadataComponentMapper">
- <constructor><parameter><inject bean="PersistenceFactory" /></parameter></constructor>
- </bean>
- <!-- Persistence class for the Translator deployment file -->
- <bean name="TranslatorMetadataGroupComponentMapper" class="org.teiid.jboss.deployers.TranslatorMetadataGroupComponentMapper">
- <constructor><parameter><inject bean="PersistenceFactory" /></parameter></constructor>
- </bean>
-
- <bean name="TranslatorMetadataICF" class="org.teiid.templates.TranslatorMetadataICF">
- <constructor>
- <parameter><inject bean="ManagedObjectFactory"/></parameter>
- </constructor>
- </bean>
-
- <!-- used for the translators -->
- <bean name="TranslatorDeploymentTemplateInfoFactory" class="org.teiid.templates.TranslatorTemplateInfoFactory"/>
-
-</deployment>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml (from rev 3138, trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- Deployer specific Stuff -->
+ <bean name="VDBStructure" class="org.teiid.deployers.VDBStructure" />
+
+ <bean name="SystemFunctionManager" class="org.teiid.query.function.SystemFunctionManager">
+ <property name="allowEnvFunction">false</property>
+ </bean>
+
+ <bean name="VDBRepository" class="org.teiid.deployers.VDBRepository">
+ <property name="systemFunctionManager"><inject bean="SystemFunctionManager"/></property>
+ <!--
+ Optionally set a org.teiid.metadata.MetadataRepository for persistent metadata updates
+ -->
+ <!-- <property name="metadataRepository"><inject bean="MetadataRepository"/></property> -->
+ </bean>
+
+ <bean name="SecurityHelper" class="org.teiid.jboss.JBossSecurityHelper"/>
+
+ <bean name="JBossLifeCycleListener" class="org.teiid.jboss.JBossLifeCycleListener"/>
+
+ <bean name="VDBParserDeployer" class="org.teiid.deployers.VDBParserDeployer">
+ <property name="vdbRepository"><inject bean="VDBRepository"/></property>
+ <property name="objectSerializer"><inject bean="ObjectSerializer"/></property>
+ <property name="managedObjectFactory"><inject bean="ManagedObjectFactory"/></property>
+ </bean>
+
+ <bean name="VDBMetaDataInstanceClassFactory" class="org.teiid.jboss.deployers.VDBMetaDataInstanceClassFactory">
+ <constructor>
+ <parameter><inject bean="ManagedObjectFactory"/></parameter>
+ </constructor>
+ </bean>
+
+ <bean name="DynamicVDBDeployer" class="org.teiid.deployers.DynamicVDBDeployer">
+ </bean>
+
+
+ <bean name="ObjectSerializer" class="org.teiid.deployers.ObjectSerializer">
+ <property name="attachmentStoreRoot">${jboss.server.data.dir}/teiid</property>
+ </bean>
+
+ <bean name="VDBDeployer" class="org.teiid.deployers.VDBDeployer">
+ <install bean="ManagedDeploymentCreator" method="addAttachmentType">
+ <parameter>
+ <value>org.teiid.adminapi.impl.VDBMetaData</value>
+ </parameter>
+ <parameter>
+ <value>teiid-vdb</value>
+ </parameter>
+ </install>
+ <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
+ <parameter>
+ <value>org.teiid.adminapi.impl.VDBMetaData</value>
+ </parameter>
+ </uninstall>
+ <property name="VDBRepository"><inject bean="VDBRepository"/></property>
+ <property name="objectSerializer"><inject bean="ObjectSerializer"/></property>
+ <property name="translatorRepository"><inject bean="translatorRepository"/></property>
+ <property name="containerLifeCycleListener"><inject bean="JBossLifeCycleListener"/></property>
+ <property name="threadPool"><inject bean="jboss.system:service=ThreadPool"/></property>
+ <depends>SystemVDBDeployer</depends>
+ </bean>
+
+ <bean name="SystemVDBDeployer" class="org.teiid.deployers.SystemVDBDeployer">
+ <property name="VDBRepository"><inject bean="VDBRepository"/></property>
+ </bean>
+
+ <bean name="ConnectionFactoryDeployer" class="org.teiid.jboss.deployers.ConnectionFactoryDeployer">
+ <property name="VDBStatusChecker"><inject bean="VDBStatusChecker"/></property>
+ </bean>
+
+ <bean name="translatorRepository" class="org.teiid.dqp.internal.datamgr.TranslatorRepository"/>
+
+ <bean name="TranslatorParserDeployer" class="org.teiid.deployers.TranslatorParserDeployer"/>
+ <bean name="TranslatorDeployer" class="org.teiid.deployers.TranslatorDeployer">
+ <property name="translatorRepository"><inject bean="translatorRepository"/></property>
+ <property name="VDBStatusChecker"><inject bean="VDBStatusChecker"/></property>
+ </bean>
+
+ <bean name="TranslatorAnnotationScanner" class="org.teiid.deployers.TranslatorAnnotationScanningDeployer">
+ <property name="translatorRepository"><inject bean="translatorRepository"/></property>
+ <property name="VDBStatusChecker"><inject bean="VDBStatusChecker"/></property>
+ <property name="managedObjectFactory"><inject bean="ManagedObjectFactory"/></property>
+ </bean>
+
+ <bean name="VDBStatusChecker" class="org.teiid.deployers.VDBStatusChecker">
+ <property name="VDBRepository"><inject bean="VDBRepository"/></property>
+ <property name="threadPool"><inject bean="jboss.system:service=ThreadPool"/></property>
+ </bean>
+
+ <!-- Persistence class for the VDB deployment file -->
+ <bean name="VDBMetadataComponentMapper" class="org.teiid.jboss.deployers.VDBMetadataComponentMapper">
+ <constructor><parameter><inject bean="PersistenceFactory" /></parameter></constructor>
+ </bean>
+ <!-- Persistence class for the Translator deployment file -->
+ <bean name="TranslatorMetadataGroupComponentMapper" class="org.teiid.jboss.deployers.TranslatorMetadataGroupComponentMapper">
+ <constructor><parameter><inject bean="PersistenceFactory" /></parameter></constructor>
+ </bean>
+
+ <bean name="TranslatorMetadataICF" class="org.teiid.templates.TranslatorMetadataICF">
+ <constructor>
+ <parameter><inject bean="ManagedObjectFactory"/></parameter>
+ </constructor>
+ </bean>
+
+ <!-- used for the translators -->
+ <bean name="TranslatorDeploymentTemplateInfoFactory" class="org.teiid.templates.TranslatorTemplateInfoFactory"/>
+
+</deployment>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/build/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,136 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>teiid-parent</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>teiid</artifactId>
- <name>Build</name>
- <description>Teiid Build</description>
- <dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-client-jdk15</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.retrotranslator</groupId>
- <artifactId>retrotranslator-runtime</artifactId>
- <version>1.2.9</version>
- </dependency>
-
- <dependency>
- <groupId>net.sf.retrotranslator</groupId>
- <artifactId>retrotranslator-transformer</artifactId>
- <version>1.2.9</version>
- </dependency>
- </dependencies>
- <build>
- <outputDirectory>target/kits</outputDirectory>
- <resources>
- <resource>
- <directory>kits</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- <include>**/*.sh</include>
- <include>**/*.bat</include>
- <include>**/*.html</include>
- </includes>
- </resource>
- <resource>
- <directory>kits</directory>
- <filtering>false</filtering>
- <excludes>
- <exclude>**/*.xml</exclude>
- <exclude>**/*.properties</exclude>
- <exclude>**/*.sh</exclude>
- <exclude>**/*.bat</exclude>
- <exclude>**/*.html</exclude>
- </excludes>
- </resource>
- </resources>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
-
- <configuration>
- <descriptors>
- <descriptor>assembly/client-jar.xml</descriptor>
- <descriptor>assembly/jboss-container/dist.xml</descriptor>
- <descriptor>assembly/adminshell/adminshell-dist.xml</descriptor>
- </descriptors>
- </configuration>
-
- <executions>
- <execution>
- <id>create-assemblies</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <!--
- This profile is activated manually, as in "mvn ... -P release ..."
- -->
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>assembly/src.xml</descriptor>
- <descriptor>assembly/docs.xml</descriptor>
- <descriptor>assembly/client-jar.xml</descriptor>
- <descriptor>assembly/jboss-container/dist.xml</descriptor>
- <descriptor>assembly/adminshell/adminshell-dist.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.1.1</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>java</goal>
- </goals>
- <configuration>
- <mainClass>net.sf.retrotranslator.transformer.Retrotranslator</mainClass>
- <arguments>
- <argument>-srcjar</argument>
- <argument>${pom.basedir}/target/teiid-${pom.version}-client.jar</argument>
- <argument>-destjar</argument>
- <argument>${pom.basedir}/target/teiid-${pom.version}-client-jdk15.jar</argument>
- <argument>-embed</argument>
- <argument>org.teiid.retroruntime</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/build/pom.xml (from rev 3140, trunk/build/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/build/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/build/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,136 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>teiid-parent</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>teiid</artifactId>
+ <name>Build</name>
+ <description>Teiid Build</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-client-jdk15</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.retrotranslator</groupId>
+ <artifactId>retrotranslator-runtime</artifactId>
+ <version>1.2.9</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.retrotranslator</groupId>
+ <artifactId>retrotranslator-transformer</artifactId>
+ <version>1.2.9</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <outputDirectory>target/kits</outputDirectory>
+ <resources>
+ <resource>
+ <directory>kits</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ <include>**/*.sh</include>
+ <include>**/*.bat</include>
+ <include>**/*.html</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>kits</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>**/*.xml</exclude>
+ <exclude>**/*.properties</exclude>
+ <exclude>**/*.sh</exclude>
+ <exclude>**/*.bat</exclude>
+ <exclude>**/*.html</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+
+ <configuration>
+ <descriptors>
+ <descriptor>assembly/client-jar.xml</descriptor>
+ <descriptor>assembly/jboss-container/dist.xml</descriptor>
+ <descriptor>assembly/adminshell/adminshell-dist.xml</descriptor>
+ </descriptors>
+ </configuration>
+
+ <executions>
+ <execution>
+ <id>create-assemblies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <!--
+ This profile is activated manually, as in "mvn ... -P release ..."
+ -->
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>assembly/src.xml</descriptor>
+ <descriptor>assembly/docs.xml</descriptor>
+ <descriptor>assembly/client-jar.xml</descriptor>
+ <descriptor>assembly/jboss-container/dist.xml</descriptor>
+ <descriptor>assembly/adminshell/adminshell-dist.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.1.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <mainClass>net.sf.retrotranslator.transformer.Retrotranslator</mainClass>
+ <arguments>
+ <argument>-srcjar</argument>
+ <argument>${pom.basedir}/target/teiid-${pom.version}-client.jar</argument>
+ <argument>-destjar</argument>
+ <argument>${pom.basedir}/target/teiid-${pom.version}-client-jdk15.jar</argument>
+ <argument>-embed</argument>
+ <argument>org.teiid.retroruntime</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/cache-jbosscache/pom.xml
===================================================================
--- trunk/cache-jbosscache/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/cache-jbosscache/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>teiid-parent</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>teiid-cache-jbosscache</artifactId>
- <name>JBoss Cache</name>
- <description>JBossCache provider.</description>
- <dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-engine</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/cache-jbosscache/pom.xml (from rev 3140, trunk/cache-jbosscache/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/cache-jbosscache/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/cache-jbosscache/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>teiid-parent</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>teiid-cache-jbosscache</artifactId>
+ <name>JBoss Cache</name>
+ <description>JBossCache provider.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-engine</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/client/pom.xml
===================================================================
--- trunk/client/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/client/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>teiid-parent</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>teiid-client</artifactId>
- <name>Client</name>
- <description>Contains the packages related to communication, administrative api,
- sessioning and transport level messaging.</description>
- <dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/client/pom.xml (from rev 3140, trunk/client/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/client/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/client/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>teiid-parent</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>teiid-client</artifactId>
+ <name>Client</name>
+ <description>Contains the packages related to communication, administrative api,
+ sessioning and transport level messaging.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/client-jdk15/pom.xml
===================================================================
--- trunk/client-jdk15/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/client-jdk15/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>teiid-parent</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>teiid-client-jdk15</artifactId>
- <name>Client JDK15</name>
- <description>Contains the packages related retrotranslator that will convert 1.6 to 1.5</description>
- <dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- </dependency>
- </dependencies>
-</project>
Copied: tags/teiid-parent-7.4.0.CR1/client-jdk15/pom.xml (from rev 3140, trunk/client-jdk15/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/client-jdk15/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/client-jdk15/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>teiid-parent</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>teiid-client-jdk15</artifactId>
+ <name>Client JDK15</name>
+ <description>Contains the packages related retrotranslator that will convert 1.6 to 1.5</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Deleted: tags/teiid-parent-7.4.0.CR1/common-core/pom.xml
===================================================================
--- trunk/common-core/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/common-core/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>teiid-parent</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>teiid-common-core</artifactId>
- <name>Common Core</name>
- <description>Core shared library</description>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-resources</phase>
- <configuration>
- <tasks>
- <tstamp />
- <replace dir="${project.build.outputDirectory}" token="@build-date@" value="${DSTAMP}">
- <include name="**/*.properties" />
- </replace>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- <excludes>
- <exclude>**/*.properties</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/common-core/pom.xml (from rev 3140, trunk/common-core/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/common-core/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/common-core/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>teiid-parent</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>teiid-common-core</artifactId>
+ <name>Common Core</name>
+ <description>Core shared library</description>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <configuration>
+ <tasks>
+ <tstamp />
+ <replace dir="${project.build.outputDirectory}" token="@build-date@" value="${DSTAMP}">
+ <include name="**/*.properties" />
+ </replace>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>**/*.properties</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </build>
+</project>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/connectors/connector-file/pom.xml
===================================================================
--- trunk/connectors/connector-file/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/connectors/connector-file/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>connectors</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>connector-file</artifactId>
- <groupId>org.jboss.teiid.connectors</groupId>
- <name>File Connector</name>
- <packaging>rar</packaging>
- <description>This connector reads data from files.</description>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>build_jar</id>
- <phase>process-classes</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- <execution>
- <id>deploy_jar</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <classifier>lib</classifier>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/connectors/connector-file/pom.xml (from rev 3140, trunk/connectors/connector-file/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/connectors/connector-file/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/connectors/connector-file/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>connectors</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>connector-file</artifactId>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <name>File Connector</name>
+ <packaging>rar</packaging>
+ <description>This connector reads data from files.</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build_jar</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>deploy_jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>lib</classifier>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/connectors/connector-ldap/pom.xml
===================================================================
--- trunk/connectors/connector-ldap/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/connectors/connector-ldap/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,57 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>connectors</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>connector-ldap</artifactId>
- <groupId>org.jboss.teiid.connectors</groupId>
- <name>LDAP Connector</name>
- <description>LDAP Connector</description>
- <packaging>rar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>build_jar</id>
- <phase>process-classes</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- <execution>
- <id>deploy_jar</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <classifier>lib</classifier>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/connectors/connector-ldap/pom.xml (from rev 3140, trunk/connectors/connector-ldap/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/connectors/connector-ldap/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/connectors/connector-ldap/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,57 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>connectors</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>connector-ldap</artifactId>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <name>LDAP Connector</name>
+ <description>LDAP Connector</description>
+ <packaging>rar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build_jar</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>deploy_jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>lib</classifier>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/connectors/connector-salesforce/pom.xml
===================================================================
--- trunk/connectors/connector-salesforce/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/connectors/connector-salesforce/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>connectors</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>connector-salesforce</artifactId>
- <groupId>org.jboss.teiid.connectors</groupId>
- <name>Salesforce Connector</name>
- <packaging>rar</packaging>
- <description>Integrates the query engine with Salesforce.com.</description>
- <dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>salesforce-api</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>translator-salesforce</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>2.2.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <version>2.2.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-security</artifactId>
- <version>2.2.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-policy</artifactId>
- <version>2.2.2</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>build_jar</id>
- <phase>process-classes</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- <execution>
- <id>deploy_jar</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <classifier>lib</classifier>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/connectors/connector-salesforce/pom.xml (from rev 3140, trunk/connectors/connector-salesforce/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/connectors/connector-salesforce/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/connectors/connector-salesforce/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>connectors</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>connector-salesforce</artifactId>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <name>Salesforce Connector</name>
+ <packaging>rar</packaging>
+ <description>Integrates the query engine with Salesforce.com.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <artifactId>salesforce-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <artifactId>translator-salesforce</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>2.2.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>2.2.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ <version>2.2.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-policy</artifactId>
+ <version>2.2.2</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build_jar</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>deploy_jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>lib</classifier>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/connectors/connector-ws/pom.xml
===================================================================
--- trunk/connectors/connector-ws/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/connectors/connector-ws/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>connectors</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>connector-ws</artifactId>
- <groupId>org.jboss.teiid.connectors</groupId>
- <name>Web Service Connector</name>
- <packaging>rar</packaging>
- <description>This connector reads data from Web Services</description>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>2.2.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <version>2.2.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-security</artifactId>
- <version>2.2.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-policy</artifactId>
- <version>2.2.2</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>build_jar</id>
- <phase>process-classes</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- <execution>
- <id>deploy_jar</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <classifier>lib</classifier>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: tags/teiid-parent-7.4.0.CR1/connectors/connector-ws/pom.xml (from rev 3140, trunk/connectors/connector-ws/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/connectors/connector-ws/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/connectors/connector-ws/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>connectors</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>connector-ws</artifactId>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <name>Web Service Connector</name>
+ <packaging>rar</packaging>
+ <description>This connector reads data from Web Services</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>2.2.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>2.2.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ <version>2.2.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-policy</artifactId>
+ <version>2.2.2</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build_jar</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>deploy_jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>lib</classifier>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: tags/teiid-parent-7.4.0.CR1/connectors/pom.xml
===================================================================
--- trunk/connectors/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/connectors/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>teiid-parent</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>connectors</artifactId>
- <packaging>pom</packaging>
- <name>Connectors</name>
- <description>This project is aggregator for all the supported connectors.</description>
- <dependencies>
-
- <!-- Internal Test Dependencies -->
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-engine</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-client</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-engine</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-metadata</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-metadata</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <!-- External dependencies -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <modules>
- <module>translator-jdbc</module>
- <module>translator-ldap</module>
- <module>translator-loopback</module>
- <module>translator-file</module>
- <module>translator-salesforce</module>
- <module>connector-file</module>
- <module>connector-salesforce</module>
- <module>connector-ldap</module>
- <module>salesforce-api</module>
- <module>connector-ws</module>
- <module>sandbox</module>
- <module>translator-ws</module>
- <module>translator-olap</module>
- </modules>
-</project>
Copied: tags/teiid-parent-7.4.0.CR1/connectors/pom.xml (from rev 3140, trunk/connectors/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/connectors/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/connectors/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>teiid-parent</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>connectors</artifactId>
+ <packaging>pom</packaging>
+ <name>Connectors</name>
+ <description>This project is aggregator for all the supported connectors.</description>
+ <dependencies>
+
+ <!-- Internal Test Dependencies -->
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-engine</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-metadata</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-metadata</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- External dependencies -->
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <modules>
+ <module>translator-jdbc</module>
+ <module>translator-ldap</module>
+ <module>translator-loopback</module>
+ <module>translator-file</module>
+ <module>translator-salesforce</module>
+ <module>connector-file</module>
+ <module>connector-salesforce</module>
+ <module>connector-ldap</module>
+ <module>salesforce-api</module>
+ <module>connector-ws</module>
+ <module>sandbox</module>
+ <module>translator-ws</module>
+ <module>translator-olap</module>
+ </modules>
+</project>
Deleted: tags/teiid-parent-7.4.0.CR1/connectors/salesforce-api/pom.xml
===================================================================
--- trunk/connectors/salesforce-api/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/connectors/salesforce-api/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,14 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>connectors</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>salesforce-api</artifactId>
- <groupId>org.jboss.teiid.connectors</groupId>
- <name>Salesforce API</name>
- <description>The java API for the Salesforce.com partner web service API</description>
- <dependencies>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/connectors/salesforce-api/pom.xml (from rev 3140, trunk/connectors/salesforce-api/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/connectors/salesforce-api/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/connectors/salesforce-api/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,14 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>connectors</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>salesforce-api</artifactId>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <name>Salesforce API</name>
+ <description>The java API for the Salesforce.com partner web service API</description>
+ <dependencies>
+ </dependencies>
+</project>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/connectors/sandbox/pom.xml
===================================================================
--- trunk/connectors/sandbox/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/connectors/sandbox/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>connectors</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>sandbox</artifactId>
- <packaging>pom</packaging>
- <name>Sandbox</name>
- <description>Experimental connectors in progress</description>
- <modules>
- <module>translator-yahoo</module>
- </modules>
-</project>
Copied: tags/teiid-parent-7.4.0.CR1/connectors/sandbox/pom.xml (from rev 3140, trunk/connectors/sandbox/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/connectors/sandbox/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/connectors/sandbox/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>connectors</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <artifactId>sandbox</artifactId>
+ <packaging>pom</packaging>
+ <name>Sandbox</name>
+ <description>Experimental connectors in progress</description>
+ <modules>
+ <module>translator-yahoo</module>
+ </modules>
+</project>
Deleted: tags/teiid-parent-7.4.0.CR1/connectors/sandbox/translator-yahoo/pom.xml
===================================================================
--- trunk/connectors/sandbox/translator-yahoo/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/connectors/sandbox/translator-yahoo/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>sandbox</artifactId>
- <groupId>org.jboss.teiid.connectors</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>translator-yahoo</artifactId>
- <groupId>org.jboss.teiid.connectors.sandbox</groupId>
- <name>Yahoo Translator</name>
- <description>Test translator used to query ticker symbols from Yahoo website</description>
- <dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <outputDirectory>target/classes</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- <excludes>
- <exclude>**/*.xml</exclude>
- <exclude>**/*.properties</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
-</project>
Copied: tags/teiid-parent-7.4.0.CR1/connectors/sandbox/translator-yahoo/pom.xml (from rev 3140, trunk/connectors/sandbox/translator-yahoo/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/connectors/sandbox/translator-yahoo/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/connectors/sandbox/translator-yahoo/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>sandbox</artifactId>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>translator-yahoo</artifactId>
+ <groupId>org.jboss.teiid.connectors.sandbox</groupId>
+ <name>Yahoo Translator</name>
+ <description>Test translator used to query ticker symbols from Yahoo website</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <outputDirectory>target/classes</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>**/*.xml</exclude>
+ <exclude>**/*.properties</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </build>
+</project>
Deleted: tags/teiid-parent-7.4.0.CR1/connectors/translator-file/pom.xml
===================================================================
--- trunk/connectors/translator-file/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/connectors/translator-file/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>connectors</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>translator-file</artifactId>
- <groupId>org.jboss.teiid.connectors</groupId>
- <name>File Translator</name>
- <description>This translator provides access to the file system.</description>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <outputDirectory>target/classes</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- <excludes>
- <exclude>**/*.xml</exclude>
- <exclude>**/*.properties</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
-</project>
Copied: tags/teiid-parent-7.4.0.CR1/connectors/translator-file/pom.xml (from rev 3140, trunk/connectors/translator-file/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/connectors/translator-file/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/connectors/translator-file/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>connectors</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>translator-file</artifactId>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <name>File Translator</name>
+ <description>This translator provides access to the file system.</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <outputDirectory>target/classes</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>**/*.xml</exclude>
+ <exclude>**/*.properties</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </build>
+</project>
Deleted: tags/teiid-parent-7.4.0.CR1/connectors/translator-jdbc/pom.xml
===================================================================
--- trunk/connectors/translator-jdbc/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/connectors/translator-jdbc/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>connectors</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>translator-jdbc</artifactId>
- <groupId>org.jboss.teiid.connectors</groupId>
- <name>JDBC Translator</name>
-
- <description>This project contains translators for a JDBC source. Currently this is an aggregator for all the JDBC translators relational databases.</description>
- <dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <outputDirectory>target/classes</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- <excludes>
- <exclude>**/*.xml</exclude>
- <exclude>**/*.properties</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
-
-</project>
Copied: tags/teiid-parent-7.4.0.CR1/connectors/translator-jdbc/pom.xml (from rev 3140, trunk/connectors/translator-jdbc/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/connectors/translator-jdbc/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/connectors/translator-jdbc/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>connectors</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>translator-jdbc</artifactId>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <name>JDBC Translator</name>
+
+ <description>This project contains translators for a JDBC source. Currently this is an aggregator for all the JDBC translators relational databases.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <outputDirectory>target/classes</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>**/*.xml</exclude>
+ <exclude>**/*.properties</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </build>
+
+</project>
Deleted: tags/teiid-parent-7.4.0.CR1/connectors/translator-ldap/pom.xml
===================================================================
--- trunk/connectors/translator-ldap/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/connectors/translator-ldap/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,52 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>connectors</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>translator-ldap</artifactId>
- <groupId>org.jboss.teiid.connectors</groupId>
- <name>LDAP Translator</name>
- <description>LDAP Translator</description>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <outputDirectory>target/classes</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- <excludes>
- <exclude>**/*.xml</exclude>
- <exclude>**/*.properties</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
-</project>
Copied: tags/teiid-parent-7.4.0.CR1/connectors/translator-ldap/pom.xml (from rev 3140, trunk/connectors/translator-ldap/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/connectors/translator-ldap/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/connectors/translator-ldap/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,52 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>connectors</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>translator-ldap</artifactId>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <name>LDAP Translator</name>
+ <description>LDAP Translator</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <outputDirectory>target/classes</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>**/*.xml</exclude>
+ <exclude>**/*.properties</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </build>
+</project>
Deleted: tags/teiid-parent-7.4.0.CR1/connectors/translator-loopback/pom.xml
===================================================================
--- trunk/connectors/translator-loopback/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/connectors/translator-loopback/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>connectors</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>translator-loopback</artifactId>
- <groupId>org.jboss.teiid.connectors</groupId>
- <name>Loopback Translator</name>
- <description>Loopback Translator</description>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <outputDirectory>target/classes</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- <excludes>
- <exclude>**/*.xml</exclude>
- <exclude>**/*.properties</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
-</project>
Copied: tags/teiid-parent-7.4.0.CR1/connectors/translator-loopback/pom.xml (from rev 3140, trunk/connectors/translator-loopback/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/connectors/translator-loopback/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/connectors/translator-loopback/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>connectors</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>translator-loopback</artifactId>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <name>Loopback Translator</name>
+ <description>Loopback Translator</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <outputDirectory>target/classes</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>**/*.xml</exclude>
+ <exclude>**/*.properties</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </build>
+</project>
Deleted: tags/teiid-parent-7.4.0.CR1/connectors/translator-olap/pom.xml
===================================================================
--- trunk/connectors/translator-olap/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/connectors/translator-olap/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>connectors</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>translator-olap</artifactId>
- <groupId>org.jboss.teiid.connectors</groupId>
- <name>OLAP Translator</name>
- <description>This translator provides access to Query Analysis Cubes</description>
- <dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.olap4j</groupId>
- <artifactId>olap4j</artifactId>
- <version>0.9.8.343</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <outputDirectory>target/classes</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- <excludes>
- <exclude>**/*.xml</exclude>
- <exclude>**/*.properties</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
-
-</project>
Copied: tags/teiid-parent-7.4.0.CR1/connectors/translator-olap/pom.xml (from rev 3140, trunk/connectors/translator-olap/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/connectors/translator-olap/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/connectors/translator-olap/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>connectors</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>translator-olap</artifactId>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <name>OLAP Translator</name>
+ <description>This translator provides access to Query Analysis Cubes</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.olap4j</groupId>
+ <artifactId>olap4j</artifactId>
+ <version>0.9.8.343</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <outputDirectory>target/classes</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>**/*.xml</exclude>
+ <exclude>**/*.properties</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </build>
+
+</project>
Deleted: tags/teiid-parent-7.4.0.CR1/connectors/translator-salesforce/pom.xml
===================================================================
--- trunk/connectors/translator-salesforce/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/connectors/translator-salesforce/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>connectors</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>translator-salesforce</artifactId>
- <groupId>org.jboss.teiid.connectors</groupId>
- <name>Salesforce Translator</name>
- <description>Integrates the query engine with Salesforce.com.</description>
- <dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>salesforce-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <outputDirectory>target/classes</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- <excludes>
- <exclude>**/*.xml</exclude>
- <exclude>**/*.properties</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
-</project>
Copied: tags/teiid-parent-7.4.0.CR1/connectors/translator-salesforce/pom.xml (from rev 3140, trunk/connectors/translator-salesforce/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/connectors/translator-salesforce/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/connectors/translator-salesforce/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>connectors</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>translator-salesforce</artifactId>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <name>Salesforce Translator</name>
+ <description>Integrates the query engine with Salesforce.com.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <artifactId>salesforce-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <outputDirectory>target/classes</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>**/*.xml</exclude>
+ <exclude>**/*.properties</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </build>
+</project>
Deleted: tags/teiid-parent-7.4.0.CR1/connectors/translator-ws/pom.xml
===================================================================
--- trunk/connectors/translator-ws/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/connectors/translator-ws/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>connectors</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>translator-ws</artifactId>
- <groupId>org.jboss.teiid.connectors</groupId>
- <name>Web service Translator</name>
- <description>This translator provides access to Web Services.</description>
- <dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <outputDirectory>target/classes</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- <excludes>
- <exclude>**/*.xml</exclude>
- <exclude>**/*.properties</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
-
-</project>
Copied: tags/teiid-parent-7.4.0.CR1/connectors/translator-ws/pom.xml (from rev 3140, trunk/connectors/translator-ws/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/connectors/translator-ws/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/connectors/translator-ws/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>connectors</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>translator-ws</artifactId>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <name>Web service Translator</name>
+ <description>This translator provides access to Web Services.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <outputDirectory>target/classes</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>**/*.xml</exclude>
+ <exclude>**/*.properties</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </build>
+
+</project>
Deleted: tags/teiid-parent-7.4.0.CR1/console/pom.xml
===================================================================
--- trunk/console/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/console/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,175 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>teiid-parent</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>teiid-console</artifactId>
- <name>Console</name>
- <description>This project is for the RHQ plugin that supports the TEIID Console </description>
-
- <properties>
- <!--
- <org.jboss.jopr.as4.version>1.2.0.GA</org.jboss.jopr.as4.version>
- -->
- <org.jboss.jopr.as5.version>1.2.0.GA</org.jboss.jopr.as5.version>
- <jopr.jboss.as5.plugin.version>1.4.0.B01</jopr.jboss.as5.plugin.version>
- <org.rhq.version>1.3.0.GA</org.rhq.version>
- <apache.ant.version>1.7.0</apache.ant.version>
- <teiid.version>${project.version}</teiid.version>
-
-
- </properties>
-
- <dependencies>
- <!--
- Below are the core modules that are required dependencies of all
- plugins
- -->
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-domain</artifactId>
- <version>${org.rhq.version}</version>
- <scope>provided</scope>
- <!--
- provided by the agent/plugin-container
- -->
- </dependency>
-
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-plugin-api</artifactId>
- <version>${org.rhq.version}</version>
- <scope>provided</scope> <!-- provided by the agent/plugin-container -->
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-native-system</artifactId>
- <version>${org.rhq.version}</version>
- <scope>provided</scope> <!-- provided by the agent/plugin-container -->
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-jmx-plugin</artifactId>
- <version>${org.rhq.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-util</artifactId>
- <version>${org.rhq.version}</version>
- </dependency>
-
- <dependency>
- <groupId>mc4j</groupId>
- <artifactId>org-mc4j-ems</artifactId>
- <version>1.2.6</version>
- </dependency>
-
- <!--
- TODO: This is a fix for the Javac bug requiring annotations to be
- available when compiling dependent classes. It is fixed in JDK 6.
- -->
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope> <!-- provided by the agent/plugin-container -->
- </dependency>
-
-
- <!--
- TODO: This is a fix for the Javac bug requiring annotations to be
- available when compiling dependent classes; it is fixed in JDK 6.
- -->
- <dependency>
- <groupId>jboss.jboss-embeddable-ejb3</groupId>
- <artifactId>hibernate-all</artifactId>
- <version>1.0.0.Alpha9</version>
- <scope>provided</scope> <!-- provided by the agent/plugin-container -->
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-client</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-client</artifactId>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.jopr</groupId>
- <artifactId>jopr-embedded-jbas5</artifactId>
- <type>war</type>
- <version>${org.jboss.jopr.as5.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.integration</groupId>
- <artifactId>jboss-profileservice-spi</artifactId>
- <version>5.1.0.CR2</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.on</groupId>
- <artifactId>jopr-jboss-as-5-plugin</artifactId>
- <version>${jopr.jboss.as5.plugin.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3.2</version>
- </dependency>
-
-
- </dependencies>
-
-
-
- <build>
- <outputDirectory>target/classes</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </resources>
- </build>
-
-
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/console/pom.xml (from rev 3140, trunk/console/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/console/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/console/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,175 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>teiid-parent</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>teiid-console</artifactId>
+ <name>Console</name>
+ <description>This project is for the RHQ plugin that supports the TEIID Console </description>
+
+ <properties>
+ <!--
+ <org.jboss.jopr.as4.version>1.2.0.GA</org.jboss.jopr.as4.version>
+ -->
+ <org.jboss.jopr.as5.version>1.2.0.GA</org.jboss.jopr.as5.version>
+ <jopr.jboss.as5.plugin.version>1.4.0.B01</jopr.jboss.as5.plugin.version>
+ <org.rhq.version>1.3.0.GA</org.rhq.version>
+ <apache.ant.version>1.7.0</apache.ant.version>
+ <teiid.version>${project.version}</teiid.version>
+
+
+ </properties>
+
+ <dependencies>
+ <!--
+ Below are the core modules that are required dependencies of all
+ plugins
+ -->
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-domain</artifactId>
+ <version>${org.rhq.version}</version>
+ <scope>provided</scope>
+ <!--
+ provided by the agent/plugin-container
+ -->
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-plugin-api</artifactId>
+ <version>${org.rhq.version}</version>
+ <scope>provided</scope> <!-- provided by the agent/plugin-container -->
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-native-system</artifactId>
+ <version>${org.rhq.version}</version>
+ <scope>provided</scope> <!-- provided by the agent/plugin-container -->
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-jmx-plugin</artifactId>
+ <version>${org.rhq.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-util</artifactId>
+ <version>${org.rhq.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>mc4j</groupId>
+ <artifactId>org-mc4j-ems</artifactId>
+ <version>1.2.6</version>
+ </dependency>
+
+ <!--
+ TODO: This is a fix for the Javac bug requiring annotations to be
+ available when compiling dependent classes. It is fixed in JDK 6.
+ -->
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope> <!-- provided by the agent/plugin-container -->
+ </dependency>
+
+
+ <!--
+ TODO: This is a fix for the Javac bug requiring annotations to be
+ available when compiling dependent classes; it is fixed in JDK 6.
+ -->
+ <dependency>
+ <groupId>jboss.jboss-embeddable-ejb3</groupId>
+ <artifactId>hibernate-all</artifactId>
+ <version>1.0.0.Alpha9</version>
+ <scope>provided</scope> <!-- provided by the agent/plugin-container -->
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-client</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-client</artifactId>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jopr</groupId>
+ <artifactId>jopr-embedded-jbas5</artifactId>
+ <type>war</type>
+ <version>${org.jboss.jopr.as5.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-profileservice-spi</artifactId>
+ <version>5.1.0.CR2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.on</groupId>
+ <artifactId>jopr-jboss-as-5-plugin</artifactId>
+ <version>${jopr.jboss.as5.plugin.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+
+
+ </dependencies>
+
+
+
+ <build>
+ <outputDirectory>target/classes</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+
+</project>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/documentation/admin-guide/pom.xml
===================================================================
--- trunk/documentation/admin-guide/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/documentation/admin-guide/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,77 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>documentation</artifactId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>admin-guide</artifactId>
- <groupId>org.jboss.teiid.documentation</groupId>
- <packaging>jdocbook</packaging>
- <name>Admin Guide</name>
- <description>The Teiid Admin manual</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.1.2</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>net.sf.docbook</groupId>
- <artifactId>docbook</artifactId>
- <version>1.74.0</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0</version>
- <type>jdocbook-style</type>
- </dependency>
- </dependencies>
- <configuration>
- <sourceDocumentName>admin_guide.xml</sourceDocumentName>
- <imageResource>
- <directory>${basedir}/src/main/docbook/en-US</directory>
- <excludes>
- <exclude>*.xml</exclude>
- <exclude>**/*.xml</exclude>
- <exclude>*.zargo</exclude>
- <exclude>**/*.zargo</exclude>
- </excludes>
- </imageResource>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
- <finalName>teiid_admin_guide.pdf</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <xmlTransformerType>saxon</xmlTransformerType>
- <docbookVersion>1.72.0</docbookVersion>
- <localeSeparator>-</localeSeparator>
- <useRelativeImageUris>false</useRelativeImageUris>
- </options>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: tags/teiid-parent-7.4.0.CR1/documentation/admin-guide/pom.xml (from rev 3140, trunk/documentation/admin-guide/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/documentation/admin-guide/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/documentation/admin-guide/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,77 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>documentation</artifactId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>admin-guide</artifactId>
+ <groupId>org.jboss.teiid.documentation</groupId>
+ <packaging>jdocbook</packaging>
+ <name>Admin Guide</name>
+ <description>The Teiid Admin manual</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.2</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.docbook</groupId>
+ <artifactId>docbook</artifactId>
+ <version>1.74.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-docbook-xslt</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>admin_guide.xml</sourceDocumentName>
+ <imageResource>
+ <directory>${basedir}/src/main/docbook/en-US</directory>
+ <excludes>
+ <exclude>*.xml</exclude>
+ <exclude>**/*.xml</exclude>
+ <exclude>*.zargo</exclude>
+ <exclude>**/*.zargo</exclude>
+ </excludes>
+ </imageResource>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>teiid_admin_guide.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <docbookVersion>1.72.0</docbookVersion>
+ <localeSeparator>-</localeSeparator>
+ <useRelativeImageUris>false</useRelativeImageUris>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: tags/teiid-parent-7.4.0.CR1/documentation/caching-guide/pom.xml
===================================================================
--- trunk/documentation/caching-guide/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/documentation/caching-guide/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,77 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>documentation</artifactId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>caching-guide</artifactId>
- <groupId>org.jboss.teiid.documentation</groupId>
- <packaging>jdocbook</packaging>
- <name>Teiid Caching Guide</name>
- <description>The Teiid Caching Guide</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.1.2</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>net.sf.docbook</groupId>
- <artifactId>docbook</artifactId>
- <version>1.74.0</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0</version>
- <type>jdocbook-style</type>
- </dependency>
- </dependencies>
- <configuration>
- <sourceDocumentName>main.xml</sourceDocumentName>
- <imageResource>
- <directory>${basedir}/src/main/docbook/en-US</directory>
- <excludes>
- <exclude>*.xml</exclude>
- <exclude>**/*.xml</exclude>
- <exclude>*.zargo</exclude>
- <exclude>**/*.zargo</exclude>
- </excludes>
- </imageResource>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
- <finalName>teiid_caching_guide.pdf</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <xmlTransformerType>saxon</xmlTransformerType>
- <docbookVersion>1.72.0</docbookVersion>
- <localeSeparator>-</localeSeparator>
- <useRelativeImageUris>false</useRelativeImageUris>
- </options>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/documentation/caching-guide/pom.xml (from rev 3140, trunk/documentation/caching-guide/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/documentation/caching-guide/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/documentation/caching-guide/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,77 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>documentation</artifactId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>caching-guide</artifactId>
+ <groupId>org.jboss.teiid.documentation</groupId>
+ <packaging>jdocbook</packaging>
+ <name>Teiid Caching Guide</name>
+ <description>The Teiid Caching Guide</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.2</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.docbook</groupId>
+ <artifactId>docbook</artifactId>
+ <version>1.74.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-docbook-xslt</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>main.xml</sourceDocumentName>
+ <imageResource>
+ <directory>${basedir}/src/main/docbook/en-US</directory>
+ <excludes>
+ <exclude>*.xml</exclude>
+ <exclude>**/*.xml</exclude>
+ <exclude>*.zargo</exclude>
+ <exclude>**/*.zargo</exclude>
+ </excludes>
+ </imageResource>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>teiid_caching_guide.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <docbookVersion>1.72.0</docbookVersion>
+ <localeSeparator>-</localeSeparator>
+ <useRelativeImageUris>false</useRelativeImageUris>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/documentation/caching-guide/src/main/docbook/en-US/content/results.xml
===================================================================
--- trunk/documentation/caching-guide/src/main/docbook/en-US/content/results.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/documentation/caching-guide/src/main/docbook/en-US/content/results.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,135 +0,0 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % CustomDTD SYSTEM "../../../../../../docbook/custom.dtd">
-%CustomDTD;
-]>
-<chapter id="results">
- <title>Results Caching</title>
- <para>Teiid provides the capability to cache the results of
- specific user queries and virtual procedure calls. This caching technique
- can yield significant performance gains if users of the system submit
- the same queries or execute the same procedures often.</para>
- <section>
- <title>Support Summary</title>
- <itemizedlist>
- <listitem>
- <para>Caching of user query results including XML document model results.</para>
- </listitem>
- <listitem>
- <para>Caching of virtual procedure results.</para>
- </listitem>
- <listitem>
- <para>Scoping of results is automatically determined to be VDB/user (replicated) or session level.</para>
- </listitem>
- <listitem>
- <para>Configurable number of cache entries and time to live.</para>
- </listitem>
- <listitem>
- <para>Administrative clearing.</para>
- </listitem>
- </itemizedlist>
- </section>
- <section>
- <title>User Interaction</title>
- <section>
- <title>User Query Cache</title>
- <para>User query result set caching will cache result sets based on an exact match
- of the incoming SQL string and PreparedStatement parameter values if present. Caching only applies to SELECT, set query, and stored procedure execution
- statements; it does not apply to SELECT INTO statements, or INSERT,
- UPDATE, or DELETE statements.</para>
- <para>End users or client applications explicitly state whether to use
- result set caching. This can be done by setting the
- JDBC ResultSetCacheMode execution property to true (default false) or by adding a <link linkend="cache-hint">cache hint</link> to the query.
- Note that if either of these mechanisms are used, Teiid must also have result set caching enabled (the default is enabled).</para>
- <para>The most basic form of the cache hint, <code>/*+ cache */</code>, is sufficient to inform the engine that the results of the non-update command should be cached.</para>
- <example>
- <title>PreparedStatement ResultSet Caching</title>
- <programlisting>...
-PreparedStatement ps = connection.prepareStatement("/*+ cache */ select col from t where col2 = ?");
-ps.setInt(1, 5);
-ps.execute();
-...</programlisting>
- <para>The results will be cached with the default ttl and use the SQL string and the parameter value as part of the cache key.</para>
- </example>
- <para>The pref_mem and ttl options of the cache hint may also be used for result set cache queries.
- If a cache hint is not specified, then the default time to live of the result set caching configuration will be used.
- </para>
- <example>
- <title>Advanced ResultSet Caching</title>
- <programlisting>/*+ cache(pref_mem ttl:60000 */ select col from t</programlisting>
- <para>In this example the memory preference has been enabled and the time to live is set to 60000 milliseconds or 1 minute.
- The ttl for an entry is actually treated as it's maximum age and the entry may be purged sooner if the maximum number of cache entries has been reached.</para>
- </example>
- <note><para>Each query is re-checked for authorization using the current user’s permissions,
- regardless of whether or not the results have been cached.</para></note>
- </section>
- <section>
- <title>Procedure Result Cache</title>
- <para>Similar to materialized views, cached virtual procedure results are used automatically when a matching set of parameter values is detected for the same procedure execution.
- Usage of the cached results may be bypassed with an <code>OPTION NOCACHE</code> clause. See the <link linkend="nocache">OPTION NOCACHE</link> section for more on its usage.</para>
- </section>
- </section>
- <section>
- <title>Cached Virtual Procedure Definition</title>
- <para>To indicate that a virtual procedure (only definable by Teiid Designer) should be cached, it's definition should include a <link linkend="cache-hint">cache hint</link>.
- <example>
- <title>Procedure Caching</title>
- <programlisting>/*+ cache */ CREATE VIRTUAL PROCEDURE
-BEGIN
- ...
-END</programlisting>
- <para>Results will be cached with the default ttl.</para>
- </example>
- The pref_mem and ttl options of the cache hint may also be used for procedure caching.
- </para>
- <para>Procedure results cache keys include the input parameter values.
- To prevent one procedure from filling the cache, at most 256 cache keys may be created per procedure per VDB.</para>
- <para>A cached procedure will always produce all of its results prior to allowing those results to be consumed and placed in the cache.
- This differs from normal procedure execution which in some situations allows the returned results to be consumed in a streaming manner.</para>
- </section>
- <section>
- <title>Cache Configuration</title>
- <para>By default result set caching is enabled with 1024 maximum entries with a maximum entry age of 2 hours.
- There are actually 2 caches configured with these settings. One cache holds results that are specific to sessions and is local to each Teiid instance.
- The other cache holds VDB scoped results and can be replicated.
- See the &jboss-beans; config file or the Console's "Runtime Engine Properties" for tuning the configuration.
- The user may also override the default maximum entry age via the <link linkend="cache-hint">cache hint</link>.
- </para>
- <para>Result set caching is not limited to memory. There is no explicit limit on the size of the results that can be cached.
- Cached results are primarily stored in the BufferManager and are subject to it's configuration - including the restriction of maximum buffer space.
- </para>
- <note><para>While the result data is not held in memory, cache keys - including parameter values - may be held in memory.
- Thus the cache should not be given an unlimited maximum size.</para></note>
- </section>
- <section>
- <title>Cache Administration</title>
- <para>The result set cache can be cleared through the AdminAPI using the <code>clearCache</code> method.
- The expected cache key is "QUERY_SERVICE_RESULT_SET_CACHE".</para>
- <example>
- <title>Clearing the ResultSet Cache in AdminShell</title>
- <programlisting>connectAsAdmin()
-clearCache("QUERY_SERVICE_RESULT_SET_CACHE")
-...</programlisting>
- </example>
- <para>See the Admin Guide for more on using the AdminAPI and AdminShell.</para>
- </section>
- <section>
- <title>Limitations</title>
- <itemizedlist>
- <listitem>
- <para>XML, BLOB, CLOB, and OBJECT type cannot be used as part of the cache key for prepared statement of procedure cache keys.</para>
- </listitem>
- <listitem>
- <para>The exact SQL string, including the cache hint if present, must match the cached entry for the results to be reused.
- This allows cache usage to skip parsing and resolving for faster responses.</para>
- </listitem>
- <listitem>
- <para>Result set caching is not transactional. Transactions depend on (and
- enforce) consistency of data, and cached data is not guaranteed
- to be consistent with the data store’s data.</para>
- </listitem>
- <listitem>
- <para>Clearing the results cache clears all cache entries for all VDBs.</para>
- </listitem>
- </itemizedlist>
- </section>
-</chapter>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/documentation/caching-guide/src/main/docbook/en-US/content/results.xml (from rev 3138, trunk/documentation/caching-guide/src/main/docbook/en-US/content/results.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/documentation/caching-guide/src/main/docbook/en-US/content/results.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/documentation/caching-guide/src/main/docbook/en-US/content/results.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,137 @@
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % CustomDTD SYSTEM "../../../../../../docbook/custom.dtd">
+%CustomDTD;
+]>
+<chapter id="results">
+ <title>Results Caching</title>
+ <para>Teiid provides the capability to cache the results of
+ specific user queries and virtual procedure calls. This caching technique
+ can yield significant performance gains if users of the system submit
+ the same queries or execute the same procedures often.</para>
+ <section>
+ <title>Support Summary</title>
+ <itemizedlist>
+ <listitem>
+ <para>Caching of user query results including XML document model results.</para>
+ </listitem>
+ <listitem>
+ <para>Caching of virtual procedure results.</para>
+ </listitem>
+ <listitem>
+ <para>Scoping of results is automatically determined to be VDB/user (replicated) or session level.</para>
+ </listitem>
+ <listitem>
+ <para>Configurable number of cache entries and time to live.</para>
+ </listitem>
+ <listitem>
+ <para>Administrative clearing.</para>
+ </listitem>
+ </itemizedlist>
+ </section>
+ <section>
+ <title>User Interaction</title>
+ <section>
+ <title>User Query Cache</title>
+ <para>User query result set caching will cache result sets based on an exact match
+ of the incoming SQL string and PreparedStatement parameter values if present. Caching only applies to SELECT, set query, and stored procedure execution
+ statements; it does not apply to SELECT INTO statements, or INSERT,
+ UPDATE, or DELETE statements.</para>
+ <para>End users or client applications explicitly state whether to use
+ result set caching. This can be done by setting the
+ JDBC ResultSetCacheMode execution property to true (default false) or by adding a <link linkend="cache-hint">cache hint</link> to the query.
+ Note that if either of these mechanisms are used, Teiid must also have result set caching enabled (the default is enabled).</para>
+ <para>The most basic form of the cache hint, <code>/*+ cache */</code>, is sufficient to inform the engine that the results of the non-update command should be cached.</para>
+ <example>
+ <title>PreparedStatement ResultSet Caching</title>
+ <programlisting>...
+PreparedStatement ps = connection.prepareStatement("/*+ cache */ select col from t where col2 = ?");
+ps.setInt(1, 5);
+ps.execute();
+...</programlisting>
+ <para>The results will be cached with the default ttl and use the SQL string and the parameter value as part of the cache key.</para>
+ </example>
+ <para>The pref_mem and ttl options of the cache hint may also be used for result set cache queries.
+ If a cache hint is not specified, then the default time to live of the result set caching configuration will be used.
+ </para>
+ <example>
+ <title>Advanced ResultSet Caching</title>
+ <programlisting>/*+ cache(pref_mem ttl:60000 */ select col from t</programlisting>
+ <para>In this example the memory preference has been enabled and the time to live is set to 60000 milliseconds or 1 minute.
+ The ttl for an entry is actually treated as it's maximum age and the entry may be purged sooner if the maximum number of cache entries has been reached.</para>
+ </example>
+ <note><para>Each query is re-checked for authorization using the current user’s permissions,
+ regardless of whether or not the results have been cached.</para></note>
+ </section>
+ <section>
+ <title>Procedure Result Cache</title>
+ <para>Similar to materialized views, cached virtual procedure results are used automatically when a matching set of parameter values is detected for the same procedure execution.
+ Usage of the cached results may be bypassed with an <code>OPTION NOCACHE</code> clause. See the <link linkend="nocache">OPTION NOCACHE</link> section for more on its usage.</para>
+ </section>
+ </section>
+ <section>
+ <title>Cached Virtual Procedure Definition</title>
+ <para>To indicate that a virtual procedure (only definable by Teiid Designer) should be cached, it's definition should include a <link linkend="cache-hint">cache hint</link>.
+ <example>
+ <title>Procedure Caching</title>
+ <programlisting>/*+ cache */ CREATE VIRTUAL PROCEDURE
+BEGIN
+ ...
+END</programlisting>
+ <para>Results will be cached with the default ttl.</para>
+ </example>
+ The pref_mem and ttl options of the cache hint may also be used for procedure caching.
+ </para>
+ <para>Procedure results cache keys include the input parameter values.
+ To prevent one procedure from filling the cache, at most 256 cache keys may be created per procedure per VDB.</para>
+ <para>A cached procedure will always produce all of its results prior to allowing those results to be consumed and placed in the cache.
+ This differs from normal procedure execution which in some situations allows the returned results to be consumed in a streaming manner.</para>
+ </section>
+ <section>
+ <title>Cache Configuration</title>
+ <para>By default result set caching is enabled with 1024 maximum entries with a maximum entry age of 2 hours.
+ There are actually 2 caches configured with these settings. One cache holds results that are specific to sessions and is local to each Teiid instance.
+ The other cache holds VDB scoped results and can be replicated.
+ See the &jboss-beans; config file or the Console's "Runtime Engine Properties" for tuning the configuration.
+ The user may also override the default maximum entry age via the <link linkend="cache-hint">cache hint</link>.
+ </para>
+ <para>Result set caching is not limited to memory. There is no explicit limit on the size of the results that can be cached.
+ Cached results are primarily stored in the BufferManager and are subject to it's configuration - including the restriction of maximum buffer space.
+ </para>
+ <note><para>While the result data is not held in memory, cache keys - including parameter values - may be held in memory.
+ Thus the cache should not be given an unlimited maximum size.</para></note>
+ <para>Result set cache entries can be invalidated by data change events. The maxStaleness setting determines how long an entry will remain
+ in the case after one of the tables that contributed to the results has been changed. See the Developers Guide for further customization.</para>
+ </section>
+ <section>
+ <title>Cache Administration</title>
+ <para>The result set cache can be cleared through the AdminAPI using the <code>clearCache</code> method.
+ The expected cache key is "QUERY_SERVICE_RESULT_SET_CACHE".</para>
+ <example>
+ <title>Clearing the ResultSet Cache in AdminShell</title>
+ <programlisting>connectAsAdmin()
+clearCache("QUERY_SERVICE_RESULT_SET_CACHE")
+...</programlisting>
+ </example>
+ <para>See the Admin Guide for more on using the AdminAPI and AdminShell.</para>
+ </section>
+ <section>
+ <title>Limitations</title>
+ <itemizedlist>
+ <listitem>
+ <para>XML, BLOB, CLOB, and OBJECT type cannot be used as part of the cache key for prepared statement of procedure cache keys.</para>
+ </listitem>
+ <listitem>
+ <para>The exact SQL string, including the cache hint if present, must match the cached entry for the results to be reused.
+ This allows cache usage to skip parsing and resolving for faster responses.</para>
+ </listitem>
+ <listitem>
+ <para>Result set caching is not transactional. Transactions depend on (and
+ enforce) consistency of data, and cached data is not guaranteed
+ to be consistent with the data store’s data.</para>
+ </listitem>
+ <listitem>
+ <para>Clearing the results cache clears all cache entries for all VDBs.</para>
+ </listitem>
+ </itemizedlist>
+ </section>
+</chapter>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/documentation/client-developers-guide/pom.xml
===================================================================
--- trunk/documentation/client-developers-guide/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/documentation/client-developers-guide/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,77 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>documentation</artifactId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>client-developers-guide</artifactId>
- <groupId>org.jboss.teiid.documentation</groupId>
- <packaging>jdocbook</packaging>
- <name>Teiid Client Developers Guide</name>
- <description>The Client Developers Guide</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.1.2</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>net.sf.docbook</groupId>
- <artifactId>docbook</artifactId>
- <version>1.74.0</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0</version>
- <type>jdocbook-style</type>
- </dependency>
- </dependencies>
- <configuration>
- <sourceDocumentName>main.xml</sourceDocumentName>
- <imageResource>
- <directory>${basedir}/src/main/docbook/en-US</directory>
- <excludes>
- <exclude>*.xml</exclude>
- <exclude>**/*.xml</exclude>
- <exclude>*.zargo</exclude>
- <exclude>**/*.zargo</exclude>
- </excludes>
- </imageResource>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
- <finalName>teiid_client_developers_guide.pdf</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <xmlTransformerType>saxon</xmlTransformerType>
- <docbookVersion>1.72.0</docbookVersion>
- <localeSeparator>-</localeSeparator>
- <useRelativeImageUris>false</useRelativeImageUris>
- </options>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/documentation/client-developers-guide/pom.xml (from rev 3140, trunk/documentation/client-developers-guide/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/documentation/client-developers-guide/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/documentation/client-developers-guide/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,77 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>documentation</artifactId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>client-developers-guide</artifactId>
+ <groupId>org.jboss.teiid.documentation</groupId>
+ <packaging>jdocbook</packaging>
+ <name>Teiid Client Developers Guide</name>
+ <description>The Client Developers Guide</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.2</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.docbook</groupId>
+ <artifactId>docbook</artifactId>
+ <version>1.74.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-docbook-xslt</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>main.xml</sourceDocumentName>
+ <imageResource>
+ <directory>${basedir}/src/main/docbook/en-US</directory>
+ <excludes>
+ <exclude>*.xml</exclude>
+ <exclude>**/*.xml</exclude>
+ <exclude>*.zargo</exclude>
+ <exclude>**/*.zargo</exclude>
+ </excludes>
+ </imageResource>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>teiid_client_developers_guide.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <docbookVersion>1.72.0</docbookVersion>
+ <localeSeparator>-</localeSeparator>
+ <useRelativeImageUris>false</useRelativeImageUris>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/documentation/client-developers-guide/src/main/docbook/en-US/content/prepared-statements.xml
===================================================================
--- trunk/documentation/client-developers-guide/src/main/docbook/en-US/content/prepared-statements.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/documentation/client-developers-guide/src/main/docbook/en-US/content/prepared-statements.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % CustomDTD SYSTEM "../../../../../../docbook/custom.dtd">
-%CustomDTD;
-]>
-<chapter id="prepared-statements">
- <title>Prepared Statements</title>
-
- <para>Teiid provides a standard implementation of <code>java.sql.PreparedStatement</code>. PreparedStatements can be very important in speeding up common statement execution, since they allow the server to skip parsing, resolving, and planning of the statement.
- See the Java documentation for more information on <ulink url="http://download.oracle.com/javase/6/docs/technotes/guides/jdbc/getstart/p...">PreparedStatement usage</ulink>.
- </para>
-
- <itemizedlist>
- <para><code>PreparedStatement</code> Considerations</para>
- <listitem>
- <para>It is not necessary to pool client side Teiid <code>PreparedStatements</code>, since Teiid performs plan caching on the server side.</para>
- </listitem>
- <listitem>
- <para>The number of cached plans is configurable (see the Admin Guide), and are purged by the least recently used (LRU).</para>
- </listitem>
- <listitem>
- <para>Cached plans are not distributed through a cluster. A new plan must be created for each cluster member.</para>
- </listitem>
- <listitem>
- <para>Plans are cached for the entire VDB or for just a particular session. The scope of a plan is detected automatically based upon the functions evaluated during it's planning process.</para>
- </listitem>
- <listitem>
- <para>Runtime updates of costing information do not yet cause replanning. At this time only session scoped temporary table or internally materialized tables update their costing information.</para>
- </listitem>
- <listitem>
- <para>Stored procedures executed through a <code>CallableStatement</code> have their plans cached just as a <code>PreparedStatement</code>.</para>
- </listitem>
- <listitem>
- <para>Bind variable types in function signatures, e.g. "where t.col = abs(?)" can be determined if the function has only one signature or if the function is used in a predicate where the return type can be determined.
- In more complex situations it may be necessary to add a type hint with a cast or convert, e.g. upper(convert(?, string)).</para>
- </listitem>
- </itemizedlist>
-
-</chapter>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/documentation/client-developers-guide/src/main/docbook/en-US/content/prepared-statements.xml (from rev 3138, trunk/documentation/client-developers-guide/src/main/docbook/en-US/content/prepared-statements.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/documentation/client-developers-guide/src/main/docbook/en-US/content/prepared-statements.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/documentation/client-developers-guide/src/main/docbook/en-US/content/prepared-statements.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % CustomDTD SYSTEM "../../../../../../docbook/custom.dtd">
+%CustomDTD;
+]>
+<chapter id="prepared-statements">
+ <title>Prepared Statements</title>
+
+ <para>Teiid provides a standard implementation of <code>java.sql.PreparedStatement</code>. PreparedStatements can be very important in speeding up common statement execution, since they allow the server to skip parsing, resolving, and planning of the statement.
+ See the Java documentation for more information on <ulink url="http://download.oracle.com/javase/6/docs/technotes/guides/jdbc/getstart/p...">PreparedStatement usage</ulink>.
+ </para>
+
+ <itemizedlist>
+ <para><code>PreparedStatement</code> Considerations</para>
+ <listitem>
+ <para>It is not necessary to pool client side Teiid <code>PreparedStatements</code>, since Teiid performs plan caching on the server side.</para>
+ </listitem>
+ <listitem>
+ <para>The number of cached plans is configurable (see the Admin Guide), and are purged by the least recently used (LRU).</para>
+ </listitem>
+ <listitem>
+ <para>Cached plans are not distributed through a cluster. A new plan must be created for each cluster member.</para>
+ </listitem>
+ <listitem>
+ <para>Plans are cached for the entire VDB or for just a particular session. The scope of a plan is detected automatically based upon the functions evaluated during it's planning process.</para>
+ </listitem>
+ <listitem>
+ <para>Stored procedures executed through a <code>CallableStatement</code> have their plans cached just as a <code>PreparedStatement</code>.</para>
+ </listitem>
+ <listitem>
+ <para>Bind variable types in function signatures, e.g. "where t.col = abs(?)" can be determined if the function has only one signature or if the function is used in a predicate where the return type can be determined.
+ In more complex situations it may be necessary to add a type hint with a cast or convert, e.g. upper(convert(?, string)).</para>
+ </listitem>
+ </itemizedlist>
+
+</chapter>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/documentation/developer-guide/pom.xml
===================================================================
--- trunk/documentation/developer-guide/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/documentation/developer-guide/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,77 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>documentation</artifactId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>developer-guide</artifactId>
- <groupId>org.jboss.teiid.documentation</groupId>
- <packaging>jdocbook</packaging>
- <name>Developer's Guide</name>
- <description>The Teiid Developer's Guide</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.1.2</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>net.sf.docbook</groupId>
- <artifactId>docbook</artifactId>
- <version>1.74.0</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0</version>
- <type>jdocbook-style</type>
- </dependency>
- </dependencies>
- <configuration>
- <sourceDocumentName>Developer_Guide.xml</sourceDocumentName>
- <imageResource>
- <directory>${basedir}/src/main/docbook/en-US</directory>
- <excludes>
- <exclude>*.xml</exclude>
- <exclude>**/*.xml</exclude>
- <exclude>*.zargo</exclude>
- <exclude>**/*.zargo</exclude>
- </excludes>
- </imageResource>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
- <finalName>teiid_developer_guide.pdf</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <xmlTransformerType>saxon</xmlTransformerType>
- <docbookVersion>1.72.0</docbookVersion>
- <localeSeparator>-</localeSeparator>
- <useRelativeImageUris>false</useRelativeImageUris>
- </options>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: tags/teiid-parent-7.4.0.CR1/documentation/developer-guide/pom.xml (from rev 3140, trunk/documentation/developer-guide/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/documentation/developer-guide/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/documentation/developer-guide/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,77 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>documentation</artifactId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>developer-guide</artifactId>
+ <groupId>org.jboss.teiid.documentation</groupId>
+ <packaging>jdocbook</packaging>
+ <name>Developer's Guide</name>
+ <description>The Teiid Developer's Guide</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.2</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.docbook</groupId>
+ <artifactId>docbook</artifactId>
+ <version>1.74.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-docbook-xslt</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>Developer_Guide.xml</sourceDocumentName>
+ <imageResource>
+ <directory>${basedir}/src/main/docbook/en-US</directory>
+ <excludes>
+ <exclude>*.xml</exclude>
+ <exclude>**/*.xml</exclude>
+ <exclude>*.zargo</exclude>
+ <exclude>**/*.zargo</exclude>
+ </excludes>
+ </imageResource>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>teiid_developer_guide.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <docbookVersion>1.72.0</docbookVersion>
+ <localeSeparator>-</localeSeparator>
+ <useRelativeImageUris>false</useRelativeImageUris>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: tags/teiid-parent-7.4.0.CR1/documentation/developer-guide/src/main/docbook/en-US/Developer_Guide.xml
===================================================================
--- trunk/documentation/developer-guide/src/main/docbook/en-US/Developer_Guide.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/documentation/developer-guide/src/main/docbook/en-US/Developer_Guide.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,23 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % CustomDTD SYSTEM "../../../../../docbook/custom.dtd">
-%CustomDTD;
-]>
-
-<book>
- <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-
- <xi:include href="content/introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="content/develop-adapter.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="content/translator-api.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="content/extending-jdbc.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="content/udf.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="content/adminapi.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="content/logging.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="content/security.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="content/appendix-a.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="content/appendix-b.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-
-</book>
-
Copied: tags/teiid-parent-7.4.0.CR1/documentation/developer-guide/src/main/docbook/en-US/Developer_Guide.xml (from rev 3138, trunk/documentation/developer-guide/src/main/docbook/en-US/Developer_Guide.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/documentation/developer-guide/src/main/docbook/en-US/Developer_Guide.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/documentation/developer-guide/src/main/docbook/en-US/Developer_Guide.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,22 @@
+<?xml version='1.0'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % CustomDTD SYSTEM "../../../../../docbook/custom.dtd">
+%CustomDTD;
+]>
+
+<book>
+ <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="content/introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="content/develop-adapter.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="content/translator-api.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="content/extending-jdbc.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="content/udf.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="content/adminapi.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="content/logging.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="content/security.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="content/runtime-updates.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="content/appendix-a.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="content/appendix-b.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</book>
+
Copied: tags/teiid-parent-7.4.0.CR1/documentation/developer-guide/src/main/docbook/en-US/content/runtime-updates.xml (from rev 3139, trunk/documentation/developer-guide/src/main/docbook/en-US/content/runtime-updates.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/documentation/developer-guide/src/main/docbook/en-US/content/runtime-updates.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/documentation/developer-guide/src/main/docbook/en-US/content/runtime-updates.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % CustomDTD SYSTEM "../../../../../../docbook/custom.dtd">
+%CustomDTD;
+]>
+<chapter id="runtime-updates">
+ <title>Runtime Updates</title>
+ <para>Teiid supports several mechanisms for updating the runtime system.</para>
+ <section>
+ <title>Data Updates</title>
+ <para>Data change events are used by Teiid to invalidate result set cache entries. Result set cache entires are tracked by the tables that contributed to their results.
+ By default Teiid will capture internal data events against physical sources and distribute them across the cluster.
+ This approach has several limitations. First updates are scoped only to their originating VDB/version. Second updates made out side of Teiid are not captured.
+ To increase data consistency external change data capture tools can be used to send events to Teiid. From within a Teiid cluster the <code>org.teiid.events.EventDistributorFactory</code>
+ and <code>org.teiid.events.EventDistributor</code> can be used to distribute change events. The <code>EventDistributorFactory</code> is implemented by the
+ <code>RuntimeEngineDeployer</code> bean and should be looked up by its name "teiid/engine-deployer". See the example below.</para>
+ <example>
+ <title>Usage of the <code>EventDistributor</code></title>
+ <programlisting language="java">InitialContext ctx = new InitialContext();
+EventDistributorFactory edf = (EventDistributorFactory)ctx.lookup("teiid/engine-deployer");
+EventDistributor ed = edf.getEventDistributor();
+ed.dataModification(vdbName, vdbVersion, schema, tableName);</programlisting>
+ <para>This will distribute a change event for schema.tableName in vdb vdbName.vdbVersion.</para>
+ </example>
+ <para>When externally capturing all update events, &jboss-beans; RuntimeEngineDeployer.detectingChangeEvents can be set to false, to not duplicate change events.</para>
+ <para>The use of the other <code>EventDistributor</code> methods to manual distribute other events is not recommended.</para>
+ </section>
+ <section>
+ <title>Runtime Metadata Updates</title>
+ <para>Runtime updates via system procedures and DDL statements are by default ephemeral. They are effective across the cluster only for the currently running vdbs.
+ With the next vdb start the values will revert to whatever is stored in the vdb. Updates may be made persistent though by configuring a <code>org.teiid.metadata.MetadataRepository</code>.
+ An instance of a <code>MetadataRepository</code> can be installed via the &teiid-deployer-beans; file in the <code>VDBRepository</code> bean.
+ The <code>MetadataRepository</code> repository instance may fully implement as many of the methods as needed and return null from any unneeded getter.</para>
+ <note><para>It is not recommended to directly manipulate <code>org.teiid.metadata.AbstractMetadataRecord</code> instances.
+ System procedures and DDL statements should be used instead since the effects will be distributed through the cluster and will not introduce inconsistencies.</para></note>
+ <para><code>org.teiid.metadata.AbstractMetadataRecord</code> objects passed to the <code>MetadataRepository</code> have not yet been modified.
+ If the <code>MetadataRepository</code> cannot persist the update, then a <code>RuntimeException</code> should be thrown to prevent the update from being applied by the runtime engine.</para>
+ <section>
+ <title>Costing Updates</title>
+ <para>See the Reference for the system procedures <code>SYSADMIN.setColumnStats</code> and <code>SYSADMIN.setTableStats</code>.
+ To make costing updates persistent <code>MetadataRepository</code> implementations should be provided for:
+ <programlisting language="java">TableStats getTableStats(String vdbName, int vdbVersion, Table table);
+void setTableStats(String vdbName, int vdbVersion, Table table, TableStats tableStats);
+ColumnStats getColumnStats(String vdbName, int vdbVersion, Column column);
+void setColumnStats(String vdbName, int vdbVersion, Column column, ColumnStats columnStats);</programlisting>
+ </para>
+ </section>
+ <section>
+ <title>Schema Updates</title>
+ <para>See the Reference for supported DDL statements. To make schema updates persistent implementations should be provided for:</para>
+ <programlisting>String getViewDefinition(String vdbName, int vdbVersion, Table table);
+void setViewDefinition(String vdbName, int vdbVersion, Table table, String viewDefinition);
+String getInsteadOfTriggerDefinition(String vdbName, int vdbVersion, Table table, Table.TriggerEvent triggerOperation);
+void setInsteadOfTriggerDefinition(String vdbName, int vdbVersion, Table table, Table.TriggerEvent triggerOperation, String triggerDefinition);
+boolean isInsteadOfTriggerEnabled(String vdbName, int vdbVersion, Table table, Table.TriggerEvent triggerOperation);
+void setInsteadOfTriggerEnabled(String vdbName, int vdbVersion, Table table, Table.TriggerEvent triggerOperation, boolean enabled);
+String getProcedureDefinition(String vdbName, int vdbVersion, Procedure procedure);
+void setProcedureDefinition(String vdbName, int vdbVersion, Procedure procedure, String procedureDefinition);
+LinkedHashMap<String, String> getProperties(String vdbName, int vdbVersion, AbstractMetadataRecord record);
+void setProperty(String vdbName, int vdbVersion, AbstractMetadataRecord record, String name, String value);</programlisting>
+ </section>
+ </section>
+</chapter>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/documentation/docbook/custom.dtd
===================================================================
--- trunk/documentation/docbook/custom.dtd 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/documentation/docbook/custom.dtd 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,9 +0,0 @@
-<!ENTITY versionNumber "7.4">
-<!ENTITY copyrightYear "2011">
-<!ENTITY copyrightHolder "Red Hat, Inc.">
-<!ENTITY url "http://www.jboss.org/teiid/">
-<!ENTITY docUrl "&url;/docs.html">
-<!ENTITY javaDocUrl "http://docs.jboss.org/teiid/&versionNumber;/apidocs">
-<!ENTITY desDocUrl "http://www.jboss.org/teiiddesigner/docs.html">
-<!ENTITY jboss-beans "<code><jboss-install>/server/<profile>/deploy/teiid/teiid-jboss-beans.xml</code>">
-<!ENTITY metadata-update-note "<note><para>A <code>MetadataRepository</code> must be configured to make a non-temporary metadata update persistent. See the Developers Guide Runtime Updates section for more.</para></note>">
Copied: tags/teiid-parent-7.4.0.CR1/documentation/docbook/custom.dtd (from rev 3138, trunk/documentation/docbook/custom.dtd)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/documentation/docbook/custom.dtd (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/documentation/docbook/custom.dtd 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,10 @@
+<!ENTITY versionNumber "7.4">
+<!ENTITY copyrightYear "2011">
+<!ENTITY copyrightHolder "Red Hat, Inc.">
+<!ENTITY url "http://www.jboss.org/teiid/">
+<!ENTITY docUrl "&url;/docs.html">
+<!ENTITY javaDocUrl "http://docs.jboss.org/teiid/&versionNumber;/apidocs">
+<!ENTITY desDocUrl "http://www.jboss.org/teiiddesigner/docs.html">
+<!ENTITY jboss-beans "<code><jboss-install>/server/<profile>/deploy/teiid/teiid-jboss-beans.xml</code>">
+<!ENTITY teiid-deployer-beans "<code><jboss-install>/server/<profile>/deploy/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml</code>">
+<!ENTITY metadata-update-note "<note><para>A <code>MetadataRepository</code> must be configured to make a non-temporary metadata update persistent. See the Developers Guide Runtime Metadata Updates section for more.</para></note>">
Deleted: tags/teiid-parent-7.4.0.CR1/documentation/pom.xml
===================================================================
--- trunk/documentation/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/documentation/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,21 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>teiid-parent</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>documentation</artifactId>
- <packaging>pom</packaging>
- <name>Documents</name>
- <description>Teiid Documentation Aggregator</description>
- <modules>
- <module>admin-guide</module>
- <module>reference</module>
- <module>developer-guide</module>
- <module>quick-start-example</module>
- <module>client-developers-guide</module>
- <module>caching-guide</module>
- </modules>
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/documentation/pom.xml (from rev 3140, trunk/documentation/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/documentation/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/documentation/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,21 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>teiid-parent</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>documentation</artifactId>
+ <packaging>pom</packaging>
+ <name>Documents</name>
+ <description>Teiid Documentation Aggregator</description>
+ <modules>
+ <module>admin-guide</module>
+ <module>reference</module>
+ <module>developer-guide</module>
+ <module>quick-start-example</module>
+ <module>client-developers-guide</module>
+ <module>caching-guide</module>
+ </modules>
+</project>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/documentation/quick-start-example/pom.xml
===================================================================
--- trunk/documentation/quick-start-example/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/documentation/quick-start-example/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,77 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>documentation</artifactId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>quick-start-example</artifactId>
- <groupId>org.jboss.teiid.documentation</groupId>
- <packaging>jdocbook</packaging>
- <name>Quick Start Guide</name>
- <description>The Teiid Quick Start guide</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.1.2</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>net.sf.docbook</groupId>
- <artifactId>docbook</artifactId>
- <version>1.74.0</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0</version>
- <type>jdocbook-style</type>
- </dependency>
- </dependencies>
- <configuration>
- <sourceDocumentName>quick_start_example.xml</sourceDocumentName>
- <imageResource>
- <directory>${basedir}/src/main/docbook/en-US</directory>
- <excludes>
- <exclude>*.xml</exclude>
- <exclude>**/*.xml</exclude>
- <exclude>*.zargo</exclude>
- <exclude>**/*.zargo</exclude>
- </excludes>
- </imageResource>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
- <finalName>teiid_quick_start_example.pdf</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <xmlTransformerType>saxon</xmlTransformerType>
- <docbookVersion>1.72.0</docbookVersion>
- <localeSeparator>-</localeSeparator>
- <useRelativeImageUris>false</useRelativeImageUris>
- </options>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: tags/teiid-parent-7.4.0.CR1/documentation/quick-start-example/pom.xml (from rev 3140, trunk/documentation/quick-start-example/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/documentation/quick-start-example/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/documentation/quick-start-example/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,77 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>documentation</artifactId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>quick-start-example</artifactId>
+ <groupId>org.jboss.teiid.documentation</groupId>
+ <packaging>jdocbook</packaging>
+ <name>Quick Start Guide</name>
+ <description>The Teiid Quick Start guide</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.2</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.docbook</groupId>
+ <artifactId>docbook</artifactId>
+ <version>1.74.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-docbook-xslt</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>quick_start_example.xml</sourceDocumentName>
+ <imageResource>
+ <directory>${basedir}/src/main/docbook/en-US</directory>
+ <excludes>
+ <exclude>*.xml</exclude>
+ <exclude>**/*.xml</exclude>
+ <exclude>*.zargo</exclude>
+ <exclude>**/*.zargo</exclude>
+ </excludes>
+ </imageResource>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>teiid_quick_start_example.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <docbookVersion>1.72.0</docbookVersion>
+ <localeSeparator>-</localeSeparator>
+ <useRelativeImageUris>false</useRelativeImageUris>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: tags/teiid-parent-7.4.0.CR1/documentation/reference/pom.xml
===================================================================
--- trunk/documentation/reference/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/documentation/reference/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,77 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>documentation</artifactId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>reference</artifactId>
- <groupId>org.jboss.teiid.documentation</groupId>
- <packaging>jdocbook</packaging>
- <name>Teiid Reference</name>
- <description>The Teiid reference manual</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.1.2</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>net.sf.docbook</groupId>
- <artifactId>docbook</artifactId>
- <version>1.74.0</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0</version>
- <type>jdocbook-style</type>
- </dependency>
- </dependencies>
- <configuration>
- <sourceDocumentName>Reference.xml</sourceDocumentName>
- <imageResource>
- <directory>${basedir}/src/main/docbook/en-US</directory>
- <excludes>
- <exclude>*.xml</exclude>
- <exclude>**/*.xml</exclude>
- <exclude>*.zargo</exclude>
- <exclude>**/*.zargo</exclude>
- </excludes>
- </imageResource>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
- <finalName>teiid_reference.pdf</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- <options>
- <xmlTransformerType>saxon</xmlTransformerType>
- <docbookVersion>1.72.0</docbookVersion>
- <xincludeSupported>true</xincludeSupported>
- <localeSeparator>-</localeSeparator>
- <useRelativeImageUris>false</useRelativeImageUris>
- </options>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/documentation/reference/pom.xml (from rev 3140, trunk/documentation/reference/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/documentation/reference/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/documentation/reference/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,77 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>documentation</artifactId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>reference</artifactId>
+ <groupId>org.jboss.teiid.documentation</groupId>
+ <packaging>jdocbook</packaging>
+ <name>Teiid Reference</name>
+ <description>The Teiid reference manual</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.2</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.docbook</groupId>
+ <artifactId>docbook</artifactId>
+ <version>1.74.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-docbook-xslt</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>Reference.xml</sourceDocumentName>
+ <imageResource>
+ <directory>${basedir}/src/main/docbook/en-US</directory>
+ <excludes>
+ <exclude>*.xml</exclude>
+ <exclude>**/*.xml</exclude>
+ <exclude>*.zargo</exclude>
+ <exclude>**/*.zargo</exclude>
+ </excludes>
+ </imageResource>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>teiid_reference.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <docbookVersion>1.72.0</docbookVersion>
+ <xincludeSupported>true</xincludeSupported>
+ <localeSeparator>-</localeSeparator>
+ <useRelativeImageUris>false</useRelativeImageUris>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/documentation/reference/src/main/docbook/en-US/content/grammar.xml
===================================================================
--- trunk/documentation/reference/src/main/docbook/en-US/content/grammar.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/documentation/reference/src/main/docbook/en-US/content/grammar.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,896 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<appendix id="grammar">
- <title>BNF for SQL Grammar</title>
-<section>
-<title>TOKENS</title>
-<informaltable frame="none">
-<tgroup cols="1">
-<colspec colname="c1" colwidth="100*"/>
-<tbody>
-<row><entry><para>
-<DEFAULT> SKIP : {
-" "
-| "\t"
-| "\n"
-| "\r"
-}
-
-</para></entry></row>
-<row><entry><para>
-<DEFAULT> MORE : {
-"/*" : IN_MULTI_LINE_COMMENT
-}
-
-</para></entry></row>
-<row><entry><para>
-<IN_MULTI_LINE_COMMENT> SPECIAL : {
-<MULTI_LINE_COMMENT: "*/"> : DEFAULT
-}
-
-</para></entry></row>
-<row><entry><para>
-<IN_MULTI_LINE_COMMENT> MORE : {
-<~[]>
-}
-
-</para></entry></row>
-<row><entry><para>
-<DEFAULT> TOKEN : {
-<STRING: "string">
-| <VARCHAR: "varchar">
-| <BOOLEAN: "boolean">
-| <BYTE: "byte">
-| <TINYINT: "tinyint">
-| <SHORT: "short">
-| <SMALLINT: "smallint">
-| <CHAR: "char">
-| <INTEGER: "integer">
-| <LONG: "long">
-| <BIGINT: "bigint">
-| <BIGINTEGER: "biginteger">
-| <FLOAT: "float">
-| <REAL: "real">
-| <DOUBLE: "double">
-| <BIGDECIMAL: "bigdecimal">
-| <DECIMAL: "decimal">
-| <DATE: "date">
-| <TIME: "time">
-| <TIMESTAMP: "timestamp">
-| <OBJECT: "object">
-| <BLOB: "blob">
-| <CLOB: "clob">
-| <XML: "xml">
-}
-
-</para></entry></row>
-<row><entry><para>
-<DEFAULT> TOKEN : {
-<CAST: "cast">
-| <CONVERT: "convert">
-}
-
-</para></entry></row>
-<row><entry><para>
-<DEFAULT> TOKEN : {
-<ADD: "add">
-| <ALL: "all">
-| <ALTER: "alter">
-| <AND: "and">
-| <ANY: "any">
-| <ARRAY: "array">
-| <ARRAY_AGG: "array_agg">
-| <AS: "as">
-| <ASC: "asc">
-| <ATOMIC: "atomic">
-| <AUTORIZATION: "authorization">
-| <BEGIN: "begin">
-| <BETWEEN: "between">
-| <BINARY: "binary">
-| <BOTH: "both">
-| <BREAK: "break">
-| <BY: "by">
-| <CALL: "call">
-| <CALLED: "called">
-| <CASCADED: "cascaded">
-| <CASE: "case">
-| <CHARACTER: "character">
-| <CHECK: "check">
-| <CLOSE: "close">
-| <COLLATE: "collate">
-| <COLUMN: "column">
-| <COMMIT: "commit">
-| <CONNECT: "connect">
-| <CONSTRAINT: "constraint">
-| <CONTINUE: "continue">
-| <CORRESPONDING: "corresponding">
-| <CURRENT_DATE: "current_date">
-| <CURRENT_TIME: "current_time">
-| <CURRENT_TIMESTAMP: "current_timestamp">
-| <CURRENT_USER: "current_user">
-| <CREATE: "create">
-| <CRITERIA: "criteria">
-| <CROSS: "cross">
-| <CURSOR: "cursor">
-| <DAY: "day">
-| <DEALLOCATE: "deallocate">
-| <DEFAULT_KEYWORD: "default">
-| <DECLARE: "declare">
-| <DELETE: "delete">
-| <DESC: "desc">
-| <DESCRIBE: "describe">
-| <DETERMINISTIC: "deterministic">
-| <DISCONNECT: "disconnect">
-| <DISTINCT: "distinct">
-| <DROP: "drop">
-| <EACH: "each">
-| <ELSE: "else">
-| <END: "end">
-| <ERROR: "error">
-| <ESCAPE: "escape">
-| <EXCEPT: "except">
-| <EXEC: "exec">
-| <EXECUTE: "execute">
-| <EXTERNAL: "external">
-| <EXISTS: "exists">
-| <FALSE: "false">
-| <FETCH: "fetch">
-| <FILTER: "filter">
-| <FOR: "for">
-| <FORIEGN: "foriegn">
-| <FROM: "from">
-| <FULL: "full">
-| <FUNCTION: "function">
-| <GET: "get">
-| <GLOBAL: "global">
-| <GRANT: "grant">
-| <GROUP: "group">
-| <HAS: "has">
-| <HAVING: "having">
-| <HOLD: "hold">
-| <HOUR: "hour">
-| <IF: "if">
-| <IDENTITY: "identity">
-| <IMMEDIATE: "immediate">
-| <IN: "in">
-| <INDICATOR: "indicator">
-| <INNER: "inner">
-| <INPUT: "input">
-| <INOUT: "inout">
-| <INSENSITIVE: "insensitive">
-| <INSERT: "insert">
-| <INTERSECT: "intersect">
-| <INTERVAL: "interval">
-| <INTO: "into">
-| <IS: "is">
-| <ISOLATION: "isolation">
-| <JOIN: "join">
-| <LEFT: "left">
-| <LANGUAGE: "language">
-| <LARGE: "large">
-| <LEADING: "leading">
-| <LIKE: "like">
-| <LIMIT: "limit">
-| <LOCAL: "local">
-| <LOOP: "loop">
-| <MAKEDEP: "makedep">
-| <MAKENOTDEP: "makenotdep">
-| <MATCH: "match">
-| <MERGE: "merge">
-| <METHOD: "method">
-| <MINUTE: "minute">
-| <MODIFIES: "modifies">
-| <MODULE: "module">
-| <MONTH: "month">
-| <NATURAL: "natural">
-| <NEW: "new">
-| <NOCACHE: "nocache">
-| <NO: "no">
-| <NONE: "none">
-| <NOT: "not">
-| <NULL: "null">
-| <OF: "of">
-| <OLD: "old">
-| <ON: "on">
-| <ONLY: "only">
-| <OPEN: "open">
-| <OPTION: "option">
-| <OR: "or">
-| <ORDER: "order">
-| <OUTER: "outer">
-| <OUTPUT: "output">
-| <OVER: "over">
-| <OVERLAPS: "OVERLAPS">
-| <PARAMETER: "parameter">
-| <PARTITION: "partition">
-| <PRECISION: "precision">
-| <PREPARE: "prepare">
-| <PRIMARY: "primary">
-| <PROCEDURE: "procedure">
-| <RANGE: "range">
-| <READS: "reads">
-| <RECURSIVE: "recursive">
-| <REFERENCES: "REFERENCES">
-| <REFERENCING: "REFERENCING">
-| <RETURN: "return">
-| <RETURNS: "returns">
-| <REVOKE: "REVOKE">
-| <RIGHT: "right">
-| <ROLLBACK: "ROLLBACK">
-| <ROLLUP: "ROLLUP">
-| <ROW: "row">
-| <ROWS: "rows">
-| <SAVEPOINT: "savepoint">
-| <SCROLL: "scroll">
-| <SEARCH: "search">
-| <SECOND: "second">
-| <SELECT: "select">
-| <SENSITIVE: "sensitive">
-| <SESSION_USER: "session_user">
-| <SET: "set">
-| <SIMILAR: "similar">
-| <SPECIFIC: "specific">
-| <SOME: "some">
-| <SQL: "sql">
-| <SQLEXCEPTION: "sqlexception">
-| <SQLSTATE: "sqlstate">
-| <SQLWARNING: "sqlwarning">
-| <START: "start">
-| <STATIC: "static">
-| <SYSTEM: "system">
-| <SYSTEM_USER: "system_user">
-| <TABLE: "table">
-| <TEMPORARY: "temporary">
-| <THEN: "then">
-| <TIMEZONE_HOUR: "timezone_hour">
-| <TIMEZONE_MINUTE: "timezone_minute">
-| <TO: "to">
-| <TRAILING: "trailing">
-| <TRANSLATE: "translate">
-| <TRIGGER: "trigger">
-| <TRUE: "true">
-| <UNION: "union">
-| <UNIQUE: "unique">
-| <UNKNOWN: "unknown">
-| <USER: "user">
-| <UPDATE: "update">
-| <USING: "using">
-| <VALUE: "value">
-| <VALUES: "values">
-| <VIRTUAL: "virtual">
-| <WHEN: "when">
-| <WHENEVER: "whenever">
-| <WHERE: "where">
-| <WITH: "with">
-| <WHILE: "while">
-| <WINDOW: "window">
-| <WITHIN: "within">
-| <WITHOUT: "without">
-| <YEAR: "year">
-| <ALLOCATE: "allocate">
-| <ARE: "are">
-| <ASENSITIVE: "asensitive">
-| <ASYMETRIC: "asymetric">
-| <CYCLE: "cycle">
-| <DEC: "dec">
-| <DEREF: "deref">
-| <DYNAMIC: "dynamic">
-| <ELEMENT: "element">
-| <FREE: "free">
-| <INT: "int">
-| <LATERAL: "lateral">
-| <LOCALTIME: "localtime">
-| <LOCALTIMESTAMP: "localtimestamp">
-| <MEMBER: "member">
-| <MULTISET: "multiset">
-| <NATIONAL: "national">
-| <NCHAR: "nchar">
-| <NCLOB: "nclob">
-| <NUMERIC: "numeric">
-| <RELEASE: "release">
-| <SPECIFICTYPE: "specifictype">
-| <SYMETRIC: "symetric">
-| <SUBMULTILIST: "submultilist">
-| <TRANSLATION: "translation">
-| <TREAT: "treat">
-| <VARYING: "varying">
-}
-
-</para></entry></row>
-<row><entry><para>
-<DEFAULT> TOKEN : {
-<XMLAGG: "xmlagg">
-| <XMLATTRIBUTES: "xmlattributes">
-| <XMLBINARY: "xmlbinary">
-| <XMLCAST: "xmlcast">
-| <XMLCONCAT: "xmlconcat">
-| <XMLCOMMENT: "xmlcomment">
-| <XMLDOCUMENT: "xmldocument">
-| <XMLELEMENT: "xmlelement">
-| <XMLEXISTS: "xmlexists">
-| <XMLFOREST: "xmlforest">
-| <XMLITERATE: "xmliterate">
-| <XMLNAMESPACES: "xmlnamespaces">
-| <XMLPARSE: "xmlparse">
-| <XMLPI: "xmlpi">
-| <XMLQUERY: "xmlquery">
-| <XMLSERIALIZE: "xmlserialize">
-| <XMLTABLE: "xmltable">
-| <XMLTEXT: "xmltext">
-| <XMLVALIDATE: "xmlvalidate">
-}
-
-</para></entry></row>
-<row><entry><para>
-<DEFAULT> TOKEN : {
-<DATALINK: "datalink">
-| <DLNEWCOPY: "dlnewcopy">
-| <DLPREVIOUSCOPY: "dlpreviouscopy">
-| <DLURLCOMPLETE: "dlurlcomplete">
-| <DLURLCOMPLETEWRITE: "dlurlcompletewrite">
-| <DLURLCOMPLETEONLY: "dlurlcompleteonly">
-| <DLURLPATH: "dlurlpath">
-| <DLURLPATHWRITE: "dlurlpathwrite">
-| <DLURLPATHONLY: "dlurlpathonly">
-| <DLURLSCHEME: "dlurlscheme">
-| <DLURLSERVER: "dlurlserver">
-| <DLVALUE: "dlvalue">
-| <IMPORT: "import">
-}
-
-</para></entry></row>
-<row><entry><para>
-<DEFAULT> TOKEN : {
-<ALL_IN_GROUP: <ID> <PERIOD> <STAR>>
-| <ID: <QUOTED_ID> (<PERIOD> <QUOTED_ID>)*>
-| <#QUOTED_ID: <ID_PART> | "\"" ("\"\"" | ~["\""])+ "\"">
-| <#ID_PART: ("@" | "#" | <LETTER>) (<LETTER> | "_" | <DIGIT>)*>
-| <DATETYPE: "{" "d">
-| <TIMETYPE: "{" "t">
-| <TIMESTAMPTYPE: "{" "ts">
-| <BOOLEANTYPE: "{" "b">
-| <POS_REF: ["$"] (<DIGIT>)+>
-| <INTEGERVAL: (<MINUS>)? (<DIGIT>)+>
-| <FLOATVAL: (<MINUS>)? (<DIGIT>)* <PERIOD> (<DIGIT>)+ (["e","E"] (["+","-"])? (<DIGIT>)+)?>
-| <STRINGVAL: ("N" | "E")? "\'" ("\'\'" | ~["\'"])* "\'">
-| <#LETTER: ["a"-"z","A"-"Z"] | ["\u0153"-"\ufffd"]>
-| <#DIGIT: ["0"-"9"]>
-}
-
-</para></entry></row>
-<row><entry><para>
-<DEFAULT> TOKEN : {
-<COMMA: ",">
-| <PERIOD: ".">
-| <LPAREN: "(">
-| <RPAREN: ")">
-| <LBRACE: "{">
-| <RBRACE: "}">
-| <LSBRACE: "[">
-| <RSBRACE: "]">
-| <EQ: "=">
-| <NE: "<>">
-| <NE2: "!=">
-| <LT: "<">
-| <LE: "<=">
-| <GT: ">">
-| <GE: ">=">
-| <STAR: "*">
-| <SLASH: "/">
-| <PLUS: "+">
-| <MINUS: "-">
-| <QMARK: "?">
-| <DOLLAR: "$">
-| <SEMICOLON: ";">
-| <CONCAT_OP: "||">
-}
-
-</para></entry></row>
-</tbody>
-</tgroup>
-</informaltable>
-</section>
-<section>
-<title>NON-TERMINALS</title>
-<informaltable frame="none">
-<tgroup cols="2">
-<colspec colname="c1" colwidth=".33*"/>
-<colspec colname="c2" colwidth="*"/>
-<tbody>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod1" xreflabel="stringVal"/>stringVal</para></entry>
-<entry align="left" valign="top"><para>::=
-( <STRINGVAL> )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod2" xreflabel="id"/>id</para></entry>
-<entry align="left" valign="top"><para>::=
-( <ID> )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod3" xreflabel="command"/>command</para></entry>
-<entry align="left" valign="top"><para>::=
-( <link linkend="prod4">createUpdateProcedure</link> | <link linkend="prod5">userCommand</link> | <link linkend="prod6">callableStatement</link> ) ( <SEMICOLON> )? <EOF></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod7" xreflabel="designerCommand"/>designerCommand</para></entry>
-<entry align="left" valign="top"><para>::=
-( <link linkend="prod8">updateProcedure</link> | <link linkend="prod5">userCommand</link> ) ( <SEMICOLON> )? <EOF></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod8" xreflabel="updateProcedure"/>updateProcedure</para></entry>
-<entry align="left" valign="top"><para>::=
-( <link linkend="prod4">createUpdateProcedure</link> | <link linkend="prod9">triggerAction</link> ) <EOF></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod10" xreflabel="alter"/>alter</para></entry>
-<entry align="left" valign="top"><para>::=
-<ALTER> ( ( <link linkend="prod11">nonReserved</link> <link linkend="prod2">id</link> <AS> <link linkend="prod12">queryExpression</link> ) | ( <PROCEDURE> <link linkend="prod2">id</link> <AS> <link linkend="prod13">block</link> ) | ( <TRIGGER> <ON> <link linkend="prod2">id</link> <link linkend="prod11">nonReserved</link> <OF> ( <INSERT> | <UPDATE> | <DELETE> ) <AS> <link linkend="prod9">triggerAction</link> ) )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod9" xreflabel="triggerAction"/>triggerAction</para></entry>
-<entry align="left" valign="top"><para>::=
-<FOR> <EACH> <ROW> <link linkend="prod13">block</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod5" xreflabel="userCommand"/>userCommand</para></entry>
-<entry align="left" valign="top"><para>::=
-( <link linkend="prod12">queryExpression</link> | <link linkend="prod14">storedProcedure</link> | <link linkend="prod15">insert</link> | <link linkend="prod16">update</link> | <link linkend="prod17">delete</link> | <link linkend="prod18">dropTable</link> | <link linkend="prod19">createTempTable</link> | <link linkend="prod10">alter</link> )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod18" xreflabel="dropTable"/>dropTable</para></entry>
-<entry align="left" valign="top"><para>::=
-<DROP> <TABLE> <link linkend="prod2">id</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod19" xreflabel="createTempTable"/>createTempTable</para></entry>
-<entry align="left" valign="top"><para>::=
-<CREATE> <LOCAL> <TEMPORARY> <TABLE> <link linkend="prod2">id</link> <LPAREN> <link linkend="prod20">tableElement</link> ( <COMMA> <link linkend="prod20">tableElement</link> )* ( <COMMA> <PRIMARY> <link linkend="prod11">nonReserved</link> <LPAREN> <link linkend="prod2">id</link> ( <COMMA> <link linkend="prod2">id</link> )* <RPAREN> )? <RPAREN></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod20" xreflabel="tableElement"/>tableElement</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod2">id</link> ( <link linkend="prod21">dataTypeString</link> | <link linkend="prod11">nonReserved</link> ) ( <NOT> <NULL> )?</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod22" xreflabel="errorStatement"/>errorStatement</para></entry>
-<entry align="left" valign="top"><para>::=
-<ERROR> <link linkend="prod23">expression</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod24" xreflabel="statement"/>statement</para></entry>
-<entry align="left" valign="top"><para>::=
-( <link linkend="prod25">ifStatement</link> | <link linkend="prod26">loopStatement</link> | <link linkend="prod27">whileStatement</link> | <link linkend="prod28">delimitedStatement</link> )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod28" xreflabel="delimitedStatement"/>delimitedStatement</para></entry>
-<entry align="left" valign="top"><para>::=
-( <link linkend="prod29">assignStatement</link> | <link linkend="prod30">sqlStatement</link> | <link linkend="prod22">errorStatement</link> | <link linkend="prod31">declareStatement</link> | <link linkend="prod32">continueStatement</link> | <link linkend="prod33">breakStatement</link> ) <SEMICOLON></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod13" xreflabel="block"/>block</para></entry>
-<entry align="left" valign="top"><para>::=
-( <link linkend="prod24">statement</link> | ( <BEGIN> ( <link linkend="prod24">statement</link> )* <END> ) )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod33" xreflabel="breakStatement"/>breakStatement</para></entry>
-<entry align="left" valign="top"><para>::=
-<BREAK></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod32" xreflabel="continueStatement"/>continueStatement</para></entry>
-<entry align="left" valign="top"><para>::=
-<CONTINUE></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod27" xreflabel="whileStatement"/>whileStatement</para></entry>
-<entry align="left" valign="top"><para>::=
-<WHILE> <LPAREN> <link linkend="prod34">criteria</link> <RPAREN> <link linkend="prod13">block</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod26" xreflabel="loopStatement"/>loopStatement</para></entry>
-<entry align="left" valign="top"><para>::=
-<LOOP> <ON> <LPAREN> <link linkend="prod12">queryExpression</link> <RPAREN> <AS> <link linkend="prod2">id</link> <link linkend="prod13">block</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod25" xreflabel="ifStatement"/>ifStatement</para></entry>
-<entry align="left" valign="top"><para>::=
-<IF> <LPAREN> <link linkend="prod34">criteria</link> <RPAREN> <link linkend="prod13">block</link> ( <ELSE> <link linkend="prod13">block</link> )?</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod35" xreflabel="criteriaSelector"/>criteriaSelector</para></entry>
-<entry align="left" valign="top"><para>::=
-( ( <EQ> | <NE> | <NE2> | <LE> | <GE> | <LT> | <GT> | <IN> | <LIKE> | ( <IS> <NULL> ) | <BETWEEN> ) )? <CRITERIA> ( <ON> <LPAREN> <link linkend="prod2">id</link> ( <COMMA> <link linkend="prod2">id</link> )* <RPAREN> )?</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod36" xreflabel="hasCriteria"/>hasCriteria</para></entry>
-<entry align="left" valign="top"><para>::=
-<HAS> <link linkend="prod35">criteriaSelector</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod31" xreflabel="declareStatement"/>declareStatement</para></entry>
-<entry align="left" valign="top"><para>::=
-<DECLARE> <link linkend="prod37">dataType</link> <link linkend="prod2">id</link> ( ( <link linkend="prod11">nonReserved</link> | <EQ> ) <link linkend="prod38">assignStatementOperand</link> )?</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod29" xreflabel="assignStatement"/>assignStatement</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod2">id</link> ( <link linkend="prod11">nonReserved</link> | <EQ> ) <link linkend="prod38">assignStatementOperand</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod38" xreflabel="assignStatementOperand"/>assignStatementOperand</para></entry>
-<entry align="left" valign="top"><para>::=
-( ( <link linkend="prod15">insert</link> ) | <link linkend="prod16">update</link> | <link linkend="prod17">delete</link> | ( <link linkend="prod23">expression</link> ) | <link linkend="prod12">queryExpression</link> )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod30" xreflabel="sqlStatement"/>sqlStatement</para></entry>
-<entry align="left" valign="top"><para>::=
-( ( <link linkend="prod5">userCommand</link> ) | <link linkend="prod39">dynamicCommand</link> | ( <link linkend="prod2">id</link> ( <link linkend="prod11">nonReserved</link> | <EQ> ) <link linkend="prod14">storedProcedure</link> ) )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod40" xreflabel="translateCriteria"/>translateCriteria</para></entry>
-<entry align="left" valign="top"><para>::=
-<TRANSLATE> <link linkend="prod35">criteriaSelector</link> ( <WITH> <LPAREN> <link linkend="prod2">id</link> <EQ> <link linkend="prod23">expression</link> ( <COMMA> <link linkend="prod2">id</link> <EQ> <link linkend="prod23">expression</link> )* <RPAREN> )?</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod4" xreflabel="createUpdateProcedure"/>createUpdateProcedure</para></entry>
-<entry align="left" valign="top"><para>::=
-<CREATE> ( <VIRTUAL> )? ( <UPDATE> )? <PROCEDURE> <link linkend="prod13">block</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod39" xreflabel="dynamicCommand"/>dynamicCommand</para></entry>
-<entry align="left" valign="top"><para>::=
-( <EXECUTE> | <EXEC> ) ( ( <STRING> | <IMMEDIATE> ) )? <link linkend="prod23">expression</link> ( <AS> <link linkend="prod41">createElementsWithTypes</link> ( <INTO> <link linkend="prod2">id</link> )? )? ( <USING> <link linkend="prod42">setClauseList</link> )? ( <UPDATE> ( ( <INTEGERVAL> ) | ( <STAR> ) ) )?</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod42" xreflabel="setClauseList"/>setClauseList</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod2">id</link> <EQ> ( <COMMA> <link linkend="prod2">id</link> <EQ> )*</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod41" xreflabel="createElementsWithTypes"/>createElementsWithTypes</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod2">id</link> <link linkend="prod21">dataTypeString</link> ( <COMMA> <link linkend="prod2">id</link> <link linkend="prod21">dataTypeString</link> )*</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod6" xreflabel="callableStatement"/>callableStatement</para></entry>
-<entry align="left" valign="top"><para>::=
-<LBRACE> ( <QMARK> <EQ> )? <CALL> <link linkend="prod2">id</link> ( <LPAREN> ( <link linkend="prod43">executeUnnamedParams</link> ) <RPAREN> )? <RBRACE> ( <link linkend="prod44">option</link> )?</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod14" xreflabel="storedProcedure"/>storedProcedure</para></entry>
-<entry align="left" valign="top"><para>::=
-( ( <EXEC> | <EXECUTE> | <CALL> ) <link linkend="prod2">id</link> <LPAREN> ( <link linkend="prod45">executeNamedParams</link> | <link linkend="prod43">executeUnnamedParams</link> ) <RPAREN> ) ( <link linkend="prod44">option</link> )?</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod43" xreflabel="executeUnnamedParams"/>executeUnnamedParams</para></entry>
-<entry align="left" valign="top"><para>::=
-( <link linkend="prod23">expression</link> ( <COMMA> <link linkend="prod23">expression</link> )* )?</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod45" xreflabel="executeNamedParams"/>executeNamedParams</para></entry>
-<entry align="left" valign="top"><para>::=
-( <link linkend="prod2">id</link> <EQ> ( <GT> )? <link linkend="prod23">expression</link> ( <COMMA> <link linkend="prod2">id</link> <EQ> ( <GT> )? <link linkend="prod23">expression</link> )* )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod15" xreflabel="insert"/>insert</para></entry>
-<entry align="left" valign="top"><para>::=
-<INSERT> <INTO> <link linkend="prod2">id</link> ( <link linkend="prod46">columnList</link> )? ( ( <VALUES> <link linkend="prod47">rowValues</link> ) | ( <link linkend="prod12">queryExpression</link> ) ) ( <link linkend="prod44">option</link> )?</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod46" xreflabel="columnList"/>columnList</para></entry>
-<entry align="left" valign="top"><para>::=
-<LPAREN> <link linkend="prod2">id</link> ( <COMMA> <link linkend="prod2">id</link> )* <RPAREN></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod47" xreflabel="rowValues"/>rowValues</para></entry>
-<entry align="left" valign="top"><para>::=
-<LPAREN> <link linkend="prod23">expression</link> ( <COMMA> <link linkend="prod23">expression</link> )* <RPAREN></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod16" xreflabel="update"/>update</para></entry>
-<entry align="left" valign="top"><para>::=
-<UPDATE> <link linkend="prod2">id</link> <SET> <link linkend="prod42">setClauseList</link> ( <link linkend="prod48">where</link> )? ( <link linkend="prod44">option</link> )?</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod17" xreflabel="delete"/>delete</para></entry>
-<entry align="left" valign="top"><para>::=
-<DELETE> <FROM> <link linkend="prod2">id</link> ( <link linkend="prod48">where</link> )? ( <link linkend="prod44">option</link> )?</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod12" xreflabel="queryExpression"/>queryExpression</para></entry>
-<entry align="left" valign="top"><para>::=
-( <WITH> <link linkend="prod49">withListElement</link> ( <COMMA> <link linkend="prod49">withListElement</link> )* )? <link linkend="prod50">queryExpressionBody</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod49" xreflabel="withListElement"/>withListElement</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod2">id</link> ( <link linkend="prod46">columnList</link> )? <AS> <LPAREN> <link linkend="prod12">queryExpression</link> <RPAREN></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod50" xreflabel="queryExpressionBody"/>queryExpressionBody</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod51">queryTerm</link> ( ( <UNION> | <EXCEPT> ) ( <ALL> | <DISTINCT> )? <link linkend="prod51">queryTerm</link> )* ( <link linkend="prod52">orderby</link> )? ( <link linkend="prod53">limit</link> )? ( <link linkend="prod44">option</link> )?</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod51" xreflabel="queryTerm"/>queryTerm</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod54">queryPrimary</link> ( <INTERSECT> ( <ALL> | <DISTINCT> )? <link linkend="prod54">queryPrimary</link> )*</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod54" xreflabel="queryPrimary"/>queryPrimary</para></entry>
-<entry align="left" valign="top"><para>::=
-( <link linkend="prod55">query</link> | ( <TABLE> <link linkend="prod2">id</link> ) | ( <LPAREN> <link linkend="prod50">queryExpressionBody</link> <RPAREN> ) )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod55" xreflabel="query"/>query</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod56">select</link> ( <link linkend="prod57">into</link> )? ( <link linkend="prod58">from</link> ( <link linkend="prod48">where</link> )? ( <link linkend="prod59">groupBy</link> )? ( <link linkend="prod60">having</link> )? )?</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod57" xreflabel="into"/>into</para></entry>
-<entry align="left" valign="top"><para>::=
-<INTO> ( <link linkend="prod2">id</link> )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod56" xreflabel="select"/>select</para></entry>
-<entry align="left" valign="top"><para>::=
-<SELECT> ( <ALL> | ( <DISTINCT> ) )? ( <STAR> | ( <link linkend="prod61">selectSymbol</link> ( <COMMA> <link linkend="prod61">selectSymbol</link> )* ) )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod61" xreflabel="selectSymbol"/>selectSymbol</para></entry>
-<entry align="left" valign="top"><para>::=
-( <link linkend="prod62">selectExpression</link> | <link linkend="prod63">allInGroupSymbol</link> )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod62" xreflabel="selectExpression"/>selectExpression</para></entry>
-<entry align="left" valign="top"><para>::=
-( <link linkend="prod23">expression</link> ( ( <AS> )? <link linkend="prod2">id</link> )? )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod64" xreflabel="derivedColumn"/>derivedColumn</para></entry>
-<entry align="left" valign="top"><para>::=
-( <link linkend="prod23">expression</link> ( <AS> <link linkend="prod2">id</link> )? )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod63" xreflabel="allInGroupSymbol"/>allInGroupSymbol</para></entry>
-<entry align="left" valign="top"><para>::=
-<ALL_IN_GROUP></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod65" xreflabel="xmlAgg"/>xmlAgg</para></entry>
-<entry align="left" valign="top"><para>::=
-<XMLAGG> <LPAREN> <link linkend="prod23">expression</link> ( <link linkend="prod52">orderby</link> )? <RPAREN></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod66" xreflabel="arrayAgg"/>arrayAgg</para></entry>
-<entry align="left" valign="top"><para>::=
-<ARRAY_AGG> <LPAREN> <link linkend="prod23">expression</link> ( <link linkend="prod52">orderby</link> )? <RPAREN></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod67" xreflabel="textAgg"/>textAgg</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod11">nonReserved</link> <LPAREN> <FOR> <link linkend="prod64">derivedColumn</link> ( <COMMA> <link linkend="prod64">derivedColumn</link> )* ( <ID> <link linkend="prod68">charVal</link> )? ( ( <ID> <link linkend="prod68">charVal</link> ) )? ( <ID> )? ( ( <ID> <link linkend="prod2">id</link> ) )? ( <link linkend="prod52">orderby</link> )? <RPAREN></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod69" xreflabel="aggregateSymbol"/>aggregateSymbol</para></entry>
-<entry align="left" valign="top"><para>::=
-( ( <link linkend="prod11">nonReserved</link> <LPAREN> <STAR> <RPAREN> ) | ( ( <link linkend="prod11">nonReserved</link> | <ANY> | <SOME> ) <LPAREN> ( <DISTINCT> | <ALL> )? <link linkend="prod23">expression</link> <RPAREN> ) )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod58" xreflabel="from"/>from</para></entry>
-<entry align="left" valign="top"><para>::=
-<FROM> ( <link linkend="prod70">tableReference</link> ( <COMMA> <link linkend="prod70">tableReference</link> )* )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod70" xreflabel="tableReference"/>tableReference</para></entry>
-<entry align="left" valign="top"><para>::=
-( ( <LBRACE> <link linkend="prod11">nonReserved</link> <link linkend="prod71">joinedTable</link> <RBRACE> ) | <link linkend="prod71">joinedTable</link> )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod71" xreflabel="joinedTable"/>joinedTable</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod72">tablePrimary</link> ( ( <link linkend="prod73">crossJoin</link> | <link linkend="prod74">qualifiedJoin</link> ) )*</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod73" xreflabel="crossJoin"/>crossJoin</para></entry>
-<entry align="left" valign="top"><para>::=
-( ( <CROSS> | <UNION> ) <JOIN> <link linkend="prod72">tablePrimary</link> )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod74" xreflabel="qualifiedJoin"/>qualifiedJoin</para></entry>
-<entry align="left" valign="top"><para>::=
-( ( ( <RIGHT> ( <OUTER> )? ) | ( <LEFT> ( <OUTER> )? ) | ( <FULL> ( <OUTER> )? ) | <INNER> )? <JOIN> <link linkend="prod70">tableReference</link> <ON> <link linkend="prod34">criteria</link> )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod72" xreflabel="tablePrimary"/>tablePrimary</para></entry>
-<entry align="left" valign="top"><para>::=
-( <link linkend="prod75">textTable</link> | <link linkend="prod76">arrayTable</link> | <link linkend="prod77">xmlTable</link> | <link linkend="prod78">unaryFromClause</link> | <link linkend="prod79">subqueryFromClause</link> | ( <LPAREN> <link linkend="prod71">joinedTable</link> <RPAREN> ) ) ( ( <MAKEDEP> ) | ( <MAKENOTDEP> ) )?</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod80" xreflabel="xmlSerialize"/>xmlSerialize</para></entry>
-<entry align="left" valign="top"><para>::=
-<XMLSERIALIZE> <LPAREN> ( <link linkend="prod11">nonReserved</link> )? <link linkend="prod23">expression</link> ( <AS> ( <STRING> | <VARCHAR> | <CLOB> ) )? <RPAREN></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod11" xreflabel="nonReserved"/>nonReserved</para></entry>
-<entry align="left" valign="top"><para>::=
-<ID></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod76" xreflabel="arrayTable"/>arrayTable</para></entry>
-<entry align="left" valign="top"><para>::=
-<ID> <LPAREN> <link linkend="prod23">expression</link> <link linkend="prod11">nonReserved</link> <link linkend="prod41">createElementsWithTypes</link> <RPAREN> ( <AS> )? <link linkend="prod2">id</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod75" xreflabel="textTable"/>textTable</para></entry>
-<entry align="left" valign="top"><para>::=
-<ID> <LPAREN> <link linkend="prod23">expression</link> <link linkend="prod11">nonReserved</link> <link linkend="prod81">textColumn</link> ( <COMMA> <link linkend="prod81">textColumn</link> )* ( <ID> <link linkend="prod68">charVal</link> )? ( ( <ESCAPE> <link linkend="prod68">charVal</link> ) | ( <ID> <link linkend="prod68">charVal</link> ) )? ( <ID> ( <link linkend="prod82">intVal</link> )? )? ( <ID> <link linkend="prod82">intVal</link> )? <RPAREN> ( <AS> )? <link linkend="prod2">id</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod81" xreflabel="textColumn"/>textColumn</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod2">id</link> <link linkend="prod37">dataType</link> ( <ID> <link linkend="prod82">intVal</link> )?</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod83" xreflabel="xmlQuery"/>xmlQuery</para></entry>
-<entry align="left" valign="top"><para>::=
-<XMLQUERY> <LPAREN> ( <link linkend="prod84">xmlNamespaces</link> <COMMA> )? <link linkend="prod1">stringVal</link> ( <ID> <link linkend="prod64">derivedColumn</link> ( <COMMA> <link linkend="prod64">derivedColumn</link> )* )? ( ( <NULL> | <link linkend="prod11">nonReserved</link> ) <ON> <link linkend="prod11">nonReserved</link> )? <RPAREN></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod77" xreflabel="xmlTable"/>xmlTable</para></entry>
-<entry align="left" valign="top"><para>::=
-<XMLTABLE> <LPAREN> ( <link linkend="prod84">xmlNamespaces</link> <COMMA> )? <link linkend="prod1">stringVal</link> ( <ID> <link linkend="prod64">derivedColumn</link> ( <COMMA> <link linkend="prod64">derivedColumn</link> )* )? ( <ID> <link linkend="prod85">xmlColumn</link> ( <COMMA> <link linkend="prod85">xmlColumn</link> )* )? <RPAREN> ( <AS> )? <link linkend="prod2">id</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod85" xreflabel="xmlColumn"/>xmlColumn</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod2">id</link> ( ( <FOR> <link linkend="prod11">nonReserved</link> ) | ( <link linkend="prod37">dataType</link> ( <DEFAULT_KEYWORD> <link linkend="prod23">expression</link> )? ( <link linkend="prod11">nonReserved</link> <link linkend="prod1">stringVal</link> )? ) )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod82" xreflabel="intVal"/>intVal</para></entry>
-<entry align="left" valign="top"><para>::=
-<INTEGERVAL></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod79" xreflabel="subqueryFromClause"/>subqueryFromClause</para></entry>
-<entry align="left" valign="top"><para>::=
-( <TABLE> )? <LPAREN> ( <link linkend="prod12">queryExpression</link> | <link linkend="prod14">storedProcedure</link> ) <RPAREN> ( <AS> )? <link linkend="prod2">id</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod78" xreflabel="unaryFromClause"/>unaryFromClause</para></entry>
-<entry align="left" valign="top"><para>::=
-( <ID> ( ( <AS> )? <link linkend="prod2">id</link> )? )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod48" xreflabel="where"/>where</para></entry>
-<entry align="left" valign="top"><para>::=
-<WHERE> <link linkend="prod34">criteria</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod34" xreflabel="criteria"/>criteria</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod86">compoundCritOr</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod86" xreflabel="compoundCritOr"/>compoundCritOr</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod87">compoundCritAnd</link> ( <OR> <link linkend="prod87">compoundCritAnd</link> )*</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod87" xreflabel="compoundCritAnd"/>compoundCritAnd</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod88">notCrit</link> ( <AND> <link linkend="prod88">notCrit</link> )*</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod88" xreflabel="notCrit"/>notCrit</para></entry>
-<entry align="left" valign="top"><para>::=
-( <NOT> )? <link linkend="prod89">booleanPrimary</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod89" xreflabel="booleanPrimary"/>booleanPrimary</para></entry>
-<entry align="left" valign="top"><para>::=
-( <link linkend="prod40">translateCriteria</link> | ( <link linkend="prod90">commonValueExpression</link> ( ( <link linkend="prod91">betweenCrit</link> | <link linkend="prod92">matchCrit</link> | <link linkend="prod93">setCrit</link> | <link linkend="prod94">isNullCrit</link> | <link linkend="prod95">subqueryCompareCriteria</link> | <link linkend="prod96">compareCrit</link> ) )? ) | <link linkend="prod97">existsCriteria</link> | <link linkend="prod36">hasCriteria</link> )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod98" xreflabel="operator"/>operator</para></entry>
-<entry align="left" valign="top"><para>::=
-( <EQ> | <NE> | <NE2> | <LT> | <LE> | <GT> | <GE> )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod96" xreflabel="compareCrit"/>compareCrit</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod98">operator</link> <link linkend="prod90">commonValueExpression</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod99" xreflabel="subquery"/>subquery</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod100">subqueryAndHint</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod100" xreflabel="subqueryAndHint"/>subqueryAndHint</para></entry>
-<entry align="left" valign="top"><para>::=
-<LPAREN> ( <link linkend="prod12">queryExpression</link> | ( <link linkend="prod14">storedProcedure</link> ) ) <RPAREN></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod95" xreflabel="subqueryCompareCriteria"/>subqueryCompareCriteria</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod98">operator</link> ( <ANY> | <SOME> | <ALL> ) <link linkend="prod99">subquery</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod92" xreflabel="matchCrit"/>matchCrit</para></entry>
-<entry align="left" valign="top"><para>::=
-( <NOT> )? <LIKE> <link linkend="prod90">commonValueExpression</link> ( <ESCAPE> <link linkend="prod68">charVal</link> | ( <LBRACE> <ESCAPE> <link linkend="prod68">charVal</link> <RBRACE> ) )?</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod68" xreflabel="charVal"/>charVal</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod1">stringVal</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod91" xreflabel="betweenCrit"/>betweenCrit</para></entry>
-<entry align="left" valign="top"><para>::=
-( <NOT> )? <BETWEEN> <link linkend="prod90">commonValueExpression</link> <AND> <link linkend="prod90">commonValueExpression</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod94" xreflabel="isNullCrit"/>isNullCrit</para></entry>
-<entry align="left" valign="top"><para>::=
-<IS> ( <NOT> )? <NULL></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod93" xreflabel="setCrit"/>setCrit</para></entry>
-<entry align="left" valign="top"><para>::=
-( <NOT> )? <IN> ( ( <link linkend="prod100">subqueryAndHint</link> ) | ( <LPAREN> <link linkend="prod90">commonValueExpression</link> ( <COMMA> <link linkend="prod90">commonValueExpression</link> )* <RPAREN> ) )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod97" xreflabel="existsCriteria"/>existsCriteria</para></entry>
-<entry align="left" valign="top"><para>::=
-<EXISTS> <link linkend="prod100">subqueryAndHint</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod59" xreflabel="groupBy"/>groupBy</para></entry>
-<entry align="left" valign="top"><para>::=
-<GROUP> <BY> ( <link linkend="prod101">groupByItem</link> ( <COMMA> <link linkend="prod101">groupByItem</link> )* )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod101" xreflabel="groupByItem"/>groupByItem</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod23">expression</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod60" xreflabel="having"/>having</para></entry>
-<entry align="left" valign="top"><para>::=
-<HAVING> <link linkend="prod34">criteria</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod52" xreflabel="orderby"/>orderby</para></entry>
-<entry align="left" valign="top"><para>::=
-<ORDER> <BY> <link linkend="prod102">sortSpecification</link> ( <COMMA> <link linkend="prod102">sortSpecification</link> )*</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod102" xreflabel="sortSpecification"/>sortSpecification</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod103">sortKey</link> ( <ASC> | <DESC> )? ( <link linkend="prod11">nonReserved</link> <link linkend="prod11">nonReserved</link> )?</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod103" xreflabel="sortKey"/>sortKey</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod23">expression</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod53" xreflabel="limit"/>limit</para></entry>
-<entry align="left" valign="top"><para>::=
-<LIMIT> ( <INTEGERVAL> | <QMARK> ) ( <COMMA> ( <INTEGERVAL> | <QMARK> ) )?</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod44" xreflabel="option"/>option</para></entry>
-<entry align="left" valign="top"><para>::=
-<OPTION> ( <MAKEDEP> <link linkend="prod2">id</link> ( <COMMA> <link linkend="prod2">id</link> )* | <MAKENOTDEP> <link linkend="prod2">id</link> ( <COMMA> <link linkend="prod2">id</link> )* | <NOCACHE> ( <link linkend="prod2">id</link> ( <COMMA> <link linkend="prod2">id</link> )* )? )*</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod23" xreflabel="expression"/>expression</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod34">criteria</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod90" xreflabel="commonValueExpression"/>commonValueExpression</para></entry>
-<entry align="left" valign="top"><para>::=
-( <link linkend="prod104">plusExpression</link> ( <CONCAT_OP> <link linkend="prod104">plusExpression</link> )* )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod104" xreflabel="plusExpression"/>plusExpression</para></entry>
-<entry align="left" valign="top"><para>::=
-( <link linkend="prod105">timesExpression</link> ( <link linkend="prod106">plusOperator</link> <link linkend="prod105">timesExpression</link> )* )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod106" xreflabel="plusOperator"/>plusOperator</para></entry>
-<entry align="left" valign="top"><para>::=
-( <PLUS> | <MINUS> )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod105" xreflabel="timesExpression"/>timesExpression</para></entry>
-<entry align="left" valign="top"><para>::=
-( <link linkend="prod107">valueExpressionPrimary</link> ( <link linkend="prod108">timesOperator</link> <link linkend="prod107">valueExpressionPrimary</link> )* )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod108" xreflabel="timesOperator"/>timesOperator</para></entry>
-<entry align="left" valign="top"><para>::=
-( <STAR> | <SLASH> )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod107" xreflabel="valueExpressionPrimary"/>valueExpressionPrimary</para></entry>
-<entry align="left" valign="top"><para>::=
-( <QMARK> | <POS_REF> | <link linkend="prod109">literal</link> | ( <LBRACE> <link linkend="prod11">nonReserved</link> <link linkend="prod110">function</link> <RBRACE> ) | ( <link linkend="prod67">textAgg</link> ) | ( <link linkend="prod69">aggregateSymbol</link> ) | ( <link linkend="prod69">aggregateSymbol</link> ) | ( <link linkend="prod69">aggregateSymbol</link> ) | ( <link linkend="prod65">xmlAgg</link> ) | ( <link linkend="prod66">arrayAgg</link> ) | ( <link linkend="prod110">function</link> ) | ( <ID> ( <LSBRACE> <link linkend="prod82">intVal</link> <RSBRACE> )? ) | <link linkend="prod99">subquery</link> | ( <LPAREN> <link linkend="prod23">expression</link> <RPAREN> ( <LSBRACE> <link linkend="prod82">intVal</link> <RSBRACE> )? ) | <link linkend="prod111">searchedCaseExpression</link> | <link linkend="prod112">caseExpression</link> )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod112" xreflabel="caseExpression"/>caseExpression</para></entry>
-<entry align="left" valign="top"><para>::=
-<CASE> <link linkend="prod23">expression</link> ( <WHEN> <link linkend="prod23">expression</link> <THEN> <link linkend="prod23">expression</link> )+ ( <ELSE> <link linkend="prod23">expression</link> )? <END></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod111" xreflabel="searchedCaseExpression"/>searchedCaseExpression</para></entry>
-<entry align="left" valign="top"><para>::=
-<CASE> ( <WHEN> <link linkend="prod34">criteria</link> <THEN> <link linkend="prod23">expression</link> )+ ( <ELSE> <link linkend="prod23">expression</link> )? <END></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod110" xreflabel="function"/>function</para></entry>
-<entry align="left" valign="top"><para>::=
-( ( <CONVERT> <LPAREN> <link linkend="prod23">expression</link> <COMMA> <link linkend="prod37">dataType</link> <RPAREN> ) | ( <CAST> <LPAREN> <link linkend="prod23">expression</link> <AS> <link linkend="prod37">dataType</link> <RPAREN> ) | ( <link linkend="prod11">nonReserved</link> <LPAREN> <link linkend="prod23">expression</link> <COMMA> <link linkend="prod113">stringConstant</link> <RPAREN> ) | ( <link linkend="prod11">nonReserved</link> <LPAREN> <link linkend="prod114">intervalType</link> <COMMA> <link linkend="prod23">expression</link> <COMMA> <link linkend="prod23">expression</link> <RPAREN> ) | <link linkend="prod115">queryString</link> | ( ( <LEFT> | <RIGHT> | <CHAR> | <USER> | <YEAR> | <MONTH> | <HOUR> | <MINUTE> | <SECOND> | <XMLCONCAT> | <XMLCOMMENT> ) <LPAREN> ( <link linkend="prod23">expression</link> !
( <COMMA> <link linkend="prod23">expression</link> )* )? <RPAREN> ) | ( ( <INSERT> ) <LPAREN> ( <link linkend="prod23">expression</link> ( <COMMA> <link linkend="prod23">expression</link> )* )? <RPAREN> ) | ( ( <TRANSLATE> ) <LPAREN> ( <link linkend="prod23">expression</link> ( <COMMA> <link linkend="prod23">expression</link> )* )? <RPAREN> ) | <link linkend="prod116">xmlParse</link> | <link linkend="prod117">xmlElement</link> | ( <XMLPI> <LPAREN> ( <ID> <link linkend="prod118">idExpression</link> | <link linkend="prod118">idExpression</link> ) ( <COMMA> <link linkend="prod23">expression</link> )? <RPAREN> ) | <link linkend="prod119">xmlForest</link> | <link linkend="prod80">xmlSerialize</link> | <link linkend="prod83">xmlQuery</link> | ( <link linkend="prod2">id</link> <LPAREN> ( <link linkend="prod23">expression</link> ( <COMMA> <link linkend="prod23">expression</link> )*!
)? <RPAREN> ) )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod113" xreflabel="stringConstant"/>stringConstant</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod1">stringVal</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod116" xreflabel="xmlParse"/>xmlParse</para></entry>
-<entry align="left" valign="top"><para>::=
-<XMLPARSE> <LPAREN> <link linkend="prod11">nonReserved</link> <link linkend="prod23">expression</link> ( <link linkend="prod11">nonReserved</link> )? <RPAREN></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod115" xreflabel="queryString"/>queryString</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod11">nonReserved</link> <LPAREN> <link linkend="prod23">expression</link> ( <COMMA> <link linkend="prod64">derivedColumn</link> )* <RPAREN></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod117" xreflabel="xmlElement"/>xmlElement</para></entry>
-<entry align="left" valign="top"><para>::=
-<XMLELEMENT> <LPAREN> ( <ID> <link linkend="prod2">id</link> | <link linkend="prod2">id</link> ) ( <COMMA> <link linkend="prod84">xmlNamespaces</link> )? ( <COMMA> <link linkend="prod120">xmlAttributes</link> )? ( <COMMA> <link linkend="prod23">expression</link> )* <RPAREN></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod120" xreflabel="xmlAttributes"/>xmlAttributes</para></entry>
-<entry align="left" valign="top"><para>::=
-<XMLATTRIBUTES> <LPAREN> <link linkend="prod64">derivedColumn</link> ( <COMMA> <link linkend="prod64">derivedColumn</link> )* <RPAREN></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod119" xreflabel="xmlForest"/>xmlForest</para></entry>
-<entry align="left" valign="top"><para>::=
-<XMLFOREST> <LPAREN> ( <link linkend="prod84">xmlNamespaces</link> <COMMA> )? <link linkend="prod64">derivedColumn</link> ( <COMMA> <link linkend="prod64">derivedColumn</link> )* <RPAREN></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod84" xreflabel="xmlNamespaces"/>xmlNamespaces</para></entry>
-<entry align="left" valign="top"><para>::=
-<XMLNAMESPACES> <LPAREN> <link linkend="prod121">namespaceItem</link> ( <COMMA> <link linkend="prod121">namespaceItem</link> )* <RPAREN></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod121" xreflabel="namespaceItem"/>namespaceItem</para></entry>
-<entry align="left" valign="top"><para>::=
-( <link linkend="prod1">stringVal</link> <AS> <link linkend="prod2">id</link> )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para></para></entry>
-<entry align="left" valign="top"><para>::=
-( <NO> <DEFAULT_KEYWORD> )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para></para></entry>
-<entry align="left" valign="top"><para>::=
-( <DEFAULT_KEYWORD> <link linkend="prod1">stringVal</link> )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod118" xreflabel="idExpression"/>idExpression</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod2">id</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod21" xreflabel="dataTypeString"/>dataTypeString</para></entry>
-<entry align="left" valign="top"><para>::=
-( <STRING> | <VARCHAR> | <BOOLEAN> | <BYTE> | <TINYINT> | <SHORT> | <SMALLINT> | <CHAR> | <INTEGER> | <LONG> | <BIGINT> | <BIGINTEGER> | <FLOAT> | <REAL> | <DOUBLE> | <BIGDECIMAL> | <DECIMAL> | <DATE> | <TIME> | <TIMESTAMP> | <OBJECT> | <BLOB> | <CLOB> | <XML> )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod37" xreflabel="dataType"/>dataType</para></entry>
-<entry align="left" valign="top"><para>::=
-<link linkend="prod21">dataTypeString</link></para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod114" xreflabel="intervalType"/>intervalType</para></entry>
-<entry align="left" valign="top"><para>::=
-( <link linkend="prod11">nonReserved</link> )</para></entry></row>
-<row>
-<entry align="right" valign="top"><para><anchor id="prod109" xreflabel="literal"/>literal</para></entry>
-<entry align="left" valign="top"><para>::=
-( <link linkend="prod1">stringVal</link> | <INTEGERVAL> | <FLOATVAL> | <FALSE> | <TRUE> | <UNKNOWN> | <NULL> | ( ( <BOOLEANTYPE> | <TIMESTAMPTYPE> | <DATETYPE> | <TIMETYPE> ) <link linkend="prod1">stringVal</link> <RBRACE> ) )</para></entry></row>
-</tbody>
-</tgroup>
-</informaltable>
-</section>
-</appendix>
Copied: tags/teiid-parent-7.4.0.CR1/documentation/reference/src/main/docbook/en-US/content/grammar.xml (from rev 3138, trunk/documentation/reference/src/main/docbook/en-US/content/grammar.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/documentation/reference/src/main/docbook/en-US/content/grammar.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/documentation/reference/src/main/docbook/en-US/content/grammar.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,899 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<appendix id="grammar">
+ <title>BNF for SQL Grammar</title><section>
+<title>TOKENS</title>
+<informaltable frame="none">
+<tgroup cols="1">
+<colspec colname="c1" colwidth="100*"/>
+<tbody>
+<row><entry><para>
+<DEFAULT> SKIP : {
+" "
+| "\t"
+| "\n"
+| "\r"
+}
+
+</para></entry></row>
+<row><entry><para>
+<DEFAULT> MORE : {
+"/*" : IN_MULTI_LINE_COMMENT
+}
+
+</para></entry></row>
+<row><entry><para>
+<IN_MULTI_LINE_COMMENT> SPECIAL : {
+<MULTI_LINE_COMMENT: "*/"> : DEFAULT
+}
+
+</para></entry></row>
+<row><entry><para>
+<IN_MULTI_LINE_COMMENT> MORE : {
+<~[]>
+}
+
+</para></entry></row>
+<row><entry><para>
+<DEFAULT> TOKEN : {
+<STRING: "string">
+| <VARCHAR: "varchar">
+| <BOOLEAN: "boolean">
+| <BYTE: "byte">
+| <TINYINT: "tinyint">
+| <SHORT: "short">
+| <SMALLINT: "smallint">
+| <CHAR: "char">
+| <INTEGER: "integer">
+| <LONG: "long">
+| <BIGINT: "bigint">
+| <BIGINTEGER: "biginteger">
+| <FLOAT: "float">
+| <REAL: "real">
+| <DOUBLE: "double">
+| <BIGDECIMAL: "bigdecimal">
+| <DECIMAL: "decimal">
+| <DATE: "date">
+| <TIME: "time">
+| <TIMESTAMP: "timestamp">
+| <OBJECT: "object">
+| <BLOB: "blob">
+| <CLOB: "clob">
+| <XML: "xml">
+}
+
+</para></entry></row>
+<row><entry><para>
+<DEFAULT> TOKEN : {
+<CAST: "cast">
+| <CONVERT: "convert">
+}
+
+</para></entry></row>
+<row><entry><para>
+<DEFAULT> TOKEN : {
+<ADD: "add">
+| <ALL: "all">
+| <ALTER: "alter">
+| <AND: "and">
+| <ANY: "any">
+| <ARRAY: "array">
+| <ARRAY_AGG: "array_agg">
+| <AS: "as">
+| <ASC: "asc">
+| <ATOMIC: "atomic">
+| <AUTORIZATION: "authorization">
+| <BEGIN: "begin">
+| <BETWEEN: "between">
+| <BINARY: "binary">
+| <BOTH: "both">
+| <BREAK: "break">
+| <BY: "by">
+| <CALL: "call">
+| <CALLED: "called">
+| <CASCADED: "cascaded">
+| <CASE: "case">
+| <CHARACTER: "character">
+| <CHECK: "check">
+| <CLOSE: "close">
+| <COLLATE: "collate">
+| <COLUMN: "column">
+| <COMMIT: "commit">
+| <CONNECT: "connect">
+| <CONSTRAINT: "constraint">
+| <CONTINUE: "continue">
+| <CORRESPONDING: "corresponding">
+| <CURRENT_DATE: "current_date">
+| <CURRENT_TIME: "current_time">
+| <CURRENT_TIMESTAMP: "current_timestamp">
+| <CURRENT_USER: "current_user">
+| <CREATE: "create">
+| <CRITERIA: "criteria">
+| <CROSS: "cross">
+| <CURSOR: "cursor">
+| <DAY: "day">
+| <DEALLOCATE: "deallocate">
+| <DEFAULT_KEYWORD: "default">
+| <DECLARE: "declare">
+| <DELETE: "delete">
+| <DESC: "desc">
+| <DESCRIBE: "describe">
+| <DETERMINISTIC: "deterministic">
+| <DISCONNECT: "disconnect">
+| <DISTINCT: "distinct">
+| <DROP: "drop">
+| <EACH: "each">
+| <ELSE: "else">
+| <END: "end">
+| <ERROR: "error">
+| <ESCAPE: "escape">
+| <EXCEPT: "except">
+| <EXEC: "exec">
+| <EXECUTE: "execute">
+| <EXTERNAL: "external">
+| <EXISTS: "exists">
+| <FALSE: "false">
+| <FETCH: "fetch">
+| <FILTER: "filter">
+| <FOR: "for">
+| <FORIEGN: "foriegn">
+| <FROM: "from">
+| <FULL: "full">
+| <FUNCTION: "function">
+| <GET: "get">
+| <GLOBAL: "global">
+| <GRANT: "grant">
+| <GROUP: "group">
+| <HAS: "has">
+| <HAVING: "having">
+| <HOLD: "hold">
+| <HOUR: "hour">
+| <IF: "if">
+| <IDENTITY: "identity">
+| <IMMEDIATE: "immediate">
+| <IN: "in">
+| <INDICATOR: "indicator">
+| <INNER: "inner">
+| <INPUT: "input">
+| <INOUT: "inout">
+| <INSENSITIVE: "insensitive">
+| <INSERT: "insert">
+| <INTERSECT: "intersect">
+| <INTERVAL: "interval">
+| <INTO: "into">
+| <IS: "is">
+| <ISOLATION: "isolation">
+| <JOIN: "join">
+| <LEFT: "left">
+| <LANGUAGE: "language">
+| <LARGE: "large">
+| <LEADING: "leading">
+| <LIKE: "like">
+| <LIMIT: "limit">
+| <LOCAL: "local">
+| <LOOP: "loop">
+| <MAKEDEP: "makedep">
+| <MAKENOTDEP: "makenotdep">
+| <MATCH: "match">
+| <MERGE: "merge">
+| <METHOD: "method">
+| <MINUTE: "minute">
+| <MODIFIES: "modifies">
+| <MODULE: "module">
+| <MONTH: "month">
+| <NATURAL: "natural">
+| <NEW: "new">
+| <NOCACHE: "nocache">
+| <NO: "no">
+| <NONE: "none">
+| <NOT: "not">
+| <NULL: "null">
+| <OF: "of">
+| <OLD: "old">
+| <ON: "on">
+| <ONLY: "only">
+| <OPEN: "open">
+| <OPTION: "option">
+| <OR: "or">
+| <ORDER: "order">
+| <OUTER: "outer">
+| <OUTPUT: "output">
+| <OVER: "over">
+| <OVERLAPS: "OVERLAPS">
+| <PARAMETER: "parameter">
+| <PARTITION: "partition">
+| <PRECISION: "precision">
+| <PREPARE: "prepare">
+| <PRIMARY: "primary">
+| <PROCEDURE: "procedure">
+| <RANGE: "range">
+| <READS: "reads">
+| <RECURSIVE: "recursive">
+| <REFERENCES: "REFERENCES">
+| <REFERENCING: "REFERENCING">
+| <RETURN: "return">
+| <RETURNS: "returns">
+| <REVOKE: "REVOKE">
+| <RIGHT: "right">
+| <ROLLBACK: "ROLLBACK">
+| <ROLLUP: "ROLLUP">
+| <ROW: "row">
+| <ROWS: "rows">
+| <SAVEPOINT: "savepoint">
+| <SCROLL: "scroll">
+| <SEARCH: "search">
+| <SECOND: "second">
+| <SELECT: "select">
+| <SENSITIVE: "sensitive">
+| <SESSION_USER: "session_user">
+| <SET: "set">
+| <SIMILAR: "similar">
+| <SPECIFIC: "specific">
+| <SOME: "some">
+| <SQL: "sql">
+| <SQLEXCEPTION: "sqlexception">
+| <SQLSTATE: "sqlstate">
+| <SQLWARNING: "sqlwarning">
+| <START: "start">
+| <STATIC: "static">
+| <SYSTEM: "system">
+| <SYSTEM_USER: "system_user">
+| <TABLE: "table">
+| <TEMPORARY: "temporary">
+| <THEN: "then">
+| <TIMEZONE_HOUR: "timezone_hour">
+| <TIMEZONE_MINUTE: "timezone_minute">
+| <TO: "to">
+| <TRAILING: "trailing">
+| <TRANSLATE: "translate">
+| <TRIGGER: "trigger">
+| <TRUE: "true">
+| <UNION: "union">
+| <UNIQUE: "unique">
+| <UNKNOWN: "unknown">
+| <USER: "user">
+| <UPDATE: "update">
+| <USING: "using">
+| <VALUE: "value">
+| <VALUES: "values">
+| <VIRTUAL: "virtual">
+| <WHEN: "when">
+| <WHENEVER: "whenever">
+| <WHERE: "where">
+| <WITH: "with">
+| <WHILE: "while">
+| <WINDOW: "window">
+| <WITHIN: "within">
+| <WITHOUT: "without">
+| <YEAR: "year">
+| <ALLOCATE: "allocate">
+| <ARE: "are">
+| <ASENSITIVE: "asensitive">
+| <ASYMETRIC: "asymetric">
+| <CYCLE: "cycle">
+| <DEC: "dec">
+| <DEREF: "deref">
+| <DYNAMIC: "dynamic">
+| <ELEMENT: "element">
+| <FREE: "free">
+| <INT: "int">
+| <LATERAL: "lateral">
+| <LOCALTIME: "localtime">
+| <LOCALTIMESTAMP: "localtimestamp">
+| <MEMBER: "member">
+| <MULTISET: "multiset">
+| <NATIONAL: "national">
+| <NCHAR: "nchar">
+| <NCLOB: "nclob">
+| <NUMERIC: "numeric">
+| <RELEASE: "release">
+| <SPECIFICTYPE: "specifictype">
+| <SYMETRIC: "symetric">
+| <SUBMULTILIST: "submultilist">
+| <TRANSLATION: "translation">
+| <TREAT: "treat">
+| <VARYING: "varying">
+}
+
+</para></entry></row>
+<row><entry><para>
+<DEFAULT> TOKEN : {
+<XMLAGG: "xmlagg">
+| <XMLATTRIBUTES: "xmlattributes">
+| <XMLBINARY: "xmlbinary">
+| <XMLCAST: "xmlcast">
+| <XMLCONCAT: "xmlconcat">
+| <XMLCOMMENT: "xmlcomment">
+| <XMLDOCUMENT: "xmldocument">
+| <XMLELEMENT: "xmlelement">
+| <XMLEXISTS: "xmlexists">
+| <XMLFOREST: "xmlforest">
+| <XMLITERATE: "xmliterate">
+| <XMLNAMESPACES: "xmlnamespaces">
+| <XMLPARSE: "xmlparse">
+| <XMLPI: "xmlpi">
+| <XMLQUERY: "xmlquery">
+| <XMLSERIALIZE: "xmlserialize">
+| <XMLTABLE: "xmltable">
+| <XMLTEXT: "xmltext">
+| <XMLVALIDATE: "xmlvalidate">
+}
+
+</para></entry></row>
+<row><entry><para>
+<DEFAULT> TOKEN : {
+<DATALINK: "datalink">
+| <DLNEWCOPY: "dlnewcopy">
+| <DLPREVIOUSCOPY: "dlpreviouscopy">
+| <DLURLCOMPLETE: "dlurlcomplete">
+| <DLURLCOMPLETEWRITE: "dlurlcompletewrite">
+| <DLURLCOMPLETEONLY: "dlurlcompleteonly">
+| <DLURLPATH: "dlurlpath">
+| <DLURLPATHWRITE: "dlurlpathwrite">
+| <DLURLPATHONLY: "dlurlpathonly">
+| <DLURLSCHEME: "dlurlscheme">
+| <DLURLSERVER: "dlurlserver">
+| <DLVALUE: "dlvalue">
+| <IMPORT: "import">
+}
+
+</para></entry></row>
+<row><entry><para>
+<DEFAULT> TOKEN : {
+<ALL_IN_GROUP: <ID> <PERIOD> <STAR>>
+| <ID: <QUOTED_ID> (<PERIOD> <QUOTED_ID>)*>
+| <#QUOTED_ID: <ID_PART> | "\"" ("\"\"" | ~["\""])+ "\"">
+| <#ID_PART: ("@" | "#" | <LETTER>) (<LETTER> | "_" | <DIGIT>)*>
+| <DATETYPE: "{" "d">
+| <TIMETYPE: "{" "t">
+| <TIMESTAMPTYPE: "{" "ts">
+| <BOOLEANTYPE: "{" "b">
+| <POS_REF: ["$"] (<DIGIT>)+>
+| <INTEGERVAL: (<MINUS>)? (<DIGIT>)+>
+| <FLOATVAL: (<MINUS>)? (<DIGIT>)* <PERIOD> (<DIGIT>)+ (["e","E"] (["+","-"])? (<DIGIT>)+)?>
+| <STRINGVAL: ("N" | "E")? "\'" ("\'\'" | ~["\'"])* "\'">
+| <#LETTER: ["a"-"z","A"-"Z"] | ["\u0153"-"\ufffd"]>
+| <#DIGIT: ["0"-"9"]>
+}
+
+</para></entry></row>
+<row><entry><para>
+<DEFAULT> TOKEN : {
+<COMMA: ",">
+| <PERIOD: ".">
+| <LPAREN: "(">
+| <RPAREN: ")">
+| <LBRACE: "{">
+| <RBRACE: "}">
+| <LSBRACE: "[">
+| <RSBRACE: "]">
+| <EQ: "=">
+| <NE: "<>">
+| <NE2: "!=">
+| <LT: "<">
+| <LE: "<=">
+| <GT: ">">
+| <GE: ">=">
+| <STAR: "*">
+| <SLASH: "/">
+| <PLUS: "+">
+| <MINUS: "-">
+| <QMARK: "?">
+| <DOLLAR: "$">
+| <SEMICOLON: ";">
+| <CONCAT_OP: "||">
+}
+
+</para></entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+</section>
+<section>
+<title>NON-TERMINALS</title>
+<informaltable frame="none">
+<tgroup cols="2">
+<colspec colname="c1" colwidth=".33*"/>
+<colspec colname="c2" colwidth="*"/>
+<tbody>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod1" xreflabel="stringVal"/>stringVal</para></entry>
+<entry align="left" valign="top"><para>::=
+( <STRINGVAL> )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod2" xreflabel="id"/>id</para></entry>
+<entry align="left" valign="top"><para>::=
+( <ID> )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod3" xreflabel="command"/>command</para></entry>
+<entry align="left" valign="top"><para>::=
+( <link linkend="prod4">createUpdateProcedure</link> | <link linkend="prod5">userCommand</link> | <link linkend="prod6">callableStatement</link> ) ( <SEMICOLON> )? <EOF></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod7" xreflabel="designerCommand"/>designerCommand</para></entry>
+<entry align="left" valign="top"><para>::=
+( <link linkend="prod8">updateProcedure</link> | <link linkend="prod5">userCommand</link> ) ( <SEMICOLON> )? <EOF></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod8" xreflabel="updateProcedure"/>updateProcedure</para></entry>
+<entry align="left" valign="top"><para>::=
+( <link linkend="prod4">createUpdateProcedure</link> | <link linkend="prod9">forEachRowTriggerAction</link> ) <EOF></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod10" xreflabel="createTrigger"/>createTrigger</para></entry>
+<entry align="left" valign="top"><para>::=
+<CREATE> <TRIGGER> <ON> <link linkend="prod2">id</link> <link linkend="prod11">nonReserved</link> <OF> ( <INSERT> | <UPDATE> | <DELETE> ) <AS> <link linkend="prod9">forEachRowTriggerAction</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod12" xreflabel="alter"/>alter</para></entry>
+<entry align="left" valign="top"><para>::=
+<ALTER> ( ( <link linkend="prod11">nonReserved</link> <link linkend="prod2">id</link> <AS> <link linkend="prod13">queryExpression</link> ) | ( <PROCEDURE> <link linkend="prod2">id</link> <AS> <link linkend="prod14">block</link> ) | ( <TRIGGER> <ON> <link linkend="prod2">id</link> <link linkend="prod11">nonReserved</link> <OF> ( <INSERT> | <UPDATE> | <DELETE> ) ( ( <AS> <link linkend="prod9">forEachRowTriggerAction</link> ) | <link linkend="prod11">nonReserved</link> ) ) )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod9" xreflabel="forEachRowTriggerAction"/>forEachRowTriggerAction</para></entry>
+<entry align="left" valign="top"><para>::=
+<FOR> <EACH> <ROW> <link linkend="prod14">block</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod5" xreflabel="userCommand"/>userCommand</para></entry>
+<entry align="left" valign="top"><para>::=
+( <link linkend="prod13">queryExpression</link> | <link linkend="prod15">storedProcedure</link> | <link linkend="prod16">insert</link> | <link linkend="prod17">update</link> | <link linkend="prod18">delete</link> | <link linkend="prod19">dropTable</link> | <link linkend="prod20">createTempTable</link> | <link linkend="prod12">alter</link> | <link linkend="prod10">createTrigger</link> )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod19" xreflabel="dropTable"/>dropTable</para></entry>
+<entry align="left" valign="top"><para>::=
+<DROP> <TABLE> <link linkend="prod2">id</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod20" xreflabel="createTempTable"/>createTempTable</para></entry>
+<entry align="left" valign="top"><para>::=
+<CREATE> <LOCAL> <TEMPORARY> <TABLE> <link linkend="prod2">id</link> <LPAREN> <link linkend="prod21">tableElement</link> ( <COMMA> <link linkend="prod21">tableElement</link> )* ( <COMMA> <PRIMARY> <link linkend="prod11">nonReserved</link> <LPAREN> <link linkend="prod2">id</link> ( <COMMA> <link linkend="prod2">id</link> )* <RPAREN> )? <RPAREN></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod21" xreflabel="tableElement"/>tableElement</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod2">id</link> ( <link linkend="prod22">dataTypeString</link> | <link linkend="prod11">nonReserved</link> ) ( <NOT> <NULL> )?</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod23" xreflabel="errorStatement"/>errorStatement</para></entry>
+<entry align="left" valign="top"><para>::=
+<ERROR> <link linkend="prod24">expression</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod25" xreflabel="statement"/>statement</para></entry>
+<entry align="left" valign="top"><para>::=
+( <link linkend="prod26">ifStatement</link> | <link linkend="prod27">loopStatement</link> | <link linkend="prod28">whileStatement</link> | <link linkend="prod29">delimitedStatement</link> )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod29" xreflabel="delimitedStatement"/>delimitedStatement</para></entry>
+<entry align="left" valign="top"><para>::=
+( <link linkend="prod30">assignStatement</link> | <link linkend="prod31">sqlStatement</link> | <link linkend="prod23">errorStatement</link> | <link linkend="prod32">declareStatement</link> | <link linkend="prod33">continueStatement</link> | <link linkend="prod34">breakStatement</link> ) <SEMICOLON></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod14" xreflabel="block"/>block</para></entry>
+<entry align="left" valign="top"><para>::=
+( <link linkend="prod25">statement</link> | ( <BEGIN> ( <link linkend="prod25">statement</link> )* <END> ) )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod34" xreflabel="breakStatement"/>breakStatement</para></entry>
+<entry align="left" valign="top"><para>::=
+<BREAK></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod33" xreflabel="continueStatement"/>continueStatement</para></entry>
+<entry align="left" valign="top"><para>::=
+<CONTINUE></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod28" xreflabel="whileStatement"/>whileStatement</para></entry>
+<entry align="left" valign="top"><para>::=
+<WHILE> <LPAREN> <link linkend="prod35">criteria</link> <RPAREN> <link linkend="prod14">block</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod27" xreflabel="loopStatement"/>loopStatement</para></entry>
+<entry align="left" valign="top"><para>::=
+<LOOP> <ON> <LPAREN> <link linkend="prod13">queryExpression</link> <RPAREN> <AS> <link linkend="prod2">id</link> <link linkend="prod14">block</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod26" xreflabel="ifStatement"/>ifStatement</para></entry>
+<entry align="left" valign="top"><para>::=
+<IF> <LPAREN> <link linkend="prod35">criteria</link> <RPAREN> <link linkend="prod14">block</link> ( <ELSE> <link linkend="prod14">block</link> )?</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod36" xreflabel="criteriaSelector"/>criteriaSelector</para></entry>
+<entry align="left" valign="top"><para>::=
+( ( <EQ> | <NE> | <NE2> | <LE> | <GE> | <LT> | <GT> | <IN> | <LIKE> | ( <IS> <NULL> ) | <BETWEEN> ) )? <CRITERIA> ( <ON> <LPAREN> <link linkend="prod2">id</link> ( <COMMA> <link linkend="prod2">id</link> )* <RPAREN> )?</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod37" xreflabel="hasCriteria"/>hasCriteria</para></entry>
+<entry align="left" valign="top"><para>::=
+<HAS> <link linkend="prod36">criteriaSelector</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod32" xreflabel="declareStatement"/>declareStatement</para></entry>
+<entry align="left" valign="top"><para>::=
+<DECLARE> <link linkend="prod38">dataType</link> <link linkend="prod2">id</link> ( ( <link linkend="prod11">nonReserved</link> | <EQ> ) <link linkend="prod39">assignStatementOperand</link> )?</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod30" xreflabel="assignStatement"/>assignStatement</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod2">id</link> ( <link linkend="prod11">nonReserved</link> | <EQ> ) <link linkend="prod39">assignStatementOperand</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod39" xreflabel="assignStatementOperand"/>assignStatementOperand</para></entry>
+<entry align="left" valign="top"><para>::=
+( ( <link linkend="prod16">insert</link> ) | <link linkend="prod17">update</link> | <link linkend="prod18">delete</link> | ( <link linkend="prod24">expression</link> ) | <link linkend="prod13">queryExpression</link> )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod31" xreflabel="sqlStatement"/>sqlStatement</para></entry>
+<entry align="left" valign="top"><para>::=
+( ( <link linkend="prod5">userCommand</link> ) | <link linkend="prod40">dynamicCommand</link> | ( <link linkend="prod2">id</link> ( <link linkend="prod11">nonReserved</link> | <EQ> ) <link linkend="prod15">storedProcedure</link> ) )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod41" xreflabel="translateCriteria"/>translateCriteria</para></entry>
+<entry align="left" valign="top"><para>::=
+<TRANSLATE> <link linkend="prod36">criteriaSelector</link> ( <WITH> <LPAREN> <link linkend="prod2">id</link> <EQ> <link linkend="prod24">expression</link> ( <COMMA> <link linkend="prod2">id</link> <EQ> <link linkend="prod24">expression</link> )* <RPAREN> )?</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod4" xreflabel="createUpdateProcedure"/>createUpdateProcedure</para></entry>
+<entry align="left" valign="top"><para>::=
+<CREATE> ( <VIRTUAL> )? ( <UPDATE> )? <PROCEDURE> <link linkend="prod14">block</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod40" xreflabel="dynamicCommand"/>dynamicCommand</para></entry>
+<entry align="left" valign="top"><para>::=
+( <EXECUTE> | <EXEC> ) ( ( <STRING> | <IMMEDIATE> ) )? <link linkend="prod24">expression</link> ( <AS> <link linkend="prod42">createElementsWithTypes</link> ( <INTO> <link linkend="prod2">id</link> )? )? ( <USING> <link linkend="prod43">setClauseList</link> )? ( <UPDATE> ( ( <INTEGERVAL> ) | ( <STAR> ) ) )?</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod43" xreflabel="setClauseList"/>setClauseList</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod2">id</link> <EQ> ( <COMMA> <link linkend="prod2">id</link> <EQ> )*</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod42" xreflabel="createElementsWithTypes"/>createElementsWithTypes</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod2">id</link> <link linkend="prod22">dataTypeString</link> ( <COMMA> <link linkend="prod2">id</link> <link linkend="prod22">dataTypeString</link> )*</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod6" xreflabel="callableStatement"/>callableStatement</para></entry>
+<entry align="left" valign="top"><para>::=
+<LBRACE> ( <QMARK> <EQ> )? <CALL> <link linkend="prod2">id</link> ( <LPAREN> ( <link linkend="prod44">executeUnnamedParams</link> ) <RPAREN> )? <RBRACE> ( <link linkend="prod45">option</link> )?</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod15" xreflabel="storedProcedure"/>storedProcedure</para></entry>
+<entry align="left" valign="top"><para>::=
+( ( <EXEC> | <EXECUTE> | <CALL> ) <link linkend="prod2">id</link> <LPAREN> ( <link linkend="prod46">executeNamedParams</link> | <link linkend="prod44">executeUnnamedParams</link> ) <RPAREN> ) ( <link linkend="prod45">option</link> )?</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod44" xreflabel="executeUnnamedParams"/>executeUnnamedParams</para></entry>
+<entry align="left" valign="top"><para>::=
+( <link linkend="prod24">expression</link> ( <COMMA> <link linkend="prod24">expression</link> )* )?</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod46" xreflabel="executeNamedParams"/>executeNamedParams</para></entry>
+<entry align="left" valign="top"><para>::=
+( <link linkend="prod2">id</link> <EQ> ( <GT> )? <link linkend="prod24">expression</link> ( <COMMA> <link linkend="prod2">id</link> <EQ> ( <GT> )? <link linkend="prod24">expression</link> )* )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod16" xreflabel="insert"/>insert</para></entry>
+<entry align="left" valign="top"><para>::=
+<INSERT> <INTO> <link linkend="prod2">id</link> ( <link linkend="prod47">columnList</link> )? ( ( <VALUES> <link linkend="prod48">rowValues</link> ) | ( <link linkend="prod13">queryExpression</link> ) ) ( <link linkend="prod45">option</link> )?</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod47" xreflabel="columnList"/>columnList</para></entry>
+<entry align="left" valign="top"><para>::=
+<LPAREN> <link linkend="prod2">id</link> ( <COMMA> <link linkend="prod2">id</link> )* <RPAREN></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod48" xreflabel="rowValues"/>rowValues</para></entry>
+<entry align="left" valign="top"><para>::=
+<LPAREN> <link linkend="prod24">expression</link> ( <COMMA> <link linkend="prod24">expression</link> )* <RPAREN></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod17" xreflabel="update"/>update</para></entry>
+<entry align="left" valign="top"><para>::=
+<UPDATE> <link linkend="prod2">id</link> <SET> <link linkend="prod43">setClauseList</link> ( <link linkend="prod49">where</link> )? ( <link linkend="prod45">option</link> )?</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod18" xreflabel="delete"/>delete</para></entry>
+<entry align="left" valign="top"><para>::=
+<DELETE> <FROM> <link linkend="prod2">id</link> ( <link linkend="prod49">where</link> )? ( <link linkend="prod45">option</link> )?</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod13" xreflabel="queryExpression"/>queryExpression</para></entry>
+<entry align="left" valign="top"><para>::=
+( <WITH> <link linkend="prod50">withListElement</link> ( <COMMA> <link linkend="prod50">withListElement</link> )* )? <link linkend="prod51">queryExpressionBody</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod50" xreflabel="withListElement"/>withListElement</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod2">id</link> ( <link linkend="prod47">columnList</link> )? <AS> <LPAREN> <link linkend="prod13">queryExpression</link> <RPAREN></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod51" xreflabel="queryExpressionBody"/>queryExpressionBody</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod52">queryTerm</link> ( ( <UNION> | <EXCEPT> ) ( <ALL> | <DISTINCT> )? <link linkend="prod52">queryTerm</link> )* ( <link linkend="prod53">orderby</link> )? ( <link linkend="prod54">limit</link> )? ( <link linkend="prod45">option</link> )?</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod52" xreflabel="queryTerm"/>queryTerm</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod55">queryPrimary</link> ( <INTERSECT> ( <ALL> | <DISTINCT> )? <link linkend="prod55">queryPrimary</link> )*</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod55" xreflabel="queryPrimary"/>queryPrimary</para></entry>
+<entry align="left" valign="top"><para>::=
+( <link linkend="prod56">query</link> | ( <TABLE> <link linkend="prod2">id</link> ) | ( <LPAREN> <link linkend="prod51">queryExpressionBody</link> <RPAREN> ) )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod56" xreflabel="query"/>query</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod57">select</link> ( <link linkend="prod58">into</link> )? ( <link linkend="prod59">from</link> ( <link linkend="prod49">where</link> )? ( <link linkend="prod60">groupBy</link> )? ( <link linkend="prod61">having</link> )? )?</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod58" xreflabel="into"/>into</para></entry>
+<entry align="left" valign="top"><para>::=
+<INTO> ( <link linkend="prod2">id</link> )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod57" xreflabel="select"/>select</para></entry>
+<entry align="left" valign="top"><para>::=
+<SELECT> ( <ALL> | ( <DISTINCT> ) )? ( <STAR> | ( <link linkend="prod62">selectSymbol</link> ( <COMMA> <link linkend="prod62">selectSymbol</link> )* ) )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod62" xreflabel="selectSymbol"/>selectSymbol</para></entry>
+<entry align="left" valign="top"><para>::=
+( <link linkend="prod63">selectExpression</link> | <link linkend="prod64">allInGroupSymbol</link> )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod63" xreflabel="selectExpression"/>selectExpression</para></entry>
+<entry align="left" valign="top"><para>::=
+( <link linkend="prod24">expression</link> ( ( <AS> )? <link linkend="prod2">id</link> )? )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod65" xreflabel="derivedColumn"/>derivedColumn</para></entry>
+<entry align="left" valign="top"><para>::=
+( <link linkend="prod24">expression</link> ( <AS> <link linkend="prod2">id</link> )? )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod64" xreflabel="allInGroupSymbol"/>allInGroupSymbol</para></entry>
+<entry align="left" valign="top"><para>::=
+<ALL_IN_GROUP></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod66" xreflabel="xmlAgg"/>xmlAgg</para></entry>
+<entry align="left" valign="top"><para>::=
+<XMLAGG> <LPAREN> <link linkend="prod24">expression</link> ( <link linkend="prod53">orderby</link> )? <RPAREN></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod67" xreflabel="arrayAgg"/>arrayAgg</para></entry>
+<entry align="left" valign="top"><para>::=
+<ARRAY_AGG> <LPAREN> <link linkend="prod24">expression</link> ( <link linkend="prod53">orderby</link> )? <RPAREN></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod68" xreflabel="textAgg"/>textAgg</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod11">nonReserved</link> <LPAREN> <FOR> <link linkend="prod65">derivedColumn</link> ( <COMMA> <link linkend="prod65">derivedColumn</link> )* ( <ID> <link linkend="prod69">charVal</link> )? ( ( <ID> <link linkend="prod69">charVal</link> ) )? ( <ID> )? ( ( <ID> <link linkend="prod2">id</link> ) )? ( <link linkend="prod53">orderby</link> )? <RPAREN></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod70" xreflabel="aggregateSymbol"/>aggregateSymbol</para></entry>
+<entry align="left" valign="top"><para>::=
+( ( <link linkend="prod11">nonReserved</link> <LPAREN> <STAR> <RPAREN> ) | ( ( <link linkend="prod11">nonReserved</link> | <ANY> | <SOME> ) <LPAREN> ( <DISTINCT> | <ALL> )? <link linkend="prod24">expression</link> <RPAREN> ) )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod59" xreflabel="from"/>from</para></entry>
+<entry align="left" valign="top"><para>::=
+<FROM> ( <link linkend="prod71">tableReference</link> ( <COMMA> <link linkend="prod71">tableReference</link> )* )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod71" xreflabel="tableReference"/>tableReference</para></entry>
+<entry align="left" valign="top"><para>::=
+( ( <LBRACE> <link linkend="prod11">nonReserved</link> <link linkend="prod72">joinedTable</link> <RBRACE> ) | <link linkend="prod72">joinedTable</link> )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod72" xreflabel="joinedTable"/>joinedTable</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod73">tablePrimary</link> ( ( <link linkend="prod74">crossJoin</link> | <link linkend="prod75">qualifiedJoin</link> ) )*</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod74" xreflabel="crossJoin"/>crossJoin</para></entry>
+<entry align="left" valign="top"><para>::=
+( ( <CROSS> | <UNION> ) <JOIN> <link linkend="prod73">tablePrimary</link> )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod75" xreflabel="qualifiedJoin"/>qualifiedJoin</para></entry>
+<entry align="left" valign="top"><para>::=
+( ( ( <RIGHT> ( <OUTER> )? ) | ( <LEFT> ( <OUTER> )? ) | ( <FULL> ( <OUTER> )? ) | <INNER> )? <JOIN> <link linkend="prod71">tableReference</link> <ON> <link linkend="prod35">criteria</link> )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod73" xreflabel="tablePrimary"/>tablePrimary</para></entry>
+<entry align="left" valign="top"><para>::=
+( <link linkend="prod76">textTable</link> | <link linkend="prod77">arrayTable</link> | <link linkend="prod78">xmlTable</link> | <link linkend="prod79">unaryFromClause</link> | <link linkend="prod80">subqueryFromClause</link> | ( <LPAREN> <link linkend="prod72">joinedTable</link> <RPAREN> ) ) ( ( <MAKEDEP> ) | ( <MAKENOTDEP> ) )?</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod81" xreflabel="xmlSerialize"/>xmlSerialize</para></entry>
+<entry align="left" valign="top"><para>::=
+<XMLSERIALIZE> <LPAREN> ( <link linkend="prod11">nonReserved</link> )? <link linkend="prod24">expression</link> ( <AS> ( <STRING> | <VARCHAR> | <CLOB> ) )? <RPAREN></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod11" xreflabel="nonReserved"/>nonReserved</para></entry>
+<entry align="left" valign="top"><para>::=
+<ID></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod77" xreflabel="arrayTable"/>arrayTable</para></entry>
+<entry align="left" valign="top"><para>::=
+<ID> <LPAREN> <link linkend="prod24">expression</link> <link linkend="prod11">nonReserved</link> <link linkend="prod42">createElementsWithTypes</link> <RPAREN> ( <AS> )? <link linkend="prod2">id</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod76" xreflabel="textTable"/>textTable</para></entry>
+<entry align="left" valign="top"><para>::=
+<ID> <LPAREN> <link linkend="prod24">expression</link> <link linkend="prod11">nonReserved</link> <link linkend="prod82">textColumn</link> ( <COMMA> <link linkend="prod82">textColumn</link> )* ( <ID> <link linkend="prod69">charVal</link> )? ( ( <ESCAPE> <link linkend="prod69">charVal</link> ) | ( <ID> <link linkend="prod69">charVal</link> ) )? ( <ID> ( <link linkend="prod83">intVal</link> )? )? ( <ID> <link linkend="prod83">intVal</link> )? <RPAREN> ( <AS> )? <link linkend="prod2">id</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod82" xreflabel="textColumn"/>textColumn</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod2">id</link> <link linkend="prod38">dataType</link> ( <ID> <link linkend="prod83">intVal</link> )?</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod84" xreflabel="xmlQuery"/>xmlQuery</para></entry>
+<entry align="left" valign="top"><para>::=
+<XMLQUERY> <LPAREN> ( <link linkend="prod85">xmlNamespaces</link> <COMMA> )? <link linkend="prod1">stringVal</link> ( <ID> <link linkend="prod65">derivedColumn</link> ( <COMMA> <link linkend="prod65">derivedColumn</link> )* )? ( ( <NULL> | <link linkend="prod11">nonReserved</link> ) <ON> <link linkend="prod11">nonReserved</link> )? <RPAREN></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod78" xreflabel="xmlTable"/>xmlTable</para></entry>
+<entry align="left" valign="top"><para>::=
+<XMLTABLE> <LPAREN> ( <link linkend="prod85">xmlNamespaces</link> <COMMA> )? <link linkend="prod1">stringVal</link> ( <ID> <link linkend="prod65">derivedColumn</link> ( <COMMA> <link linkend="prod65">derivedColumn</link> )* )? ( <ID> <link linkend="prod86">xmlColumn</link> ( <COMMA> <link linkend="prod86">xmlColumn</link> )* )? <RPAREN> ( <AS> )? <link linkend="prod2">id</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod86" xreflabel="xmlColumn"/>xmlColumn</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod2">id</link> ( ( <FOR> <link linkend="prod11">nonReserved</link> ) | ( <link linkend="prod38">dataType</link> ( <DEFAULT_KEYWORD> <link linkend="prod24">expression</link> )? ( <link linkend="prod11">nonReserved</link> <link linkend="prod1">stringVal</link> )? ) )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod83" xreflabel="intVal"/>intVal</para></entry>
+<entry align="left" valign="top"><para>::=
+<INTEGERVAL></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod80" xreflabel="subqueryFromClause"/>subqueryFromClause</para></entry>
+<entry align="left" valign="top"><para>::=
+( <TABLE> )? <LPAREN> ( <link linkend="prod13">queryExpression</link> | <link linkend="prod15">storedProcedure</link> ) <RPAREN> ( <AS> )? <link linkend="prod2">id</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod79" xreflabel="unaryFromClause"/>unaryFromClause</para></entry>
+<entry align="left" valign="top"><para>::=
+( <ID> ( ( <AS> )? <link linkend="prod2">id</link> )? )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod49" xreflabel="where"/>where</para></entry>
+<entry align="left" valign="top"><para>::=
+<WHERE> <link linkend="prod35">criteria</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod35" xreflabel="criteria"/>criteria</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod87">compoundCritOr</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod87" xreflabel="compoundCritOr"/>compoundCritOr</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod88">compoundCritAnd</link> ( <OR> <link linkend="prod88">compoundCritAnd</link> )*</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod88" xreflabel="compoundCritAnd"/>compoundCritAnd</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod89">notCrit</link> ( <AND> <link linkend="prod89">notCrit</link> )*</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod89" xreflabel="notCrit"/>notCrit</para></entry>
+<entry align="left" valign="top"><para>::=
+( <NOT> )? <link linkend="prod90">booleanPrimary</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod90" xreflabel="booleanPrimary"/>booleanPrimary</para></entry>
+<entry align="left" valign="top"><para>::=
+( <link linkend="prod41">translateCriteria</link> | ( <link linkend="prod91">commonValueExpression</link> ( ( <link linkend="prod92">betweenCrit</link> | <link linkend="prod93">matchCrit</link> | <link linkend="prod94">setCrit</link> | <link linkend="prod95">isNullCrit</link> | <link linkend="prod96">subqueryCompareCriteria</link> | <link linkend="prod97">compareCrit</link> ) )? ) | <link linkend="prod98">existsCriteria</link> | <link linkend="prod37">hasCriteria</link> )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod99" xreflabel="operator"/>operator</para></entry>
+<entry align="left" valign="top"><para>::=
+( <EQ> | <NE> | <NE2> | <LT> | <LE> | <GT> | <GE> )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod97" xreflabel="compareCrit"/>compareCrit</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod99">operator</link> <link linkend="prod91">commonValueExpression</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod100" xreflabel="subquery"/>subquery</para></entry>
+<entry align="left" valign="top"><para>::=
+<LPAREN> ( <link linkend="prod13">queryExpression</link> | ( <link linkend="prod15">storedProcedure</link> ) ) <RPAREN></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod101" xreflabel="subqueryAndHint"/>subqueryAndHint</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod100">subquery</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod96" xreflabel="subqueryCompareCriteria"/>subqueryCompareCriteria</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod99">operator</link> ( <ANY> | <SOME> | <ALL> ) <link linkend="prod100">subquery</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod93" xreflabel="matchCrit"/>matchCrit</para></entry>
+<entry align="left" valign="top"><para>::=
+( <NOT> )? <LIKE> <link linkend="prod91">commonValueExpression</link> ( <ESCAPE> <link linkend="prod69">charVal</link> | ( <LBRACE> <ESCAPE> <link linkend="prod69">charVal</link> <RBRACE> ) )?</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod69" xreflabel="charVal"/>charVal</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod1">stringVal</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod92" xreflabel="betweenCrit"/>betweenCrit</para></entry>
+<entry align="left" valign="top"><para>::=
+( <NOT> )? <BETWEEN> <link linkend="prod91">commonValueExpression</link> <AND> <link linkend="prod91">commonValueExpression</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod95" xreflabel="isNullCrit"/>isNullCrit</para></entry>
+<entry align="left" valign="top"><para>::=
+<IS> ( <NOT> )? <NULL></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod94" xreflabel="setCrit"/>setCrit</para></entry>
+<entry align="left" valign="top"><para>::=
+( <NOT> )? <IN> ( ( <link linkend="prod101">subqueryAndHint</link> ) | ( <LPAREN> <link linkend="prod91">commonValueExpression</link> ( <COMMA> <link linkend="prod91">commonValueExpression</link> )* <RPAREN> ) )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod98" xreflabel="existsCriteria"/>existsCriteria</para></entry>
+<entry align="left" valign="top"><para>::=
+<EXISTS> <link linkend="prod101">subqueryAndHint</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod60" xreflabel="groupBy"/>groupBy</para></entry>
+<entry align="left" valign="top"><para>::=
+<GROUP> <BY> ( <link linkend="prod102">groupByItem</link> ( <COMMA> <link linkend="prod102">groupByItem</link> )* )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod102" xreflabel="groupByItem"/>groupByItem</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod24">expression</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod61" xreflabel="having"/>having</para></entry>
+<entry align="left" valign="top"><para>::=
+<HAVING> <link linkend="prod35">criteria</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod53" xreflabel="orderby"/>orderby</para></entry>
+<entry align="left" valign="top"><para>::=
+<ORDER> <BY> <link linkend="prod103">sortSpecification</link> ( <COMMA> <link linkend="prod103">sortSpecification</link> )*</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod103" xreflabel="sortSpecification"/>sortSpecification</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod104">sortKey</link> ( <ASC> | <DESC> )? ( <link linkend="prod11">nonReserved</link> <link linkend="prod11">nonReserved</link> )?</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod104" xreflabel="sortKey"/>sortKey</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod24">expression</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod54" xreflabel="limit"/>limit</para></entry>
+<entry align="left" valign="top"><para>::=
+<LIMIT> ( <INTEGERVAL> | <QMARK> ) ( <COMMA> ( <INTEGERVAL> | <QMARK> ) )?</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod45" xreflabel="option"/>option</para></entry>
+<entry align="left" valign="top"><para>::=
+<OPTION> ( <MAKEDEP> <link linkend="prod2">id</link> ( <COMMA> <link linkend="prod2">id</link> )* | <MAKENOTDEP> <link linkend="prod2">id</link> ( <COMMA> <link linkend="prod2">id</link> )* | <NOCACHE> ( <link linkend="prod2">id</link> ( <COMMA> <link linkend="prod2">id</link> )* )? )*</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod24" xreflabel="expression"/>expression</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod35">criteria</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod91" xreflabel="commonValueExpression"/>commonValueExpression</para></entry>
+<entry align="left" valign="top"><para>::=
+( <link linkend="prod105">plusExpression</link> ( <CONCAT_OP> <link linkend="prod105">plusExpression</link> )* )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod105" xreflabel="plusExpression"/>plusExpression</para></entry>
+<entry align="left" valign="top"><para>::=
+( <link linkend="prod106">timesExpression</link> ( <link linkend="prod107">plusOperator</link> <link linkend="prod106">timesExpression</link> )* )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod107" xreflabel="plusOperator"/>plusOperator</para></entry>
+<entry align="left" valign="top"><para>::=
+( <PLUS> | <MINUS> )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod106" xreflabel="timesExpression"/>timesExpression</para></entry>
+<entry align="left" valign="top"><para>::=
+( <link linkend="prod108">valueExpressionPrimary</link> ( <link linkend="prod109">timesOperator</link> <link linkend="prod108">valueExpressionPrimary</link> )* )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod109" xreflabel="timesOperator"/>timesOperator</para></entry>
+<entry align="left" valign="top"><para>::=
+( <STAR> | <SLASH> )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod108" xreflabel="valueExpressionPrimary"/>valueExpressionPrimary</para></entry>
+<entry align="left" valign="top"><para>::=
+( <QMARK> | <POS_REF> | <link linkend="prod110">literal</link> | ( <LBRACE> <link linkend="prod11">nonReserved</link> <link linkend="prod111">function</link> <RBRACE> ) | ( <link linkend="prod68">textAgg</link> ) | ( <link linkend="prod70">aggregateSymbol</link> ) | ( <link linkend="prod70">aggregateSymbol</link> ) | ( <link linkend="prod70">aggregateSymbol</link> ) | ( <link linkend="prod66">xmlAgg</link> ) | ( <link linkend="prod67">arrayAgg</link> ) | ( <link linkend="prod111">function</link> ) | ( <ID> ( <LSBRACE> <link linkend="prod83">intVal</link> <RSBRACE> )? ) | <link linkend="prod100">subquery</link> | ( <LPAREN> <link linkend="prod24">expression</link> <RPAREN> ( <LSBRACE> <link linkend="prod83">intVal</link> <RSBRACE> )? ) | <link linkend="prod112">searchedCaseExpression</link> | <link linkend="prod113">caseExpression</link> )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod113" xreflabel="caseExpression"/>caseExpression</para></entry>
+<entry align="left" valign="top"><para>::=
+<CASE> <link linkend="prod24">expression</link> ( <WHEN> <link linkend="prod24">expression</link> <THEN> <link linkend="prod24">expression</link> )+ ( <ELSE> <link linkend="prod24">expression</link> )? <END></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod112" xreflabel="searchedCaseExpression"/>searchedCaseExpression</para></entry>
+<entry align="left" valign="top"><para>::=
+<CASE> ( <WHEN> <link linkend="prod35">criteria</link> <THEN> <link linkend="prod24">expression</link> )+ ( <ELSE> <link linkend="prod24">expression</link> )? <END></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod111" xreflabel="function"/>function</para></entry>
+<entry align="left" valign="top"><para>::=
+( ( <CONVERT> <LPAREN> <link linkend="prod24">expression</link> <COMMA> <link linkend="prod38">dataType</link> <RPAREN> ) | ( <CAST> <LPAREN> <link linkend="prod24">expression</link> <AS> <link linkend="prod38">dataType</link> <RPAREN> ) | ( <link linkend="prod11">nonReserved</link> <LPAREN> <link linkend="prod24">expression</link> <COMMA> <link linkend="prod114">stringConstant</link> <RPAREN> ) | ( <link linkend="prod11">nonReserved</link> <LPAREN> <link linkend="prod115">intervalType</link> <COMMA> <link linkend="prod24">expression</link> <COMMA> <link linkend="prod24">expression</link> <RPAREN> ) | <link linkend="prod116">queryString</link> | ( ( <LEFT> | <RIGHT> | <CHAR> | <USER> | <YEAR> | <MONTH> | <HOUR> | <MINUTE> | <SECOND> | <XMLCONCAT> | <XMLCOMMENT> ) <LPAREN> ( <link linkend="prod24">expression</link> !
( <COMMA> <link linkend="prod24">expression</link> )* )? <RPAREN> ) | ( ( <INSERT> ) <LPAREN> ( <link linkend="prod24">expression</link> ( <COMMA> <link linkend="prod24">expression</link> )* )? <RPAREN> ) | ( ( <TRANSLATE> ) <LPAREN> ( <link linkend="prod24">expression</link> ( <COMMA> <link linkend="prod24">expression</link> )* )? <RPAREN> ) | <link linkend="prod117">xmlParse</link> | <link linkend="prod118">xmlElement</link> | ( <XMLPI> <LPAREN> ( <ID> <link linkend="prod119">idExpression</link> | <link linkend="prod119">idExpression</link> ) ( <COMMA> <link linkend="prod24">expression</link> )? <RPAREN> ) | <link linkend="prod120">xmlForest</link> | <link linkend="prod81">xmlSerialize</link> | <link linkend="prod84">xmlQuery</link> | ( <link linkend="prod2">id</link> <LPAREN> ( <link linkend="prod24">expression</link> ( <COMMA> <link linkend="prod24">expression</link> )*!
)? <RPAREN> ) )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod114" xreflabel="stringConstant"/>stringConstant</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod1">stringVal</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod117" xreflabel="xmlParse"/>xmlParse</para></entry>
+<entry align="left" valign="top"><para>::=
+<XMLPARSE> <LPAREN> <link linkend="prod11">nonReserved</link> <link linkend="prod24">expression</link> ( <link linkend="prod11">nonReserved</link> )? <RPAREN></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod116" xreflabel="queryString"/>queryString</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod11">nonReserved</link> <LPAREN> <link linkend="prod24">expression</link> ( <COMMA> <link linkend="prod65">derivedColumn</link> )* <RPAREN></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod118" xreflabel="xmlElement"/>xmlElement</para></entry>
+<entry align="left" valign="top"><para>::=
+<XMLELEMENT> <LPAREN> ( <ID> <link linkend="prod2">id</link> | <link linkend="prod2">id</link> ) ( <COMMA> <link linkend="prod85">xmlNamespaces</link> )? ( <COMMA> <link linkend="prod121">xmlAttributes</link> )? ( <COMMA> <link linkend="prod24">expression</link> )* <RPAREN></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod121" xreflabel="xmlAttributes"/>xmlAttributes</para></entry>
+<entry align="left" valign="top"><para>::=
+<XMLATTRIBUTES> <LPAREN> <link linkend="prod65">derivedColumn</link> ( <COMMA> <link linkend="prod65">derivedColumn</link> )* <RPAREN></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod120" xreflabel="xmlForest"/>xmlForest</para></entry>
+<entry align="left" valign="top"><para>::=
+<XMLFOREST> <LPAREN> ( <link linkend="prod85">xmlNamespaces</link> <COMMA> )? <link linkend="prod65">derivedColumn</link> ( <COMMA> <link linkend="prod65">derivedColumn</link> )* <RPAREN></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod85" xreflabel="xmlNamespaces"/>xmlNamespaces</para></entry>
+<entry align="left" valign="top"><para>::=
+<XMLNAMESPACES> <LPAREN> <link linkend="prod122">namespaceItem</link> ( <COMMA> <link linkend="prod122">namespaceItem</link> )* <RPAREN></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod122" xreflabel="namespaceItem"/>namespaceItem</para></entry>
+<entry align="left" valign="top"><para>::=
+( <link linkend="prod1">stringVal</link> <AS> <link linkend="prod2">id</link> )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para></para></entry>
+<entry align="left" valign="top"><para>::=
+( <NO> <DEFAULT_KEYWORD> )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para></para></entry>
+<entry align="left" valign="top"><para>::=
+( <DEFAULT_KEYWORD> <link linkend="prod1">stringVal</link> )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod119" xreflabel="idExpression"/>idExpression</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod2">id</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod22" xreflabel="dataTypeString"/>dataTypeString</para></entry>
+<entry align="left" valign="top"><para>::=
+( <STRING> | <VARCHAR> | <BOOLEAN> | <BYTE> | <TINYINT> | <SHORT> | <SMALLINT> | <CHAR> | <INTEGER> | <LONG> | <BIGINT> | <BIGINTEGER> | <FLOAT> | <REAL> | <DOUBLE> | <BIGDECIMAL> | <DECIMAL> | <DATE> | <TIME> | <TIMESTAMP> | <OBJECT> | <BLOB> | <CLOB> | <XML> )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod38" xreflabel="dataType"/>dataType</para></entry>
+<entry align="left" valign="top"><para>::=
+<link linkend="prod22">dataTypeString</link></para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod115" xreflabel="intervalType"/>intervalType</para></entry>
+<entry align="left" valign="top"><para>::=
+( <link linkend="prod11">nonReserved</link> )</para></entry></row>
+<row>
+<entry align="right" valign="top"><para><anchor id="prod110" xreflabel="literal"/>literal</para></entry>
+<entry align="left" valign="top"><para>::=
+( <link linkend="prod1">stringVal</link> | <INTEGERVAL> | <FLOATVAL> | <FALSE> | <TRUE> | <UNKNOWN> | <NULL> | ( ( <BOOLEANTYPE> | <TIMESTAMPTYPE> | <DATETYPE> | <TIMETYPE> ) <link linkend="prod1">stringVal</link> <RBRACE> ) )</para></entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+</section>
+</appendix>
Deleted: tags/teiid-parent-7.4.0.CR1/documentation/reference/src/main/docbook/en-US/content/system_schema.xml
===================================================================
--- trunk/documentation/reference/src/main/docbook/en-US/content/system_schema.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/documentation/reference/src/main/docbook/en-US/content/system_schema.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,1846 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % CustomDTD SYSTEM "../../../../../../docbook/custom.dtd">
-%CustomDTD;
-]>
-<chapter id="system_schema">
- <title>System Schema</title>
- <para>The built-in SYS and SYSADMIN schemas provide metadata tables and procedures against the current VDB.</para>
- <section id="system_tables">
- <title>System Tables</title>
- <section>
- <title>VDB, Schema, and Properties</title>
- <section>
- <title>SYSADMIN.VDBResources</title>
- <para>This table provides the current VDB contents.</para>
- <informaltable frame="all">
- <tgroup cols="3">
- <colspec colwidth=".6*" />
- <colspec colwidth=".4*" />
- <thead>
- <row>
- <entry>
- <para>Column Name</para>
- </entry>
- <entry>
- <para>Type</para>
- </entry>
- <entry>
- <para>Description</para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>resourcePath</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>The path to the contents.</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>contents</para>
- </entry>
- <entry>
- <para>blob</para>
- </entry>
- <entry>
- <para>The contents as a blob.</para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </section>
- <section>
- <title>SYS.VirtualDatabases</title>
- <para>This table supplies information about the currently
- connected
- virtual database, of which there is always exactly one
- (in the
- context of a connection).</para>
- <informaltable frame="all">
- <tgroup cols="3">
- <colspec colwidth=".6*" />
- <colspec colwidth=".4*" />
- <thead>
- <row>
- <entry>
- <para>Column Name</para>
- </entry>
- <entry>
- <para>Type</para>
- </entry>
- <entry>
- <para>Description</para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>Name</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>The name of the VDB</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Version</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>The version of the VDB</para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </section>
- <section>
- <title>SYS.Schemas</title>
- <para>This table supplies information about all the schemas in
- the
- virtual database, including the system schema itself
- (System).
- </para>
- <informaltable frame="all">
- <tgroup cols="3">
- <colspec colwidth=".6*" />
- <colspec colwidth=".4*" />
- <thead>
- <row>
- <entry>
- <para>Column Name</para>
- </entry>
- <entry>
- <para>Type</para>
- </entry>
- <entry>
- <para>Description</para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>VDBName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>VDB name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Name</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Schema name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>IsPhysical</para>
- </entry>
- <entry>
- <para>boolean</para>
- </entry>
- <entry>
- <para>True if this represents a source</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>UID</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Unique ID</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>OID</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Unique ID (see note below)</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Description</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Description</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>PrimaryMetamodelURI</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>URI for the primary metamodel describing the model used
- for this schema</para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </section>
- <section>
- <title>SYS.Properties</title>
- <para>This table supplies user-defined properties on all objects
- based on metamodel extensions. Normally, this table is empty if
- no
- metamodel extensions are being used.</para>
- <informaltable frame="all">
- <tgroup cols="3">
- <colspec colwidth=".6*" />
- <colspec colwidth=".4*" />
- <thead>
- <row>
- <entry>
- <para>Column Name</para>
- </entry>
- <entry>
- <para>Type</para>
- </entry>
- <entry>
- <para>Description</para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>Name</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Extension property name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Value</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Extension property value</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>UID</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Key unique ID</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>OID</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Unique ID (see note below)</para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </section>
- </section>
- <section>
- <title>Table Metadata</title>
- <section>
- <title>SYS.Tables</title>
- <para>This table supplies information about all the groups
- (tables,
- views, documents, etc) in the virtual database.</para>
- <informaltable frame="all">
- <tgroup cols="3">
- <colspec colwidth=".6*" />
- <colspec colwidth=".4*" />
- <thead>
- <row>
- <entry>
- <para>Column Name</para>
- </entry>
- <entry>
- <para>Type</para>
- </entry>
- <entry>
- <para>Description</para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>VDBName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>VDB name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>SchemaName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Schema Name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Name</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Short group name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Type</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Table type (Table, View, Document, ...)
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>NameInSource</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Name of this group in the source</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>IsPhysical</para>
- </entry>
- <entry>
- <para>boolean</para>
- </entry>
- <entry>
- <para>True if this is a source table</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>SupportsUpdates</para>
- </entry>
- <entry>
- <para>boolean</para>
- </entry>
- <entry>
- <para>True if group can be updated</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>UID</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Group unique ID</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>OID</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Unique ID (see note below)</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Cardinality</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Approximate number of rows in the group
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Description</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Description</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>IsSystem</para>
- </entry>
- <entry>
- <para>boolean</para>
- </entry>
- <entry>
- <para>True if in system table</para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </section>
- <section>
- <title>SYSADMIN.MatViews</title>
- <para>This table supplies information about all the materailized views in the virtual database.</para>
- <informaltable frame="all">
- <tgroup cols="3">
- <colspec colwidth=".6*" />
- <colspec colwidth=".4*" />
- <thead>
- <row>
- <entry>
- <para>Column Name</para>
- </entry>
- <entry>
- <para>Type</para>
- </entry>
- <entry>
- <para>Description</para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>VDBName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>VDB name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>SchemaName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Schema Name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Name</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Short group name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>TargetSchemaName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Name of the materialized table schema</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>TargetName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Name of the materialized table</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Valid</para>
- </entry>
- <entry>
- <para>boolean</para>
- </entry>
- <entry>
- <para>True if materialized table is currently valid.</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>LoadState</para>
- </entry>
- <entry>
- <para>boolean</para>
- </entry>
- <entry>
- <para>The load state, can be one of NEEDS_LOADING, LOADING, LOADED, FAILED_LOAD</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Updated</para>
- </entry>
- <entry>
- <para>timestamp</para>
- </entry>
- <entry>
- <para>The timestamp of the last full refresh.</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Cardinality</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>The number of rows in the materialized view table.</para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </section>
- <section>
- <title>SYS.Columns</title>
- <para>This table supplies information about all the elements
- (columns, tags, attributes, etc) in the virtual database.</para>
- <informaltable frame="all">
- <tgroup cols="3">
- <colspec colwidth=".6*" />
- <colspec colwidth=".4*" />
- <thead>
- <row>
- <entry>
- <para>Column Name</para>
- </entry>
- <entry>
- <para>Type</para>
- </entry>
- <entry>
- <para>Description</para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>VDBName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>VDB name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>SchemaName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Schema Name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>TableName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Table name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Name</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Element name (not qualified)</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Position</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Position in group (1-based)</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>NameInSource</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Name of element in source</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>DataType</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Teiid runtime data type name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Scale</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Number of digits after the decimal point
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>ElementLength</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Element length (mostly used for strings)
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>sLengthFixed</para>
- </entry>
- <entry>
- <para>boolean</para>
- </entry>
- <entry>
- <para>Whether the length is fixed or variable
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>SupportsSelect</para>
- </entry>
- <entry>
- <para>boolean</para>
- </entry>
- <entry>
- <para>Element can be used in SELECT</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>SupportsUpdates</para>
- </entry>
- <entry>
- <para>boolean</para>
- </entry>
- <entry>
- <para>Values can be inserted or updated in the
- element</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>IsCaseSensitive</para>
- </entry>
- <entry>
- <para>boolean</para>
- </entry>
- <entry>
- <para>Element is case-sensitive</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>IsSigned</para>
- </entry>
- <entry>
- <para>boolean</para>
- </entry>
- <entry>
- <para>Element is signed numeric value</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>IsCurrency</para>
- </entry>
- <entry>
- <para>boolean</para>
- </entry>
- <entry>
- <para>Element represents monetary value</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>IsAutoIncremented</para>
- </entry>
- <entry>
- <para>boolean</para>
- </entry>
- <entry>
- <para>Element is auto-incremented in the source
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>NullType</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Nullability: "Nullable", "No Nulls",
- "Unknown"</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>MinRange</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Minimum value</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>MaxRange</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Maximum value</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>DistinctCount</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Distinct value count, -1 can indicate unknown</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>NullCount</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Null value count, -1 can indicate unknown</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>SearchType</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Searchability: "Searchable", "All
- Except Like", "Like
- Only", "Unsearchable"</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Format</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Format of string value</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>DefaultValue</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Default value</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>JavaClass</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Java class that will be returned</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Precision</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Number of digits in numeric value</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>CharOctetLength</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Measure of return value size</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Radix</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Radix for numeric values</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>GroupUpperName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Upper-case full group name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>UpperName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Upper-case element name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>UID</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Element unique ID</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>OID</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Unique ID (see note below)</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Description</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Description</para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </section>
- <section>
- <title>SYS.Keys</title>
- <para>This table supplies information about primary, foreign,
- and unique keys.</para>
- <informaltable frame="all">
- <tgroup cols="3">
- <colspec colwidth=".6*" />
- <colspec colwidth=".4*" />
- <thead>
- <row>
- <entry>
- <para>Column Name</para>
- </entry>
- <entry>
- <para>Type</para>
- </entry>
- <entry>
- <para>Description</para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>VDBName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>VDB name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>SchemaName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Schema Name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Table Name</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Table name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Name</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Key name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Description</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Description</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>NameInSource</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Name of key in source system</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Type</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Type of key: "Primary", "Foreign", "Unique",
- etc</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>IsIndexed</para>
- </entry>
- <entry>
- <para>boolean</para>
- </entry>
- <entry>
- <para>True if key is indexed</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>RefKeyUID</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Referenced key UID (if foreign key)
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>UID</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Key unique ID</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>OID</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Unique ID (see note below)</para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </section>
- <section>
- <title>SYS.KeyColumns</title>
- <para>This table supplies information about the columns
- referenced by a key.</para>
- <informaltable frame="all">
- <tgroup cols="3">
- <colspec colwidth=".6*" />
- <colspec colwidth=".4*" />
- <thead>
- <row>
- <entry>
- <para>Column Name</para>
- </entry>
- <entry>
- <para>Type</para>
- </entry>
- <entry>
- <para>Description</para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>VDBName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>VDB name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>SchemaName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Schema Name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>TableName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Table name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Name</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Element name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>KeyName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Key name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>KeyType</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Key type: "Primary", "Foreign", "Unique", etc
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>RefKeyUID</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Referenced key UID</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>UID</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Key UID</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>OID</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Unique ID (see note below)</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Position</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Position in key</para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </section>
- </section>
- <section>
- <title>Procedure Metadata</title>
- <section>
- <title>SYS.Procedures</title>
- <para>This table supplies information about the procedures in
- the virtual database.</para>
- <informaltable frame="all">
- <tgroup cols="3">
- <colspec colwidth=".6*" />
- <colspec colwidth=".4*" />
- <thead>
- <row>
- <entry>
- <para>Column Name</para>
- </entry>
- <entry>
- <para>Type</para>
- </entry>
- <entry>
- <para>Description</para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>VDBName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>VDB name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>SchemaName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Schema Name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Name</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Procedure name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>NameInSource</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Procedure name in source system</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>ReturnsResults</para>
- </entry>
- <entry>
- <para>boolean</para>
- </entry>
- <entry>
- <para>Returns a result set</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>UID</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Procedure UID</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>OID</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Unique ID (see note below)</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Description</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Description</para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </section>
- <section>
- <title>SYS.ProcedureParams</title>
- <para>This supplies information on procedure parameters.
- </para>
- <informaltable frame="all">
- <tgroup cols="3">
- <colspec colwidth=".6*" />
- <colspec colwidth=".4*" />
- <thead>
- <row>
- <entry>
- <para>Column Name</para>
- </entry>
- <entry>
- <para>Type</para>
- </entry>
- <entry>
- <para>Description</para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>VDBName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>VDB name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>SchemaName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Schema Name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>ProcedureName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Procedure name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Name</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Parameter name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>DataType</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Teiid runtime data type name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Position</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Position in procedure args</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Type</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Parameter direction: "In", "Out",
- "InOut", "ResultSet",
- "ReturnValue"</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Optional</para>
- </entry>
- <entry>
- <para>boolean</para>
- </entry>
- <entry>
- <para>Parameter is optional</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Precision</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Precision of parameter</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>TypeLength</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Length of parameter value</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Scale</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Scale of parameter</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Radix</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Radix of parameter</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>NullType</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Nullability: "Nullable", "No Nulls",
- "Unknown"</para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </section>
- </section>
- <section>
- <title>
- Datatype Metadata
- </title>
- <section>
- <title>SYS.DataTypes</title>
- <para>
- This table supplies information on
- <link linkend="datatypes">datatypes</link>.
- </para>
- <informaltable frame="all">
- <tgroup cols="3">
- <colspec colwidth=".6*" />
- <colspec colwidth=".4*" />
- <thead>
- <row>
- <entry>
- <para>Column Name</para>
- </entry>
- <entry>
- <para>Type</para>
- </entry>
- <entry>
- <para>Description</para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>Name</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Teiid design-time type name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>IsStandard</para>
- </entry>
- <entry>
- <para>boolean</para>
- </entry>
- <entry>
- <para>Always false</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>IsPhysical</para>
- </entry>
- <entry>
- <para>boolean</para>
- </entry>
- <entry>
- <para>Always false</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>TypeName</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Design-time type name (same as Name)
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>JavaClass</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Java class returned for this type</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Scale</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Max scale of this type</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>TypeLength</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Max length of this type</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>NullType</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Nullability: "Nullable", "No Nulls",
- "Unknown"</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>IsSigned</para>
- </entry>
- <entry>
- <para>boolean</para>
- </entry>
- <entry>
- <para>Is signed numeric?</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>IsAutoIncremented</para>
- </entry>
- <entry>
- <para>boolean</para>
- </entry>
- <entry>
- <para>Is auto-incremented?</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>IsCaseSensitive</para>
- </entry>
- <entry>
- <para>boolean</para>
- </entry>
- <entry>
- <para>Is case-sensitive?</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Precision</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Max precision of this type</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Radix</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Radix of this type</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>SearchType</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Searchability: "Searchable", "All
- Except Like", "Like
- Only", "Unsearchable"</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>UID</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Data type unique ID</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>OID</para>
- </entry>
- <entry>
- <para>integer</para>
- </entry>
- <entry>
- <para>Unique ID (see note below)</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>RuntimeType</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Teiid runtime data type name</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>BaseType</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Base type</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>Description</para>
- </entry>
- <entry>
- <para>string</para>
- </entry>
- <entry>
- <para>Description of type</para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </section>
- </section>
- <warning>
- <para>The OID column is is guranteed to be unique/consistent only for given version running instance of a VDB. If a different version of
- the VDB is deployed, these IDs are not guranteed to be the same or unique across both versions of the VDB. Dynamic VDB OIDs are not cluster safe.</para>
- </warning>
- </section>
- <section id="system_procedures">
- <title>System Procedures</title>
- <section>
- <title>SYS.getXMLSchemas</title>
- <para>Returns a resultset with a single column, schema, containing the schemas as clobs.</para>
- <para><synopsis>SYS.getXMLSchemas(in string document)</synopsis></para>
- </section>
- <section>
- <title>SYSADMIN.refreshMatView</title>
- <para>Returns integer RowsUpdated. -1 indicates a load is in progress, otherwise the cardinality of the table is returned. See the Caching Guide for more.</para>
- <para><synopsis>SYSADMIN.refreshMatView(return integer RowsUpdated, in string ViewName, in boolean Invalidate)</synopsis></para>
- </section>
- <section>
- <title>SYSADMIN.refreshMatViewRow</title>
- <para>Returns integer RowsUpdated. -1 indicates the materialized table is currently invalid. 0 indicates that the specified row did not exist in the live data query or in the materialized table. See the Caching Guide for more.</para>
- <para><synopsis>SYSADMIN.refreshMatViewRow(return integer RowsUpdated, in string ViewName, in object Key)</synopsis></para>
- </section>
- <section>
- <title>Metadata Procedures</title>
- &metadata-update-note;
- <section>
- <title>SYSADMIN.setTableStats</title>
- <para>Set statistics for the given table.</para>
- <para><synopsis>SYSADMIN.setTableStats(in string TableName, in integer Cardinality)</synopsis></para>
- </section>
- <section>
- <title>SYSADMIN.setColumnStats</title>
- <para>Set statistics for the given column.</para>
- <para><synopsis>SYSADMIN.setColumnStats(in string TableName, in string ColumnName, in integer DistinctCount, in integer NullCount, in string Max, in string Min)</synopsis></para>
- <para>Passing a null stat value will leave corresponding metadata value unchanged.</para>
- </section>
- <section>
- <title>SYSADMIN.setProperty</title>
- <para>Set an extension metadata property for the given record. Extension metadata is typically used by <xref linkend="translators"/>.</para>
- <para><synopsis>SYSADMIN.setProperty(return clob OldValue, in string Uid, in string Name, in clob Value)</synopsis></para>
- <para>Setting a value to null will remove the property.</para>
- <example lang="sql">
- <title>Example Property Set</title>
- <programlisting>CALL SYSADMIN.setProperty(uid=>(SELECT uid FROM TABLES WHERE name='tab'), name=>'some name', value=>'some value')</programlisting>
- <para>This will set the property 'some name'='some value' on table tab.</para>
- </example>
- </section>
- </section>
- </section>
-</chapter>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/documentation/reference/src/main/docbook/en-US/content/system_schema.xml (from rev 3138, trunk/documentation/reference/src/main/docbook/en-US/content/system_schema.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/documentation/reference/src/main/docbook/en-US/content/system_schema.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/documentation/reference/src/main/docbook/en-US/content/system_schema.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,1847 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % CustomDTD SYSTEM "../../../../../../docbook/custom.dtd">
+%CustomDTD;
+]>
+<chapter id="system_schema">
+ <title>System Schema</title>
+ <para>The built-in SYS and SYSADMIN schemas provide metadata tables and procedures against the current VDB.</para>
+ <section id="system_tables">
+ <title>System Tables</title>
+ <section>
+ <title>VDB, Schema, and Properties</title>
+ <section>
+ <title>SYSADMIN.VDBResources</title>
+ <para>This table provides the current VDB contents.</para>
+ <informaltable frame="all">
+ <tgroup cols="3">
+ <colspec colwidth=".6*" />
+ <colspec colwidth=".4*" />
+ <thead>
+ <row>
+ <entry>
+ <para>Column Name</para>
+ </entry>
+ <entry>
+ <para>Type</para>
+ </entry>
+ <entry>
+ <para>Description</para>
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <para>resourcePath</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>The path to the contents.</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>contents</para>
+ </entry>
+ <entry>
+ <para>blob</para>
+ </entry>
+ <entry>
+ <para>The contents as a blob.</para>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </section>
+ <section>
+ <title>SYS.VirtualDatabases</title>
+ <para>This table supplies information about the currently
+ connected
+ virtual database, of which there is always exactly one
+ (in the
+ context of a connection).</para>
+ <informaltable frame="all">
+ <tgroup cols="3">
+ <colspec colwidth=".6*" />
+ <colspec colwidth=".4*" />
+ <thead>
+ <row>
+ <entry>
+ <para>Column Name</para>
+ </entry>
+ <entry>
+ <para>Type</para>
+ </entry>
+ <entry>
+ <para>Description</para>
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <para>Name</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>The name of the VDB</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Version</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>The version of the VDB</para>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </section>
+ <section>
+ <title>SYS.Schemas</title>
+ <para>This table supplies information about all the schemas in
+ the
+ virtual database, including the system schema itself
+ (System).
+ </para>
+ <informaltable frame="all">
+ <tgroup cols="3">
+ <colspec colwidth=".6*" />
+ <colspec colwidth=".4*" />
+ <thead>
+ <row>
+ <entry>
+ <para>Column Name</para>
+ </entry>
+ <entry>
+ <para>Type</para>
+ </entry>
+ <entry>
+ <para>Description</para>
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <para>VDBName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>VDB name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Name</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Schema name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>IsPhysical</para>
+ </entry>
+ <entry>
+ <para>boolean</para>
+ </entry>
+ <entry>
+ <para>True if this represents a source</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>UID</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Unique ID</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>OID</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Unique ID (see note below)</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Description</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Description</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>PrimaryMetamodelURI</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>URI for the primary metamodel describing the model used
+ for this schema</para>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </section>
+ <section>
+ <title>SYS.Properties</title>
+ <para>This table supplies user-defined properties on all objects
+ based on metamodel extensions. Normally, this table is empty if
+ no
+ metamodel extensions are being used.</para>
+ <informaltable frame="all">
+ <tgroup cols="3">
+ <colspec colwidth=".6*" />
+ <colspec colwidth=".4*" />
+ <thead>
+ <row>
+ <entry>
+ <para>Column Name</para>
+ </entry>
+ <entry>
+ <para>Type</para>
+ </entry>
+ <entry>
+ <para>Description</para>
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <para>Name</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Extension property name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Value</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Extension property value</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>UID</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Key unique ID</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>OID</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Unique ID (see note below)</para>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </section>
+ </section>
+ <section>
+ <title>Table Metadata</title>
+ <section>
+ <title>SYS.Tables</title>
+ <para>This table supplies information about all the groups
+ (tables,
+ views, documents, etc) in the virtual database.</para>
+ <informaltable frame="all">
+ <tgroup cols="3">
+ <colspec colwidth=".6*" />
+ <colspec colwidth=".4*" />
+ <thead>
+ <row>
+ <entry>
+ <para>Column Name</para>
+ </entry>
+ <entry>
+ <para>Type</para>
+ </entry>
+ <entry>
+ <para>Description</para>
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <para>VDBName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>VDB name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>SchemaName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Schema Name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Name</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Short group name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Type</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Table type (Table, View, Document, ...)
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>NameInSource</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Name of this group in the source</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>IsPhysical</para>
+ </entry>
+ <entry>
+ <para>boolean</para>
+ </entry>
+ <entry>
+ <para>True if this is a source table</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>SupportsUpdates</para>
+ </entry>
+ <entry>
+ <para>boolean</para>
+ </entry>
+ <entry>
+ <para>True if group can be updated</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>UID</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Group unique ID</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>OID</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Unique ID (see note below)</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Cardinality</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Approximate number of rows in the group
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Description</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Description</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>IsSystem</para>
+ </entry>
+ <entry>
+ <para>boolean</para>
+ </entry>
+ <entry>
+ <para>True if in system table</para>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </section>
+ <section>
+ <title>SYSADMIN.MatViews</title>
+ <para>This table supplies information about all the materailized views in the virtual database.</para>
+ <informaltable frame="all">
+ <tgroup cols="3">
+ <colspec colwidth=".6*" />
+ <colspec colwidth=".4*" />
+ <thead>
+ <row>
+ <entry>
+ <para>Column Name</para>
+ </entry>
+ <entry>
+ <para>Type</para>
+ </entry>
+ <entry>
+ <para>Description</para>
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <para>VDBName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>VDB name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>SchemaName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Schema Name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Name</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Short group name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>TargetSchemaName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Name of the materialized table schema</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>TargetName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Name of the materialized table</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Valid</para>
+ </entry>
+ <entry>
+ <para>boolean</para>
+ </entry>
+ <entry>
+ <para>True if materialized table is currently valid.</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>LoadState</para>
+ </entry>
+ <entry>
+ <para>boolean</para>
+ </entry>
+ <entry>
+ <para>The load state, can be one of NEEDS_LOADING, LOADING, LOADED, FAILED_LOAD</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Updated</para>
+ </entry>
+ <entry>
+ <para>timestamp</para>
+ </entry>
+ <entry>
+ <para>The timestamp of the last full refresh.</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Cardinality</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>The number of rows in the materialized view table.</para>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </section>
+ <section>
+ <title>SYS.Columns</title>
+ <para>This table supplies information about all the elements
+ (columns, tags, attributes, etc) in the virtual database.</para>
+ <informaltable frame="all">
+ <tgroup cols="3">
+ <colspec colwidth=".6*" />
+ <colspec colwidth=".4*" />
+ <thead>
+ <row>
+ <entry>
+ <para>Column Name</para>
+ </entry>
+ <entry>
+ <para>Type</para>
+ </entry>
+ <entry>
+ <para>Description</para>
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <para>VDBName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>VDB name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>SchemaName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Schema Name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>TableName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Table name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Name</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Element name (not qualified)</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Position</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Position in group (1-based)</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>NameInSource</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Name of element in source</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>DataType</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Teiid runtime data type name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Scale</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Number of digits after the decimal point
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>ElementLength</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Element length (mostly used for strings)
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>sLengthFixed</para>
+ </entry>
+ <entry>
+ <para>boolean</para>
+ </entry>
+ <entry>
+ <para>Whether the length is fixed or variable
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>SupportsSelect</para>
+ </entry>
+ <entry>
+ <para>boolean</para>
+ </entry>
+ <entry>
+ <para>Element can be used in SELECT</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>SupportsUpdates</para>
+ </entry>
+ <entry>
+ <para>boolean</para>
+ </entry>
+ <entry>
+ <para>Values can be inserted or updated in the
+ element</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>IsCaseSensitive</para>
+ </entry>
+ <entry>
+ <para>boolean</para>
+ </entry>
+ <entry>
+ <para>Element is case-sensitive</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>IsSigned</para>
+ </entry>
+ <entry>
+ <para>boolean</para>
+ </entry>
+ <entry>
+ <para>Element is signed numeric value</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>IsCurrency</para>
+ </entry>
+ <entry>
+ <para>boolean</para>
+ </entry>
+ <entry>
+ <para>Element represents monetary value</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>IsAutoIncremented</para>
+ </entry>
+ <entry>
+ <para>boolean</para>
+ </entry>
+ <entry>
+ <para>Element is auto-incremented in the source
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>NullType</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Nullability: "Nullable", "No Nulls",
+ "Unknown"</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>MinRange</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Minimum value</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>MaxRange</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Maximum value</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>DistinctCount</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Distinct value count, -1 can indicate unknown</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>NullCount</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Null value count, -1 can indicate unknown</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>SearchType</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Searchability: "Searchable", "All
+ Except Like", "Like
+ Only", "Unsearchable"</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Format</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Format of string value</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>DefaultValue</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Default value</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>JavaClass</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Java class that will be returned</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Precision</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Number of digits in numeric value</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>CharOctetLength</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Measure of return value size</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Radix</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Radix for numeric values</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>GroupUpperName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Upper-case full group name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>UpperName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Upper-case element name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>UID</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Element unique ID</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>OID</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Unique ID (see note below)</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Description</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Description</para>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </section>
+ <section>
+ <title>SYS.Keys</title>
+ <para>This table supplies information about primary, foreign,
+ and unique keys.</para>
+ <informaltable frame="all">
+ <tgroup cols="3">
+ <colspec colwidth=".6*" />
+ <colspec colwidth=".4*" />
+ <thead>
+ <row>
+ <entry>
+ <para>Column Name</para>
+ </entry>
+ <entry>
+ <para>Type</para>
+ </entry>
+ <entry>
+ <para>Description</para>
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <para>VDBName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>VDB name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>SchemaName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Schema Name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Table Name</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Table name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Name</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Key name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Description</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Description</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>NameInSource</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Name of key in source system</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Type</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Type of key: "Primary", "Foreign", "Unique",
+ etc</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>IsIndexed</para>
+ </entry>
+ <entry>
+ <para>boolean</para>
+ </entry>
+ <entry>
+ <para>True if key is indexed</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>RefKeyUID</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Referenced key UID (if foreign key)
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>UID</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Key unique ID</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>OID</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Unique ID (see note below)</para>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </section>
+ <section>
+ <title>SYS.KeyColumns</title>
+ <para>This table supplies information about the columns
+ referenced by a key.</para>
+ <informaltable frame="all">
+ <tgroup cols="3">
+ <colspec colwidth=".6*" />
+ <colspec colwidth=".4*" />
+ <thead>
+ <row>
+ <entry>
+ <para>Column Name</para>
+ </entry>
+ <entry>
+ <para>Type</para>
+ </entry>
+ <entry>
+ <para>Description</para>
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <para>VDBName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>VDB name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>SchemaName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Schema Name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>TableName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Table name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Name</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Element name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>KeyName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Key name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>KeyType</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Key type: "Primary", "Foreign", "Unique", etc
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>RefKeyUID</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Referenced key UID</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>UID</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Key UID</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>OID</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Unique ID (see note below)</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Position</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Position in key</para>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </section>
+ </section>
+ <section>
+ <title>Procedure Metadata</title>
+ <section>
+ <title>SYS.Procedures</title>
+ <para>This table supplies information about the procedures in
+ the virtual database.</para>
+ <informaltable frame="all">
+ <tgroup cols="3">
+ <colspec colwidth=".6*" />
+ <colspec colwidth=".4*" />
+ <thead>
+ <row>
+ <entry>
+ <para>Column Name</para>
+ </entry>
+ <entry>
+ <para>Type</para>
+ </entry>
+ <entry>
+ <para>Description</para>
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <para>VDBName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>VDB name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>SchemaName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Schema Name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Name</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Procedure name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>NameInSource</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Procedure name in source system</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>ReturnsResults</para>
+ </entry>
+ <entry>
+ <para>boolean</para>
+ </entry>
+ <entry>
+ <para>Returns a result set</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>UID</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Procedure UID</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>OID</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Unique ID (see note below)</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Description</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Description</para>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </section>
+ <section>
+ <title>SYS.ProcedureParams</title>
+ <para>This supplies information on procedure parameters.
+ </para>
+ <informaltable frame="all">
+ <tgroup cols="3">
+ <colspec colwidth=".6*" />
+ <colspec colwidth=".4*" />
+ <thead>
+ <row>
+ <entry>
+ <para>Column Name</para>
+ </entry>
+ <entry>
+ <para>Type</para>
+ </entry>
+ <entry>
+ <para>Description</para>
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <para>VDBName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>VDB name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>SchemaName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Schema Name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>ProcedureName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Procedure name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Name</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Parameter name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>DataType</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Teiid runtime data type name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Position</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Position in procedure args</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Type</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Parameter direction: "In", "Out",
+ "InOut", "ResultSet",
+ "ReturnValue"</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Optional</para>
+ </entry>
+ <entry>
+ <para>boolean</para>
+ </entry>
+ <entry>
+ <para>Parameter is optional</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Precision</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Precision of parameter</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>TypeLength</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Length of parameter value</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Scale</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Scale of parameter</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Radix</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Radix of parameter</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>NullType</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Nullability: "Nullable", "No Nulls",
+ "Unknown"</para>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </section>
+ </section>
+ <section>
+ <title>
+ Datatype Metadata
+ </title>
+ <section>
+ <title>SYS.DataTypes</title>
+ <para>
+ This table supplies information on
+ <link linkend="datatypes">datatypes</link>.
+ </para>
+ <informaltable frame="all">
+ <tgroup cols="3">
+ <colspec colwidth=".6*" />
+ <colspec colwidth=".4*" />
+ <thead>
+ <row>
+ <entry>
+ <para>Column Name</para>
+ </entry>
+ <entry>
+ <para>Type</para>
+ </entry>
+ <entry>
+ <para>Description</para>
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <para>Name</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Teiid design-time type name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>IsStandard</para>
+ </entry>
+ <entry>
+ <para>boolean</para>
+ </entry>
+ <entry>
+ <para>Always false</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>IsPhysical</para>
+ </entry>
+ <entry>
+ <para>boolean</para>
+ </entry>
+ <entry>
+ <para>Always false</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>TypeName</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Design-time type name (same as Name)
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>JavaClass</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Java class returned for this type</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Scale</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Max scale of this type</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>TypeLength</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Max length of this type</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>NullType</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Nullability: "Nullable", "No Nulls",
+ "Unknown"</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>IsSigned</para>
+ </entry>
+ <entry>
+ <para>boolean</para>
+ </entry>
+ <entry>
+ <para>Is signed numeric?</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>IsAutoIncremented</para>
+ </entry>
+ <entry>
+ <para>boolean</para>
+ </entry>
+ <entry>
+ <para>Is auto-incremented?</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>IsCaseSensitive</para>
+ </entry>
+ <entry>
+ <para>boolean</para>
+ </entry>
+ <entry>
+ <para>Is case-sensitive?</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Precision</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Max precision of this type</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Radix</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Radix of this type</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>SearchType</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Searchability: "Searchable", "All
+ Except Like", "Like
+ Only", "Unsearchable"</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>UID</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Data type unique ID</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>OID</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Unique ID (see note below)</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>RuntimeType</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Teiid runtime data type name</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>BaseType</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Base type</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>Description</para>
+ </entry>
+ <entry>
+ <para>string</para>
+ </entry>
+ <entry>
+ <para>Description of type</para>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </section>
+ </section>
+ <warning>
+ <para>The OID column is guranteed to be unique/consistent only for given version running instance of a VDB. If a different version of
+ the VDB is deployed, these IDs are not guranteed to be the same or unique across both versions of the VDB. Dynamic VDB OIDs are not cluster safe.</para>
+ </warning>
+ </section>
+ <section id="system_procedures">
+ <title>System Procedures</title>
+ <section>
+ <title>SYS.getXMLSchemas</title>
+ <para>Returns a resultset with a single column, schema, containing the schemas as clobs.</para>
+ <para><synopsis>SYS.getXMLSchemas(document in string) returns schema string</synopsis></para>
+ </section>
+ <section>
+ <title>SYSADMIN.refreshMatView</title>
+ <para>Returns integer RowsUpdated. -1 indicates a load is in progress, otherwise the cardinality of the table is returned. See the Caching Guide for more.</para>
+ <para><synopsis>SYSADMIN.refreshMatView(RowsUpdated return integer, ViewName in string, Invalidate in boolean)</synopsis></para>
+ </section>
+ <section>
+ <title>SYSADMIN.refreshMatViewRow</title>
+ <para>Returns integer RowsUpdated. -1 indicates the materialized table is currently invalid. 0 indicates that the specified row did not exist in the live data query or in the materialized table. See the Caching Guide for more.</para>
+ <para><synopsis>SYSADMIN.refreshMatViewRow(RowsUpdated return integer, ViewName in string, Key in object)</synopsis></para>
+ </section>
+ <section>
+ <title>Metadata Procedures</title>
+ &metadata-update-note;
+ <section>
+ <title>SYSADMIN.setTableStats</title>
+ <para>Set statistics for the given table.</para>
+ <para><synopsis>SYSADMIN.setTableStats(TableName in string, Cardinality in integer)</synopsis></para>
+ </section>
+ <section>
+ <title>SYSADMIN.setColumnStats</title>
+ <para>Set statistics for the given column.</para>
+ <para><synopsis>SYSADMIN.setColumnStats(TableName in string, ColumnName in string, DistinctCount in integer, NullCount in integer, Max in string, Min in string)</synopsis></para>
+ <para>All stat values are nullable. Passing a null stat value will leave corresponding metadata value unchanged.</para>
+ </section>
+ <section>
+ <title>SYSADMIN.setProperty</title>
+ <para>Set an extension metadata property for the given record. Extension metadata is typically used by <xref linkend="translators"/>.</para>
+ <para><synopsis>SYSADMIN.setProperty(OldValue return clob, Uid in string, Name in string, Value in clob)</synopsis></para>
+ <para>Setting a value to null will remove the property.</para>
+ <example lang="sql">
+ <title>Example Property Set</title>
+ <programlisting>CALL SYSADMIN.setProperty(uid=>(SELECT uid FROM TABLES WHERE name='tab'), name=>'some name', value=>'some value')</programlisting>
+ <para>This will set the property 'some name'='some value' on table tab.</para>
+ </example>
+ <para>The use of this procedure will not trigger replanning of associated prepared plans.</para>
+ </section>
+ </section>
+ </section>
+</chapter>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/documentation/reference/src/main/docbook/en-US/content/translators.xml
===================================================================
--- trunk/documentation/reference/src/main/docbook/en-US/content/translators.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/documentation/reference/src/main/docbook/en-US/content/translators.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,1472 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter id="translators">
- <title>Translators</title>
-
- <section>
- <title>Introduction to the Teiid Connector Architecture</title>
- <para>
- The Teiid Connector Architecture (TCA) provides Teiid with a robust mechanism
- for integrating with external systems. The TCA defines a common client interface
- between Teiid and an external system that includes metadata as to what SQL
- constructs are supported for pushdown and the ability to import metadata from
- the external system.
- </para>
-
- <para>
- A Translator is the heart of the TCA and acts as the bridge logic between Teiid
- and an external system, which is most commonly accessed through a JCA resource
- adapter. Refer to the Teiid Developers Guide for details on developing custom
- Translators and JCA resource adapters for use with Teiid.
- </para>
-
- <note>
- <para>
- The TCA is not the same as the JCA, the JavaEE Connector Architecture, although
- the TCA is designed for use with JCA resource adapters.
- </para>
- </note>
-
- <note>
- <para>
- The import capabilities of Teiid Translators is currently only used in
- <link linkend="dynamic_vdbs">dynamic VDBs</link> and not by the Teiid Designer.
- </para>
- </note>
-
- </section>
-
- <section>
- <title>Translators</title>
- <para>
- A Translator is typically paired with a particular JCA resource adapter. In
- instances where pooling, environment dependent configuration management, advanced
- security handling, etc. are not needed, then a JCA resource adapter is not needed.
- The configuration of JCA ConnectionFactories for needed resource adapters is not
- part of this guide, please see the Teiid Administrator Guide and the kit examples
- for configuring resource adapters for use in JBossAS.
- </para>
-
- <para>
- Translators can have a number of configurable properties. These are broken down
- into execution properties, which determine aspects of how data is retrieved, and
- import settings, which determine what metadata is read for import.
- </para>
-
- <para>
- The execution properties for a translator typically have reasonable defaults. For
- specific translator types, e.g. the Derby translator, base execution properties are
- already tuned to match the source. In most cases the user will not need to adjust
- their values.
- </para>
-
- <table>
- <title>Base Execution Properties - shared by all translators</title>
- <tgroup cols="3">
- <colspec colwidth="3*" />
- <colspec colwidth="6*" />
- <colspec colwidth="2*" />
- <thead>
- <row>
- <entry>Name</entry>
- <entry>Description</entry>
- <entry>Default</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>Immutable</entry>
- <entry>Set to true to indicate that the source never changes.</entry>
- <entry>false</entry>
- </row>
- <row>
- <entry>RequiresCriteria</entry>
- <entry>Set to true to indicate that source SELECT/UPDATE/DELETE queries require a where clause.</entry>
- <entry>false</entry>
- </row>
- <row>
- <entry>SupportsOrderBy</entry>
- <entry>Set to true to indicate that the ORDER BY clause is supported.</entry>
- <entry>false</entry>
- </row>
- <row>
- <entry>SupportsOuterJoins</entry>
- <entry>Set to true to indicate that OUTER JOINs are supported.</entry>
- <entry>false</entry>
- </row>
- <row>
- <entry>SupportsFullOuterJoins</entry>
- <entry>If outer joins are supported, true indicates that FULL OUTER JOINs are supported.</entry>
- <entry>false</entry>
- </row>
- <row>
- <entry>SupportsInnerJoins</entry>
- <entry>Set to true to indicate that INNER JOINs are supported.</entry>
- <entry>false</entry>
- </row>
- <row>
- <entry>SupportedJoinCriteria</entry>
- <entry>If joins are supported, defines what criteria may be used as the join criteria. May be one of (ANY, THETA, EQUI, or KEY).</entry>
- <entry>ANY</entry>
- </row>
- <row>
- <entry>MaxInCriteriaSize</entry>
- <entry>If in criteria are supported, defines what the maximum number of in entries are per predicate. -1 indicates no limit.</entry>
- <entry>-1</entry>
- </row>
- <row>
- <entry>MaxDependentInPredicates</entry>
- <entry>If in criteria are supported, defines what the maximum number of predicates that can be used for a dependent join.
- Values less than 1 indicate to use only one in predicate per dependent value pushed (which matches the pre-7.4 behavior).</entry>
- <entry>-1</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <note>
- <para>
- Only a subset of the supports metadata can be set through execution properties. If more control is needed, please
- consult the Teiid Developers Guide.
- </para>
- </note>
-
- <para>There are no base importer settings.</para>
-
- <section>
- <title>File Translator</title>
- <para>
- The file translator, known by the type name <emphasis>file</emphasis>, exposes
- stored procedures to leverage file system resources exposed by the file resource
- adapter. It will commonly be used with the <link linkend="texttable">TEXTTABLE</link>
- or <link linkend="xmltable">XMLTABLE</link> table functions to use CSV or XML
- formated data.
- </para>
-
- <table>
- <title>Execution Properties</title>
- <tgroup cols="3">
- <colspec colwidth="1*" />
- <colspec colwidth="4*" />
- <colspec colwidth="1*" />
- <thead>
- <row>
- <entry>Name</entry>
- <entry>Description</entry>
- <entry>Default</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>Encoding</entry>
- <entry>The encoding that should be used for CLOBs returned by the getTextFiles procedure</entry>
- <entry>The system default encoding</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <para>There are file importer settings, but it does provide metadata for dynamic vdbs.</para>
-
- <section>
- <title>Usage</title>
- <para>
- Retrieve all files as BLOBs with the given extension at the given path.
- </para>
-
- <programlisting>call getFiles('path/*.ext')</programlisting>
-
- <para>
- If the extension pattern is not specified and the path is a directory,
- then all files in the directory will be returned. If the path or filename
- doesn't exist, then no results will be returned.
- </para>
-
- <para>
- Retrieve all files as CLOBs with the given extension at the given path.
- </para>
- <programlisting>call getTextFiles('path/*.ext')</programlisting>
-
- <para>
- Save the CLOB, BLOB, or XML file to given path
- </para>
- <programlisting>call saveFile('path', value)</programlisting>
-
- <para>
- See the database metadata for full descriptions of the getFiles,
- getTextFiles, and saveFile procedures.
- </para>
- </section>
-
- <section>
- <title>JCA Resource Adapter</title>
- <para>The resource adapter for this translator provided through "File Data Source", Refer to Admin Guide for
- configuration information.</para>
- </section>
-
- </section>
-
- <section>
- <title>JDBC Translator</title>
- <para>
- The JDBC translator bridges between SQL semantic and data type difference
- between Teiid and a target RDBMS. Teiid has a range of specific translators
- that target the most popular open source and proprietary databases.
- </para>
-
- <itemizedlist>
- <title>Type names:</title>
- <listitem>
- <para>
- <emphasis>jdbc-ansi</emphasis> - declares support for most SQL
- constructs supported by Teiid, except for row limit/offset and
- EXCEPT/INTERCECT. Translates source SQL into ANSI compliant syntax.
- This translator should be used when another more specific type is
- not available.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>jdbc-simple</emphasis> - same as jdbc-ansi, except disables
- support for function, UNION, and aggregate pushdown.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>db2</emphasis> - for use with DB2 8 or later.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>derby</emphasis> - for use with Derby 10.1 or later.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>h2</emphasis> - for use with H2 version 1.1 or later.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>hsql</emphasis> - for use with HSQLDB 1.7 or later.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>ingres</emphasis> - for use with Ingres 2006 or later.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>ingres93</emphasis> - for use with Ingres 9.3 or later.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>intersystems-cache</emphasis> - for use with Intersystems Cache Object database (only relational aspect of it)
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>informix</emphasis> - for use with any version.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>metamatrix</emphasis> - for use with MetaMatrix 5.5.0 or later.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>modeshape</emphasis> - for use with Modeshape 2.2.1 or later. The PATH, NAME, LOCALNODENAME, DEPTH, and SCORE functions should be accessed as pseudo-columns, e.g. "nt:base"."jcr:path".
- Teiid UFDs (prefixed by JCR_) are available for CONTIANS, ISCHILDNODE, ISDESCENDENT, ISSAMENODE, REFERENCE - see the JCRFunctions.xmi.
- If a selector name is needed in a JCR function, you should use the pseudo-column "jcr:path", e.g. JCR_ISCHILDNODE(foo.jcr_path, 'x/y') would become ISCHILDNODE(foo, 'x/y') in the ModeShape query.
- An additional pseudo-column "mode:properties" should be imported by setting the ModeShape JDBC connection property teiidsupport=true.
- The column "mode:properties" should be used by the JCR_REFERENCE and other
- functions that expect a .* selector name, e.g. JCR_REFERENCE(nt_base.jcr_properties) would become REFERENCE("nt:base".*) in the ModeShape query.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>mysql</emphasis>/<emphasis>mysql5</emphasis> - for use with
- MySQL version 4.x and 5 or later respectively.
- </para>
- <para>
- The MySQL Translators expect the database or session to be using ANSI
- mode. If the database is not using ANSI mode, an initialization query
- should be used on the pool to set ANSI mode:
- </para>
- <programlisting>set SESSION sql_mode = 'ANSI'</programlisting>
- </listitem>
- <listitem>
- <para>
- <emphasis>oracle</emphasis> - for use with Oracle 9i or later.
- Sequences may be used with the Oracle translator. A sequence may be
- modeled as a table with a name in source of DUAL and columns with the
- name in source set to <code><sequencesequence name>.[nextval|currentval].</code>
- You can use a sequence as the default value for insert columns by
- setting the column to autoincrement and the name in source to
- <code><element name>:SEQUENCE=<sequence name>.<sequence value></code>.
- A rownum column can also added to any Oracle physical table to support the rownum pseudo-column.
- A rownum colum should have a name in source of <code>rownum</code>. These rownum columns do not
- have the same semantics as the Oracle rownum construct so care must be taken in their usage.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>postgresql</emphasis> - for use with 8.0 or later clients
- and 7.1 or later server.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>sqlserver</emphasis> - for use with SQL Server 2000 or later. A SQL Server JDBC driver version 2.0 or later (or compatible e.g. JTDS 1.2 or later) should be used.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>sybase</emphasis> - for use with Sybase version 12.5 or later.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>teiid</emphasis> - for use with Teiid 6.0 or later.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>teradata</emphasis> - for use with Teradata V2R5.1 or later.
- </para>
- </listitem>
- </itemizedlist>
-
- <table>
- <title>Execution Properties - shared by all JDBC Translators</title>
- <tgroup cols="3">
- <colspec colwidth="3*" />
- <colspec colwidth="6*" />
- <colspec colwidth="2*" />
- <thead>
- <row>
- <entry>Name</entry>
- <entry>Description</entry>
- <entry>Default</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>DatabaseTimeZone</entry>
- <entry>The time zone of the database. Used when fetchings date, time, or timestamp values.</entry>
- <entry>The system default time zone</entry>
- </row>
- <row>
- <entry>DatabaseVersion</entry>
- <entry>The specific database version. Used to further tune pushdown support.</entry>
- <entry>The base supported version</entry>
- </row>
- <row>
- <entry>TrimStrings</entry>
- <entry>true to trim trailing whitespace from fixed length character strings. Note that Teiid only has a string, or varchar, type that treats trailing whitespace as meaningful.</entry>
- <entry>false</entry>
- </row>
- <row>
- <entry>UseBindVariables</entry>
- <entry>true to indicate that PreparedStatements should be used and that literal values in the source query should be replace with bind variables. If false only LOB values will trigger the use of PreparedStatements.</entry>
- <entry>true</entry>
- </row>
- <row>
- <entry>UseCommentsInSourceQuery</entry>
- <entry>This will embed a /*comment*/ leading comment with session/request id in source SQL query for informational purposes</entry>
- <entry>false</entry>
- </row>
- <row>
- <entry>MaxPreparedInsertBatchSize</entry>
- <entry>The max size of a prepared insert batch.</entry>
- <entry>2048</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <table>
- <title>Importer Properties - shared by all JDBC Translators</title>
- <tgroup cols="3">
- <colspec colwidth="3*" />
- <colspec colwidth="6*" />
- <colspec colwidth="2*" />
- <thead>
- <row>
- <entry>Name</entry>
- <entry>Description</entry>
- <entry>Default</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>catalog</entry>
- <entry>See DatabaseMetaData.getTables<footnote label="1" id="dbmd"><para>Full JavaDoc for <ulink url="http://java.sun.com/javase/6/docs/api/java/sql/DatabaseMetaData.html">DatabaseMetaData</ulink></para></footnote></entry>
- <entry>null</entry>
- </row>
- <row>
- <entry>schemaPattern</entry>
- <entry>See DatabaseMetaData.getTables<footnoteref linkend="dbmd"/></entry>
- <entry>null</entry>
- </row>
- <row>
- <entry>tableNamePattern</entry>
- <entry>See DatabaseMetaData.getTables<footnoteref linkend="dbmd"/></entry>
- <entry>null</entry>
- </row>
- <row>
- <entry>procedurePatternName</entry>
- <entry>See DatabaseMetaData.getProcedures<footnoteref linkend="dbmd"/></entry>
- <entry>null</entry>
- </row>
- <row>
- <entry>tableTypes</entry>
- <entry>Comma separated list - without spaces - of imported table types. See DatabaseMetaData.getTables<footnoteref linkend="dbmd"/></entry>
- <entry>null</entry>
- </row>
- <row>
- <entry>useFullSchemaName</entry>
- <entry>When false, directs the importer to drop the source catalog/schema from the Teiid object name, so that the Teiid fully qualified name will be in the form of <model name>.<table name> - Note: that this may lead to objects with duplicate names when importing from multiple schemas, which results in an exception</entry>
- <entry>true</entry>
- </row>
- <row>
- <entry>importKeys</entry>
- <entry>true to import primary and foriegn keys</entry>
- <entry>true</entry>
- </row>
- <row>
- <entry>importIndexes</entry>
- <entry>true to import index/unique key/cardinality information</entry>
- <entry>true</entry>
- </row>
- <row>
- <entry>importApproximateIndexes</entry>
- <entry>true to import approximate index information. See DatabaseMetaData.getIndexInfo<footnoteref linkend="dbmd"/></entry>
- <entry>true</entry>
- </row>
- <row>
- <entry>importProcedures</entry>
- <entry>true to import procedures and procedure columns - Note that it is not always possible to import procedure result set columns due to database limitations. It is also not currently possible to import overloaded procedures.</entry>
- <entry>true</entry>
- </row>
- <row>
- <entry>widenUnsignedTypes</entry>
- <entry>true to convert unsigned types to the next widest type. For example SQL Server reports tinyint as an unsigned type. With this option enabled, tinyint would be imported as a short instead of a byte.</entry>
- <entry>true</entry>
- </row>
- <row>
- <entry>quoteNameInSource</entry>
- <entry>false will override the default and direct Teiid to create source queries using unquoted identifiers.</entry>
- <entry>true</entry>
- </row>
- <row>
- <entry>useProcedureSpecificName</entry>
- <entry>true will allow the import of overloaded procedures (which will normally result in a duplicate procedure error) by using the unique procedure specific name as the Teiid name. This option will only work with JDBC 4.0 compatable drivers that report specific names.</entry>
- <entry>false</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <warning>
- <para>
- The default import settings will crawl all available metadata. This import
- process is time consuming and full metadata import is not needed in most
- situations. Most commonly you'll want to limit import by schemaPattern
- and tableTypes.
- </para>
- </warning>
-
- <para>
- Example importer settings to only import tables and views from my-schema.
- </para>
- <programlisting language="XML" role="XML"><![CDATA[...
-<property name="importer.tableTypes" value="TABLE,VIEW"/>
-<property name="importer.schemaPattern" value="my-schema"/>
-...]]></programlisting>
-
- <section>
- <title>Usage</title>
- <para>
- Usage of a JDBC source is straight-forward. Using Teiid SQL, the source may be
- queried as if the tables and procedures were local to the Teiid system.
- </para>
- </section>
-
- <section>
- <title>JCA Resource Adapter</title>
- <para>The resource adapter for this translator provided through data source in JBoss AS,
- Refer to Admin Guide for "JDBC Data Sources" configuration section.</para>
- </section>
-
- </section>
-
- <section>
- <title>LDAP Translator</title>
- <para>
- The LDAP translator, known by the type name <emphasis>ldap</emphasis>, exposes an
- LDAP directory tree relationally with pushdown support for filtering via criteria.
- This is typically coupled with the LDAP resource adapter.
- </para>
-
- <table>
- <title>Execution Properties</title>
- <tgroup cols="3">
- <thead>
- <row>
- <entry>Name</entry>
- <entry>Description</entry>
- <entry>Default</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>SearchDerfaultBaseDN</entry>
- <entry>Default Base DN for LDAP Searches</entry>
- <entry>null</entry>
- </row>
- <row>
- <entry>SearchDefaultScope</entry>
- <entry>Default Scope for LDAP Searches. Can be one of SUBTREE_SCOPE, OBJECT_SCOPE, ONELEVEL_SCOPE.</entry>
- <entry>ONELEVEL_SCOPE</entry>
- </row>
- <row>
- <entry>RestrictToObjectClass</entry>
- <entry>Restrict Searches to objectClass named in the Name field for a table</entry>
- <entry>false</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <para>
- There are no import settings for the ldap translator; it also does not
- provide metadata.
- </para>
-
- <section>
- <title>Metadata Directives</title>
- <para>String columns with a default value of "multivalued-concat" will concatinate all attribute
- values together in alphabetical order using a ? delimiter. If a multivalued attribute does not have a default value of "multivalued-concat", then
- any value may be returned.
- </para>
- </section>
-
- <section>
- <title>JCA Resource Adapter</title>
- <para>The resource adapter for this translator provided through "LDAP Data Source",
- Refer to Admin Guide for configuration.</para>
- </section>
-
- </section>
-
- <section>
- <title>Loopback Translator</title>
- <para>
- The Loopback translator, known by the type name <emphasis>loopback</emphasis>,
- provides a quick testing solution. It supports all SQL constructs and returns
- default results, with configurable behavior.
- </para>
-
- <table>
- <title>Execution Properties</title>
- <tgroup cols="3">
- <colspec colwidth="3*" />
- <colspec colwidth="6*" />
- <colspec colwidth="2*" />
- <thead>
- <row>
- <entry>Name</entry>
- <entry>Description</entry>
- <entry>Default</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>ThrowError</entry>
- <entry>true to always throw an error</entry>
- <entry>false</entry>
- </row>
- <row>
- <entry>RowCount</entry>
- <entry>Rows returned for non-update queries.</entry>
- <entry>1</entry>
- </row>
- <row>
- <entry>WaitTime</entry>
- <entry>Wait randomly up to this number of milliseconds with each sourc query.</entry>
- <entry>0</entry>
- </row>
- <row>
- <entry>PollIntervalInMilli</entry>
- <entry>if positive results will be "asynchronously" returned - that is a DataNotAvailableException will be thrown initially and the engine will wait the poll interval before polling for the results.</entry>
- <entry>-1</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <para>
- There are no import settings for the Loopback translator; it also does not
- provide metadata - it should be used as a testing stub.
- </para>
-
- <section>
- <title>JCA Resource Adapter</title>
- <para>The source connection is required for this translator</para>
- </section>
-
- </section>
-
- <section>
- <title>Salesforce Translator</title>
- <para>
- The Salesforce translator, known by the type name <emphasis>salesforce</emphasis>
- supports the SELECT, DELETE, INSERT and UPDATE operations against a Salesforce.com
- account. It is designed for use with the Teiid Salesforce resource adapter.
- </para>
-
- <table>
- <title>Execution Properties</title>
- <tgroup cols="3">
- <colspec colwidth="3*" />
- <colspec colwidth="6*" />
- <colspec colwidth="2*" />
- <thead>
- <row>
- <entry>Name</entry>
- <entry>Description</entry>
- <entry>Default</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>ModelAuditFeilds</entry>
- <entry>Audit Model Fields</entry>
- <entry>false</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <para>
- The Salesforce translator can import metadata, but does not currently
- have import settings.
- </para>
-
- <section>
- <title>Usage</title>
- <section>
- <title>SQL Processing</title>
- <para>
- Salesforce does not provide the same set of
- functionality as a relational database. For example, Salesforce does
- not support arbitrary joins between tables. However, working in
- combination with the Teiid Query Planner, the Salesforce
- connector supports nearly all of the SQL syntax supported by the
- Teiid.
- </para>
- <para>
- The Salesforce Connector executes SQL commands by “pushing
- down” the command to Salesforce whenever possible, based on the
- supported capabilities. Teiid will automatically provide
- additional database functionality when the Salesforce Connector does
- not explicitly provide support for a given SQL construct. In these
- cases, the SQL construct cannot be “pushed down” to the data source,
- so it will be evaluated in Teiid, in order to ensure that the
- operation is performed.
- </para>
- <para>
- In cases where certain SQL capabilities cannot be pushed down
- to Salesforce, Teiid will push down the capabilities that are
- supported, and fetch a set of data from Salesforce. Then, Teiid
- will evaluate the additional capabilities, creating a subset of the
- original data set. Finally, Teiid will pass the result to the
- client.
- </para>
-
- <programlisting language="SQL"><![CDATA[SELECT sum(Reports) FROM Supervisor where Division = 'customer support';]]></programlisting>
-
- <para>
- Neither Salesforce nor the Salesforce Connector support
- the sum() scalar function, but they do support CompareCriteriaEquals,
- so the query that is passed to Salesforce by the connector will be
- transformed to this query.
- </para>
-
- <programlisting language="SQL"><![CDATA[SELECT Reports FROM Supervisor where Division = 'customer support';]]></programlisting>
-
- <para>
- The sum() scalar function will be applied by the Teiid Query Engine to
- the result set returned by the connector.
- </para>
-
- <para>
- In some cases multiple calls to the Salesforce application
- will be made to support the SQL passed to the connector.
- </para>
-
- <programlisting language="SQL"><![CDATA[DELETE From Case WHERE Status = 'Closed';]]></programlisting>
-
- <para>
- The API in Salesforce to delete objects only supports
- deleting by ID. In order to accomplish this the Salesforce connector
- will first execute a query to get the IDs of the correct objects, and
- then delete those objects. So the above DELETE command will result in
- the following two commands.
- </para>
-
- <programlisting language="SQL"><![CDATA[SELECT ID From Case WHERE Status = 'Closed';
-DELETE From Case where ID IN (<result of query>);]]></programlisting>
-
- <para>
- *The Salesforce API DELETE call is not expressed in SQL, but
- the above is an SQL equivalent expression.
- </para>
-
- <para>
- It's useful to be aware of unsupported capabilities, in order
- to avoid fetching large data sets from Salesforce and making you
- queries as performant as possible.
- See all <link linkend="sf_supported">Supported Capabilities</link>.
- </para>
-
- </section>
-
- <section>
- <title>Selecting from Multi-Select Picklists</title>
- <para>
- A multi-select picklist is a field type in Salesforce that can
- contain multiple values in a single field. Query criteria operators
- for fields of this type in SOQL are limited to EQ, NE, includes and
- excludes. The full Salesforce documentation for selecting from
- mullti-select picklists can be found at the following link.
- <ulink url="http://www.salesforce.com/us/developer/docs/api/index_Left.htm#StartTopic...">Querying Mulit-select Picklists</ulink>
- </para>
-
- <para>
- Teiid SQL does not support the includes or
- excludes operators, but the Salesforce connector provides user
- defined function definitions for these operators that provided
- equivalent functionality for fields of type multi-select. The
- definition for the functions is:
- </para>
-
- <programlisting>boolean includes(Column column, String param)
-boolean excludes(Column column, String param)</programlisting>
-
- <para>
- For example, take a single multi-select picklist column
- called Status that contains all of these values.
- </para>
-
- <itemizedlist mark='opencircle'>
- <listitem>
- <para>current</para>
- </listitem>
- <listitem>
- <para>working</para>
- </listitem>
- <listitem>
- <para>critical</para>
- </listitem>
- </itemizedlist>
-
- <para>
- For that column, all of the below are valid queries:
- </para>
-
- <programlisting language="SQL"><![CDATA[SELECT * FROM Issue WHERE true = includes (Status, 'current, working' );
-SELECT * FROM Issue WHERE true = excludes (Status, 'current, working' );
-SELECT * FROM Issue WHERE true = includes (Status, 'current;working, critical' );]]></programlisting>
-
- <para>
- EQ and NE criteria will pass to Salesforce as supplied. For
- example, these queries will not be modified by the connector.
- </para>
-
- <programlisting language="SQL"><![CDATA[SELECT * FROM Issue WHERE Status = 'current';
-SELECT * FROM Issue WHERE Status = 'current;critical';
-SELECT * FROM Issue WHERE Status != 'current;working';]]></programlisting>
-
- </section>
- <section>
- <title>Selecting All Objects</title>
- <para>
- The Salesforce connector supports the calling the queryAll operation
- from the Salesforce API. The queryAll operation is equivalent
- to the query operation with the exception that it returns data about
- <emphasis role="strong">all current and deleted</emphasis>
- objects in the system.
- </para>
- <para>
- The connector determines if it will call the
- query or queryAll operation via reference to the
- isDeleted property present on each Salesforce object,
- and modeled as a column on each table generated by
- the importer. By default this value is set to
- False when the model is generated and thus the connector calls
- query. Users are free to change the value in the model to True,
- changing the default behavior of the connector to be queryAll.
- </para>
- <para>
- The behavior is different if isDeleted is used as a parameter
- in the query. If the isDeleted column is used as a parameter
- in the query, and the value is 'true' the connector will call queryAll.
- </para>
-
- <programlisting language="SQL"><![CDATA[select * from Contact where isDeleted = true;</programlisting>
-
- <para>
- If the isDeleted column is used as a parameter in the query,
- and the value is 'false' the connector perform the default behavior
- will call query.
- </para>
-
- <programlisting language="SQL"><![CDATA[select * from Contact where isDeleted = false;]]></programlisting>
- </section>
- <section>
- <title>Selecting Updated Objects</title>
- <para>
- If the option is selected when importing metadata from
- Salesforce, a GetUpdated procedure is generated in the model with
- the following structure:
- </para>
-
- <programlisting language="SQL"><![CDATA[GetUpdated (ObjectName IN string,
- StartDate IN datetime,
- EndDate IN datetime,
- LatestDateCovered OUT datetime)
-returns
- ID string]]></programlisting>
-
- <para>
- See the description of the
- <ulink url="http://www.salesforce.com/us/developer/docs/api/Content/sforce_api_calls_...">GetUpdated</ulink>
- operation in the Salesforce documentation for usage details.
- </para>
-
- </section>
- <section>
- <title>Selecting Deleted Objects</title>
- <para>
- If the option is selected when importing metadata from
- Salesforce, a GetDeleted procedure is generated in the model with
- the following structure:
- </para>
-
- <programlisting language="SQL"><![CDATA[GetDeleted (ObjectName IN string,
- StartDate IN datetime,
- EndDate IN datetime,
- EarliestDateAvailable OUT datetime,
- LatestDateCovered OUT datetime)
-returns
- ID string,
- DeletedDate datetime]]></programlisting>
-
- <para>
- See the description of the
- <ulink url="http://www.salesforce.com/us/developer/docs/api/Content/sforce_api_calls_...">GetDeleted</ulink>
- operation in the Salesforce documentation for usage details.
- </para>
-
- </section>
- <section>
- <title>Relationship Queries</title>
- <para>
- Salesforce does not support joins like a relational database,
- but it does have support for queries that include parent-to-child
- or child-to-parent relationships between objects. These are termed
- Relationship Queries. The SalesForce connector supports Relationship
- Queries through Outer Join syntax.
- </para>
-
- <programlisting language="SQL"><![CDATA[SELECT Account.name, Contact.Name from Contact LEFT OUTER JOIN Account
-on Contact.Accountid = Account.id]]></programlisting>
-
- <para>
- This query shows the correct syntax to query a SalesForce model with
- to produce a relationship query from child to parent. It resolves to the
- following query to SalesForce.
- </para>
-
- <programlisting language="SQL"><![CDATA[SELECT Contact.Account.Name, Contact.Name FROM Contact]]></programlisting>
-
- <programlisting language="SQL"><![CDATA[select Contact.Name, Account.Name from Account Left outer Join Contact
-on Contact.Accountid = Account.id]]></programlisting>
-
- <para>
- This query shows the correct syntax to query a SalesForce model with
- to produce a relationship query from parent to child. It resolves to the
- following query to SalesForce.
- </para>
-
- <programlisting language="SQL"><![CDATA[SELECT Account.Name, (SELECT Contact.Name FROM
-Account.Contacts) FROM Account]]></programlisting>
-
- <para>
- See the description of the
- <ulink url="http://www.salesforce.com/us/developer/docs/api/index_Left.htm#StartTopic...">Relationship Queries</ulink>
- operation in the SalesForce documentation for limitations.
- </para>
- </section>
-
- <section id="sf_supported">
- <title>Supported Capabilities</title>
- <para>
- The following are the the connector capabilities supported by
- the Salesforce Connector. These SQL constructs will be pushed down to
- Salesforce.
- </para>
-
- <itemizedlist mark='opencircle'>
- <listitem>
- <para>SELECT command</para>
- </listitem>
- <listitem>
- <para>INSERT Command</para>
- </listitem>
- <listitem>
- <para>UPDATE Command</para>
- </listitem>
- <listitem>
- <para>DELETE Command</para>
- </listitem>
- <listitem>
- <para>CompareCriteriaEquals</para>
- </listitem>
- <listitem>
- <para>InCriteria</para>
- </listitem>
- <listitem>
- <para>LikeCriteria - Supported for String fields only.</para>
- </listitem>
- <listitem>
- <para>RowLimit</para>
- </listitem>
- <listitem>
- <para>AggregatesCountStar</para>
- </listitem>
- <listitem>
- <para>NotCriteria</para>
- </listitem>
- <listitem>
- <para>OrCriteria</para>
- </listitem>
- <listitem>
- <para>CompareCriteriaOrdered</para>
- </listitem>
- <listitem>
- <para>OuterJoins with join criteria KEY</para>
- </listitem>
- </itemizedlist>
- </section>
-
- </section>
-
- <section>
- <title>JCA Resource Adapter</title>
- <para>The resource adapter for this translator provided through "Salesforce Data Source",
- Refer to Admin Guide for configuration.</para>
- </section>
-
- </section>
-
- <section>
- <title>Web Services Translator</title>
- <para>
- The Web Services translator, known by the type name <emphasis>ws</emphasis>,
- exposes stored procedures for calling web services backed by a Teiid WS
- resource adapter. It will commonly be used with the
- <link linkend="texttable">TEXTTABLE</link> or
- <link linkend="xmltable">XMLTABLE</link> table functions to use CSV or XML
- formated data.
- </para>
-
- <table>
- <title>Execution Properties</title>
- <tgroup cols="3">
- <colspec colwidth="3*" />
- <colspec colwidth="6*" />
- <colspec colwidth="2*" />
- <thead>
- <row>
- <entry>Name</entry>
- <entry>Description</entry>
- <entry>Default</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>DefaultBinding</entry>
- <entry>The binding that should be used if one is not specified. Can be one of HTTP, SOAP11, or SOAP12
- <note><para>Setting the proper binding value on the translator is recommended as it removes the need for callers to pass an explict value. If your service is actually uses SOAP11, but the binding used SOAP12 you will receive execution failures.</para></note>
- </entry>
- <entry>SOAP12</entry>
- </row>
- <row>
- <entry>DefaultServiceMode</entry>
- <entry>The default service mode. For SOAP, MESSAGE mode indicates that the request will contain the entire SOAP envelope and not just the contents of the SOAP body. Can be one of MESSAGE or PAYLOAD</entry>
- <entry>PAYLOAD</entry>
- </row>
- <row>
- <entry>XMLParamName</entry>
- <entry>Used with the HTTP binding (typically with the GET method) to indicate that the request document should be part of the query string.</entry>
- <entry>null - unused</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <para>
- There are ws importer settings, but it does provide metadata for dynamic VDBs.
- </para>
-
- <section>
- <title>Usage</title>
- <para>
- The WS translator exposes low level procedures for accessing web services.
- See also the ws-weather example in the kit.
- </para>
-
- <section>
- <title>Invoke Procedure</title>
- <para>
- Invoke allows for multiple binding, or protocol modes, including
- HTTP, SOAP11, and SOAP12.
- </para>
- <programlisting>Procedure invoke(binding in STRING, action in STRING, request in XML, endpoint in STRING) returns XML</programlisting>
-
- <para>
- The binding may be one of null (to use the default) HTTP, SOAP11, or
- SOAP12. Action with a SOAP binding indicates the SOAPAction value.
- Action with a HTTP binding indicates the HTTP method (GET, POST, etc.),
- which defaults to POST.
- </para>
-
- <para>
- A null value for the binding or endpoint will use the default value.
- The default endpoint is specified in the WS resource adapter
- configuration. The endpoint URL may be absolute or relative. If it's
- relative then it will be combined with the default endpoint.
- </para>
-
- <para>
- Since multiple parameters are not required to have values, it is often
- more clear to call the invoke procedure with named parameter syntax.
- </para>
- <programlisting>call invoke(binding=>'HTTP', action=>'GET')</programlisting>
- <para>The request XML should be a valid XML document or root element.</para>
- </section>
-
- <section>
- <title>InvokeHTTP Procedure</title>
- <para>
- <methodname>invokeHttp</methodname> can return the byte contents of an HTTP(S) call.
- </para>
- <programlisting>Procedure invokeHttp(action in STRING, request in OBJECT, endpoint in STRING, contentType out STRING) returns BLOB</programlisting>
-
- <para>
- Action indicates the HTTP method (GET, POST, etc.), which defaults to POST.
- </para>
- <para>
- A null value for endpoint will use the default value. The default endpoint
- is specified in the WS resource adapter configuration. The endpoint URL may
- be absolute or relative. If it's relative then it will be combined with the
- default endpoint.
- </para>
- <para>
- Since multiple parameters are not required to have values, it is often more
- clear to call the invoke procedure with named parameter syntax.
- </para>
- <programlisting>call invokeHttp(action=>'GET')</programlisting>
-
- <para>
- The request can be one of SQLXML, STRING, BLOB, or CLOB. The request will be
- sent as the POST payload in byte form. For STRING/CLOB values this will
- default to the UTF-8 encoding. To control the byte encoding, see the
- <link linkend="to_bytes">to_bytes</link> function.
- </para>
- </section>
- </section>
- <section>
- <title>JCA Resource Adapter</title>
- <para>Theresource adapter for this translator provided through "Web Service Data Source",
- Refer to Admin Guide for configuration.</para>
- </section>
- </section>
-
- <section>
- <title>OLAP Translator</title>
- <para>
- The OLAP Services translator, known by the type name <emphasis>olap</emphasis>,
- exposes stored procedures for calling analysis sevices backed by a OLAP server using MDX query lanaguage.
- This translator exposes a stored procedure, invokeMDX, that returns a result set containing tuple array values for a given MDX query.
- invokeMDX will commonly be used with the <link linkend="arraytable">ARRAYTABLE</link> table function to extract the results.
- </para>
- <para>
- Since the Cube metadata exposed by the OLAP servers and relational database metadata are so different, there is no single
- way to map the metadata from one to other. It is best to query OLAP system using its own native MDX language
- through. MDX queries my be defined statically or built dynamically in Teiid's abstraction layers.
- </para>
-
- <section>
- <title>Usage</title>
- <para>
- The olap translator exposes one low level procedure for accessing olap services.
- </para>
-
- <section>
- <title>InvokeMDX Procedure</title>
- <para>
- <methodname>invokeMdx</methodname> returns a resultset of the tuples as array values.
- </para>
- <programlisting>Procedure invokeMdx(mdx in STRING) returns resultset (tuple object)</programlisting>
-
- <para>
- The mdx parameter is a MDX query to be executed on the OLAP server.
- </para>
- <para>
- The results of the query will be returned such that each row on the row axis will be packed into an array value that will first contain each hierarcy member name on the row axis then each measure value from the column axis.
- </para>
- <note><para>The use of <xref linkend="dataroles"/> should be considered to prevent arbitrary MDX from being submitted to the invokeMDX procedure.</para></note>
- <para>
- </para>
- </section>
- </section>
- <section>
- <title>JCA Resource Adapter</title>
- <para>The resource adapter for this translator provided through data source in JBoss AS,
- Refer to Admin Guide for "JDBC Data Sources" configuration section. Two sample
- -ds.xml files provided for accessing OLAP servers in teiid-examples section. One is Mondrian specific,
- when Mondrian server is deloyed
- in the same JBoss AS as Teiid (mondrian-ds.xml). To access any other OLAP servers using XMLA interface,
- the data source for them can be created using them example template olap-xmla-ds.xml</para>
- </section>
- </section>
-
- <section>
- <title>Delegating Translators</title>
- <para>
- You may create a delegating translator by extending the <code>org.teiid.translator.BaseDelegatingExecutionFactory</code>.
- Once your classes are then packaged as a custom translator, you will be able to wire another translator instance into your delegating translator at runtime in order to intercept
- all of the calls to the delegate. This base class does not provide any functionality on its own, other than delegation.
- </para>
-
- <table>
- <title>Execution Properties</title>
- <tgroup cols="3">
- <colspec colwidth="3*" />
- <colspec colwidth="6*" />
- <colspec colwidth="2*" />
- <thead>
- <row>
- <entry>Name</entry>
- <entry>Description</entry>
- <entry>Default</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>delegateName</entry>
- <entry>Translator instance name to delegate to</entry>
- <entry></entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </section>
- </section>
-
- <section id="dynamic_vdbs">
- <title>Dynamic VDBs</title>
- <para>
- Teiid integration is available via a "Dynamic VDB" without the need for Teiid Designer
- tooling. While this mode of operation does not yet allow for the creation of view
- layers, the underlying sources can still be queried as if they are a single source. See
- the kit's "teiid-example/dynamicvdb-*" for working examples.
- </para>
-
- <para>
- To build a dynamic VDB, you'll need to create a
- <filename><replaceable>SOME-NAME</replaceable>-vdb.xml</filename> file. The XML file captures
- information about the VDB, the sources it integrate, and preferences for importing metadata.
- </para>
-
- <note>
- <para>
- VDB name pattern must adhere to "-vdb.xml" for the Teiid VDB deployer to
- recognize this file as a dynamic VDB.
- </para>
- </note>
-
- <para>
- my-vdb.xml: (The vdb-deployer.xml schema for this file is available in the schema
- folder under the docs with the Teiid distribution.)
- </para>
-
- <programlisting role="XML" language="XML"><![CDATA[<vdb name="${vdb-name}" version="${vdb-version}">
-
- <property name="UseConnectorMetadata" value="..." />
-
- <!-- define a model fragment for each data source -->
- <model name="${model-name}">
-
- <property name="..." value="..." />
- ...
-
- <source name="${source-name}" translator-name="${translator-name}"
-
- connection-jndi-name="${deployed-jndi-name}">
- ...
- </model>
-
- <!-- create translator instances that override default properties -->
-
- <translator name="${translator-name}" type="${translator-type}" />
-
- <property name="..." value="..." />
- ...
-
- </translator>
-</vdb>]]></programlisting>
-
- <section>
- <title>VDB Element</title>
- <itemizedlist>
- <title>Attributes</title>
- <listitem>
- <para>
- <emphasis>name</emphasis>
- </para>
- <para>
- The name of the VDB. The VDB name
- referenced through the driver or datasource during the connection time.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>version</emphasis>
- </para>
- <para>
- The version of the VDB (should be an
- positive integer). This determines the deployed directory location
- (see Name), and provides an explicit versioning mechanism to the VDB
- name.
- </para>
- </listitem>
- </itemizedlist>
-
- <itemizedlist>
- <title>Property Elements</title>
- <listitem>
- <para>
- <emphasis>UseConnectorMetadata</emphasis>
- </para>
- <para>
- Setting to use connector
- supplied metadata. Can be "true" or "cached". "true" will obtain
- metadata once for every launch of Teiid. "cached" will save a file
- containing the metadata into the
- <filename><replaceable>PROFILE</replaceable>/data/teiid</filename> directory
- </para>
- </listitem>
- </itemizedlist>
-
- </section>
-
- <section>
- <title>Model Element</title>
- <itemizedlist>
- <title>Attributes</title>
- <listitem>
- <para>
- <emphasis>name</emphasis>
- </para>
- <para>
- The name of the model is used as a
- top level schema name for all of the metadata imported from the
- connector. The name should be unique among all Models in the VDB and
- should not contain the '.' character.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>version</emphasis>
- </para>
- <para>
- The version of the VDB (should be an
- positive integer). This determines the deployed directory location
- (see Name), and provides an explicit versioning mechanism to the VDB
- name.
- </para>
- </listitem>
- </itemizedlist>
-
- <itemizedlist>
- <title>Source Element</title>
- <listitem>
- <para>
- <emphasis>name</emphasis>
- </para>
- <para>
- The name of the source to use for this
- model. This can be any name you like, but will typically be the same
- as the model name. Having a name different than the model name is
- only useful in multi-source scenarios.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>translator-name</emphasis>
- </para>
- <para>
- The name or type of the Teiid Translator to use. Possible values include
- the built-in types (ws, file, ldap, oracle, sqlserver, db2, derby, etc.)
- and translators defined in the translators section.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>connection-jndi-name</emphasis>
- </para>
- <para>
- The JNDI name of this source's connection factory. There should be a
- corresponding "-ds.xml" file that defines the connection factory in
- the JBoss AS. Check out the deploying VDB dependencies section for
- info. You also need to deploy these connection factories before you
- can deploy the VDB.
- </para>
- </listitem>
- </itemizedlist>
-
- <itemizedlist>
- <title>Property Elements</title>
- <listitem>
- <para>
- <emphasis>importer.<propertyname></emphasis>
- </para>
- <para>
- Property to be used by the connector importer for the model for purposes
- importing metadata. See possible property name/values in the
- Translator specific section. Note that using these properties you
- can narrow or widen the data elements available for integration.
- </para>
- </listitem>
- </itemizedlist>
-
- </section>
- <section>
- <title>Translator Element</title>
- <itemizedlist>
- <title>Attributes</title>
- <listitem>
- <para>
- <emphasis>name</emphasis>
- </para>
- <para>
- The name of the the Translator. Referenced by the source element.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis>type</emphasis>
- </para>
- <para>
- The base type of the Translator. Can be one of the built-in types (ws,
- file, ldap, oracle, sqlserver, db2, derby, etc.).
- </para>
- </listitem>
- </itemizedlist>
-
- <itemizedlist>
- <title>Property Elements</title>
- <listitem>
- <para>
- Set a value that overrides a translator default property. See
- possible property name/values in the Translator specific section.
- </para>
- </listitem>
- </itemizedlist>
- </section>
-
- </section>
- <section>
- <title>Multi-Source Models and VDB</title>
- <para>
- When you have multiple instances of data that are using identical schema
- (horizontal sharding), Teiid can help you aggregate data across all the
- instances, using "multi-source" models. In this scenario, instead of
- creating/importing a model for every data source, user needs to define one
- source model that represents the schema and configure multiple data "sources"
- underneath it. During runtime, when a query issued against this model, the query
- engine analyzes the information and gathers the required data from all the
- sources configured and aggregates the results and provides in a single result set.
- </para>
-
- <para>
- To mark a model as multi-source, the user needs to supply property called
- <property>supports-multi-source-bindings</property>, in the "vdb.xml" file.
- Also, the user needs to define multiple sources. Here is code example showing dynamic vdb with single model with
- multiple sources defined.
- </para>
-
- <programlisting role="XML" language="XML"><![CDATA[<vdb name="vdbname" version="1">
- <model visible="true" type="PHYSICAL" name="Customers" path="/Test/Customers.xmi">
- <property name="supports-multi-source-bindings" value="true"/>
- <source name="chicago"
- translator-name="oracle" connection-jndi-name="chicago-customers"/>
- <source name="newyork"
- translator-name="oracle" connection-jndi-name="newyork-customers"/>
- <source name="la"
- translator-name="oracle" connection-jndi-name="la-customers"/>
- </model>
-</vdb>]]></programlisting>
-
- <para>
- In the above example, the VDB defined has single model called <literal>Customers</literal>,
- that has multiple sources (<literal>chicago</literal>, <literal>newyork</literal>,
- and <literal>la</literal>) that define different instances of data. Every
- time a model is marked as "multi-source", the
- runtime engine adds a additional column called "SOURCE_NAME" to every table in
- that model. This column maps to the source's name from the XML. In
- the above XML code that would be <literal>chicago</literal>, <literal>la</literal>,
- <literal>newyork</literal>. This allows queries like the following:
- </para>
-
- <programlisting language="SQL"><![CDATA[select * from table where SOURCE_NAME = 'newyork'
-update table column=value where SOURCE_NAME='chicago'
-delete from table where column = x and SOURCE_NAME='la'
-insert into table (column, SOURCE_NAME) VALUES ('value', 'newyork')]]></programlisting>
-
- <para>
- Note that when user do not supply the "SOURCE_NAME" in the criteria, the command applies
- to all the sources. If SOURCE_NAME supplied, the query is executed only aginst the source specified.
- Another useful feature along with this feature is
- "partial results" to skip unavailable sources if they are down.
- </para>
-
- <note>
- <para>
- Currently the tooling support for managing the multi-source feature is
- limited, so if you need to use this feature build the VDB as usual in
- the Teiid Designer and then edit the "vdb.xml" file in the VDB archive
- using a Text editor to add the additional sources as defined above.
- You must deploy a separate data source for each source defined in the xml file.
- </para>
- </note>
-
- <note>
- <para>
- If you would like to use "SOURCE_NAME" in your transformations to control which sources are accessed or updated,
- you would manually need to add this extra column on your view table in
- the Designer. This column will not be automatically added on the source table, when you import
- the medata from source.
- </para>
- </note>
- </section>
-
-</chapter>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/documentation/reference/src/main/docbook/en-US/content/translators.xml (from rev 3138, trunk/documentation/reference/src/main/docbook/en-US/content/translators.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/documentation/reference/src/main/docbook/en-US/content/translators.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/documentation/reference/src/main/docbook/en-US/content/translators.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,1471 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<chapter id="translators">
+ <title>Translators</title>
+
+ <section>
+ <title>Introduction to the Teiid Connector Architecture</title>
+ <para>
+ The Teiid Connector Architecture (TCA) provides Teiid with a robust mechanism
+ for integrating with external systems. The TCA defines a common client interface
+ between Teiid and an external system that includes metadata as to what SQL
+ constructs are supported for pushdown and the ability to import metadata from
+ the external system.
+ </para>
+
+ <para>
+ A Translator is the heart of the TCA and acts as the bridge logic between Teiid
+ and an external system, which is most commonly accessed through a JCA resource
+ adapter. Refer to the Teiid Developers Guide for details on developing custom
+ Translators and JCA resource adapters for use with Teiid.
+ </para>
+
+ <note>
+ <para>
+ The TCA is not the same as the JCA, the JavaEE Connector Architecture, although
+ the TCA is designed for use with JCA resource adapters.
+ </para>
+ </note>
+
+ <note>
+ <para>
+ The import capabilities of Teiid Translators is currently only used in
+ <link linkend="dynamic_vdbs">dynamic VDBs</link> and not by the Teiid Designer.
+ </para>
+ </note>
+
+ </section>
+
+ <section>
+ <title>Translators</title>
+ <para>
+ A Translator is typically paired with a particular JCA resource adapter. In
+ instances where pooling, environment dependent configuration management, advanced
+ security handling, etc. are not needed, then a JCA resource adapter is not needed.
+ The configuration of JCA ConnectionFactories for needed resource adapters is not
+ part of this guide, please see the Teiid Administrator Guide and the kit examples
+ for configuring resource adapters for use in JBossAS.
+ </para>
+
+ <para>
+ Translators can have a number of configurable properties. These are broken down
+ into execution properties, which determine aspects of how data is retrieved, and
+ import settings, which determine what metadata is read for import.
+ </para>
+
+ <para>
+ The execution properties for a translator typically have reasonable defaults. For
+ specific translator types, e.g. the Derby translator, base execution properties are
+ already tuned to match the source. In most cases the user will not need to adjust
+ their values.
+ </para>
+
+ <table>
+ <title>Base Execution Properties - shared by all translators</title>
+ <tgroup cols="3">
+ <colspec colwidth="4*" />
+ <colspec colwidth="6*" />
+ <colspec colwidth="2*" />
+ <thead>
+ <row>
+ <entry>Name</entry>
+ <entry>Description</entry>
+ <entry>Default</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>Immutable</entry>
+ <entry>Set to true to indicate that the source never changes.</entry>
+ <entry>false</entry>
+ </row>
+ <row>
+ <entry>RequiresCriteria</entry>
+ <entry>Set to true to indicate that source SELECT/UPDATE/DELETE queries require a where clause.</entry>
+ <entry>false</entry>
+ </row>
+ <row>
+ <entry>SupportsOrderBy</entry>
+ <entry>Set to true to indicate that the ORDER BY clause is supported.</entry>
+ <entry>false</entry>
+ </row>
+ <row>
+ <entry>SupportsOuterJoins</entry>
+ <entry>Set to true to indicate that OUTER JOINs are supported.</entry>
+ <entry>false</entry>
+ </row>
+ <row>
+ <entry>SupportsFullOuterJoins</entry>
+ <entry>If outer joins are supported, true indicates that FULL OUTER JOINs are supported.</entry>
+ <entry>false</entry>
+ </row>
+ <row>
+ <entry>SupportsInnerJoins</entry>
+ <entry>Set to true to indicate that INNER JOINs are supported.</entry>
+ <entry>false</entry>
+ </row>
+ <row>
+ <entry>SupportedJoinCriteria</entry>
+ <entry>If joins are supported, defines what criteria may be used as the join criteria. May be one of (ANY, THETA, EQUI, or KEY).</entry>
+ <entry>ANY</entry>
+ </row>
+ <row>
+ <entry>MaxInCriteriaSize</entry>
+ <entry>If in criteria are supported, defines what the maximum number of in entries are per predicate. -1 indicates no limit.</entry>
+ <entry>-1</entry>
+ </row>
+ <row>
+ <entry>MaxDependentInPredicates</entry>
+ <entry>If in criteria are supported, defines what the maximum number of predicates that can be used for a dependent join.
+ Values less than 1 indicate to use only one in predicate per dependent value pushed (which matches the pre-7.4 behavior).</entry>
+ <entry>-1</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <note>
+ <para>
+ Only a subset of the supports metadata can be set through execution properties. If more control is needed, please
+ consult the Teiid Developers Guide.
+ </para>
+ </note>
+
+ <para>There are no base importer settings.</para>
+
+ <section>
+ <title>File Translator</title>
+ <para>
+ The file translator, known by the type name <emphasis>file</emphasis>, exposes
+ stored procedures to leverage file system resources exposed by the file resource
+ adapter. It will commonly be used with the <link linkend="texttable">TEXTTABLE</link>
+ or <link linkend="xmltable">XMLTABLE</link> table functions to use CSV or XML
+ formated data.
+ </para>
+
+ <table>
+ <title>Execution Properties</title>
+ <tgroup cols="3">
+ <colspec colwidth="1*" />
+ <colspec colwidth="4*" />
+ <colspec colwidth="1*" />
+ <thead>
+ <row>
+ <entry>Name</entry>
+ <entry>Description</entry>
+ <entry>Default</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>Encoding</entry>
+ <entry>The encoding that should be used for CLOBs returned by the getTextFiles procedure</entry>
+ <entry>The system default encoding</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>There are file importer settings, but it does provide metadata for dynamic vdbs.</para>
+
+ <section>
+ <title>Usage</title>
+ <para>
+ Retrieve all files as BLOBs with the given extension at the given path.
+ </para>
+
+ <programlisting>call getFiles('path/*.ext')</programlisting>
+
+ <para>
+ If the extension pattern is not specified and the path is a directory,
+ then all files in the directory will be returned. If the path or filename
+ doesn't exist, then no results will be returned.
+ </para>
+
+ <para>
+ Retrieve all files as CLOBs with the given extension at the given path.
+ </para>
+ <programlisting>call getTextFiles('path/*.ext')</programlisting>
+
+ <para>
+ Save the CLOB, BLOB, or XML file to given path
+ </para>
+ <programlisting>call saveFile('path', value)</programlisting>
+
+ <para>
+ See the database metadata for full descriptions of the getFiles,
+ getTextFiles, and saveFile procedures.
+ </para>
+ </section>
+
+ <section>
+ <title>JCA Resource Adapter</title>
+ <para>The resource adapter for this translator provided through "File Data Source", Refer to Admin Guide for
+ configuration information.</para>
+ </section>
+
+ </section>
+
+ <section>
+ <title>JDBC Translator</title>
+ <para>
+ The JDBC translator bridges between SQL semantic and data type difference
+ between Teiid and a target RDBMS. Teiid has a range of specific translators
+ that target the most popular open source and proprietary databases.
+ </para>
+
+ <itemizedlist>
+ <title>Type names:</title>
+ <listitem>
+ <para>
+ <emphasis>jdbc-ansi</emphasis> - declares support for most SQL
+ constructs supported by Teiid, except for row limit/offset and
+ EXCEPT/INTERCECT. Translates source SQL into ANSI compliant syntax.
+ This translator should be used when another more specific type is
+ not available.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>jdbc-simple</emphasis> - same as jdbc-ansi, except disables
+ support for function, UNION, and aggregate pushdown.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>db2</emphasis> - for use with DB2 8 or later.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>derby</emphasis> - for use with Derby 10.1 or later.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>h2</emphasis> - for use with H2 version 1.1 or later.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>hsql</emphasis> - for use with HSQLDB 1.7 or later.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>ingres</emphasis> - for use with Ingres 2006 or later.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>ingres93</emphasis> - for use with Ingres 9.3 or later.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>intersystems-cache</emphasis> - for use with Intersystems Cache Object database (only relational aspect of it)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>informix</emphasis> - for use with any version.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>metamatrix</emphasis> - for use with MetaMatrix 5.5.0 or later.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>modeshape</emphasis> - for use with Modeshape 2.2.1 or later. The PATH, NAME, LOCALNODENAME, DEPTH, and SCORE functions should be accessed as pseudo-columns, e.g. "nt:base"."jcr:path".
+ Teiid UFDs (prefixed by JCR_) are available for CONTIANS, ISCHILDNODE, ISDESCENDENT, ISSAMENODE, REFERENCE - see the JCRFunctions.xmi.
+ If a selector name is needed in a JCR function, you should use the pseudo-column "jcr:path", e.g. JCR_ISCHILDNODE(foo.jcr_path, 'x/y') would become ISCHILDNODE(foo, 'x/y') in the ModeShape query.
+ An additional pseudo-column "mode:properties" should be imported by setting the ModeShape JDBC connection property teiidsupport=true.
+ The column "mode:properties" should be used by the JCR_REFERENCE and other
+ functions that expect a .* selector name, e.g. JCR_REFERENCE(nt_base.jcr_properties) would become REFERENCE("nt:base".*) in the ModeShape query.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>mysql</emphasis>/<emphasis>mysql5</emphasis> - for use with
+ MySQL version 4.x and 5 or later respectively.
+ </para>
+ <para>
+ The MySQL Translators expect the database or session to be using ANSI
+ mode. If the database is not using ANSI mode, an initialization query
+ should be used on the pool to set ANSI mode:
+ </para>
+ <programlisting>set SESSION sql_mode = 'ANSI'</programlisting>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>oracle</emphasis> - for use with Oracle 9i or later.
+ Sequences may be used with the Oracle translator. A sequence may be
+ modeled as a table with a name in source of DUAL and columns with the
+ name in source set to <code><sequencesequence name>.[nextval|currentval].</code>
+ You can use a sequence as the default value for insert columns by
+ setting the column to autoincrement and the name in source to
+ <code><element name>:SEQUENCE=<sequence name>.<sequence value></code>.
+ A rownum column can also added to any Oracle physical table to support the rownum pseudo-column.
+ A rownum colum should have a name in source of <code>rownum</code>. These rownum columns do not
+ have the same semantics as the Oracle rownum construct so care must be taken in their usage.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>postgresql</emphasis> - for use with 8.0 or later clients
+ and 7.1 or later server.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>sqlserver</emphasis> - for use with SQL Server 2000 or later. A SQL Server JDBC driver version 2.0 or later (or compatible e.g. JTDS 1.2 or later) should be used.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>sybase</emphasis> - for use with Sybase version 12.5 or later.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>teiid</emphasis> - for use with Teiid 6.0 or later.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>teradata</emphasis> - for use with Teradata V2R5.1 or later.
+ </para>
+ </listitem>
+ </itemizedlist>
+
+ <table>
+ <title>Execution Properties - shared by all JDBC Translators</title>
+ <tgroup cols="3">
+ <colspec colwidth="4*" />
+ <colspec colwidth="6*" />
+ <colspec colwidth="2*" />
+ <thead>
+ <row>
+ <entry>Name</entry>
+ <entry>Description</entry>
+ <entry>Default</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>DatabaseTimeZone</entry>
+ <entry>The time zone of the database. Used when fetchings date, time, or timestamp values.</entry>
+ <entry>The system default time zone</entry>
+ </row>
+ <row>
+ <entry>DatabaseVersion</entry>
+ <entry>The specific database version. Used to further tune pushdown support.</entry>
+ <entry>The base supported version</entry>
+ </row>
+ <row>
+ <entry>TrimStrings</entry>
+ <entry>true to trim trailing whitespace from fixed length character strings. Note that Teiid only has a string, or varchar, type that treats trailing whitespace as meaningful.</entry>
+ <entry>false</entry>
+ </row>
+ <row>
+ <entry>UseBindVariables</entry>
+ <entry>true to indicate that PreparedStatements should be used and that literal values in the source query should be replace with bind variables. If false only LOB values will trigger the use of PreparedStatements.</entry>
+ <entry>true</entry>
+ </row>
+ <row>
+ <entry>UseCommentsInSourceQuery</entry>
+ <entry>This will embed a /*comment*/ leading comment with session/request id in source SQL query for informational purposes</entry>
+ <entry>false</entry>
+ </row>
+ <row>
+ <entry>MaxPreparedInsertBatchSize</entry>
+ <entry>The max size of a prepared insert batch.</entry>
+ <entry>2048</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Importer Properties - shared by all JDBC Translators</title>
+ <tgroup cols="3">
+ <colspec colwidth="4*" />
+ <colspec colwidth="6*" />
+ <colspec colwidth="2*" />
+ <thead>
+ <row>
+ <entry>Name</entry>
+ <entry>Description</entry>
+ <entry>Default</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>catalog</entry>
+ <entry>See DatabaseMetaData.getTables<footnote label="1" id="dbmd"><para>Full JavaDoc for <ulink url="http://java.sun.com/javase/6/docs/api/java/sql/DatabaseMetaData.html">DatabaseMetaData</ulink></para></footnote></entry>
+ <entry>null</entry>
+ </row>
+ <row>
+ <entry>schemaPattern</entry>
+ <entry>See DatabaseMetaData.getTables<footnoteref linkend="dbmd"/></entry>
+ <entry>null</entry>
+ </row>
+ <row>
+ <entry>tableNamePattern</entry>
+ <entry>See DatabaseMetaData.getTables<footnoteref linkend="dbmd"/></entry>
+ <entry>null</entry>
+ </row>
+ <row>
+ <entry>procedurePatternName</entry>
+ <entry>See DatabaseMetaData.getProcedures<footnoteref linkend="dbmd"/></entry>
+ <entry>null</entry>
+ </row>
+ <row>
+ <entry>tableTypes</entry>
+ <entry>Comma separated list - without spaces - of imported table types. See DatabaseMetaData.getTables<footnoteref linkend="dbmd"/></entry>
+ <entry>null</entry>
+ </row>
+ <row>
+ <entry>useFullSchemaName</entry>
+ <entry>When false, directs the importer to drop the source catalog/schema from the Teiid object name, so that the Teiid fully qualified name will be in the form of <model name>.<table name> - Note: that this may lead to objects with duplicate names when importing from multiple schemas, which results in an exception</entry>
+ <entry>true</entry>
+ </row>
+ <row>
+ <entry>importKeys</entry>
+ <entry>true to import primary and foriegn keys</entry>
+ <entry>true</entry>
+ </row>
+ <row>
+ <entry>importIndexes</entry>
+ <entry>true to import index/unique key/cardinality information</entry>
+ <entry>true</entry>
+ </row>
+ <row>
+ <entry>importApproximateIndexes</entry>
+ <entry>true to import approximate index information. See DatabaseMetaData.getIndexInfo<footnoteref linkend="dbmd"/></entry>
+ <entry>true</entry>
+ </row>
+ <row>
+ <entry>importProcedures</entry>
+ <entry>true to import procedures and procedure columns - Note that it is not always possible to import procedure result set columns due to database limitations. It is also not currently possible to import overloaded procedures.</entry>
+ <entry>true</entry>
+ </row>
+ <row>
+ <entry>widenUnsignedTypes</entry>
+ <entry>true to convert unsigned types to the next widest type. For example SQL Server reports tinyint as an unsigned type. With this option enabled, tinyint would be imported as a short instead of a byte.</entry>
+ <entry>true</entry>
+ </row>
+ <row>
+ <entry>quoteNameInSource</entry>
+ <entry>false will override the default and direct Teiid to create source queries using unquoted identifiers.</entry>
+ <entry>true</entry>
+ </row>
+ <row>
+ <entry>useProcedureSpecificName</entry>
+ <entry>true will allow the import of overloaded procedures (which will normally result in a duplicate procedure error) by using the unique procedure specific name as the Teiid name. This option will only work with JDBC 4.0 compatable drivers that report specific names.</entry>
+ <entry>false</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <warning>
+ <para>
+ The default import settings will crawl all available metadata. This import
+ process is time consuming and full metadata import is not needed in most
+ situations. Most commonly you'll want to limit import by schemaPattern
+ and tableTypes.
+ </para>
+ </warning>
+
+ <para>
+ Example importer settings to only import tables and views from my-schema.
+ </para>
+ <programlisting language="XML" role="XML"><![CDATA[...
+<property name="importer.tableTypes" value="TABLE,VIEW"/>
+<property name="importer.schemaPattern" value="my-schema"/>
+...]]></programlisting>
+
+ <section>
+ <title>Usage</title>
+ <para>
+ Usage of a JDBC source is straight-forward. Using Teiid SQL, the source may be
+ queried as if the tables and procedures were local to the Teiid system.
+ </para>
+ </section>
+
+ <section>
+ <title>JCA Resource Adapter</title>
+ <para>The resource adapter for this translator provided through data source in JBoss AS,
+ Refer to Admin Guide for "JDBC Data Sources" configuration section.</para>
+ </section>
+
+ </section>
+
+ <section>
+ <title>LDAP Translator</title>
+ <para>
+ The LDAP translator, known by the type name <emphasis>ldap</emphasis>, exposes an
+ LDAP directory tree relationally with pushdown support for filtering via criteria.
+ This is typically coupled with the LDAP resource adapter.
+ </para>
+
+ <table>
+ <title>Execution Properties</title>
+ <tgroup cols="3">
+ <thead>
+ <row>
+ <entry>Name</entry>
+ <entry>Description</entry>
+ <entry>Default</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>SearchDerfaultBaseDN</entry>
+ <entry>Default Base DN for LDAP Searches</entry>
+ <entry>null</entry>
+ </row>
+ <row>
+ <entry>SearchDefaultScope</entry>
+ <entry>Default Scope for LDAP Searches. Can be one of SUBTREE_SCOPE, OBJECT_SCOPE, ONELEVEL_SCOPE.</entry>
+ <entry>ONELEVEL_SCOPE</entry>
+ </row>
+ <row>
+ <entry>RestrictToObjectClass</entry>
+ <entry>Restrict Searches to objectClass named in the Name field for a table</entry>
+ <entry>false</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>
+ There are no import settings for the ldap translator; it also does not
+ provide metadata.
+ </para>
+
+ <section>
+ <title>Metadata Directives</title>
+ <para>String columns with a default value of "multivalued-concat" will concatinate all attribute
+ values together in alphabetical order using a ? delimiter. If a multivalued attribute does not have a default value of "multivalued-concat", then
+ any value may be returned.
+ </para>
+ </section>
+
+ <section>
+ <title>JCA Resource Adapter</title>
+ <para>The resource adapter for this translator provided through "LDAP Data Source",
+ Refer to Admin Guide for configuration.</para>
+ </section>
+
+ </section>
+
+ <section>
+ <title>Loopback Translator</title>
+ <para>
+ The Loopback translator, known by the type name <emphasis>loopback</emphasis>,
+ provides a quick testing solution. It supports all SQL constructs and returns
+ default results, with configurable behavior.
+ </para>
+
+ <table>
+ <title>Execution Properties</title>
+ <tgroup cols="3">
+ <colspec colwidth="3*" />
+ <colspec colwidth="6*" />
+ <colspec colwidth="2*" />
+ <thead>
+ <row>
+ <entry>Name</entry>
+ <entry>Description</entry>
+ <entry>Default</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>ThrowError</entry>
+ <entry>true to always throw an error</entry>
+ <entry>false</entry>
+ </row>
+ <row>
+ <entry>RowCount</entry>
+ <entry>Rows returned for non-update queries.</entry>
+ <entry>1</entry>
+ </row>
+ <row>
+ <entry>WaitTime</entry>
+ <entry>Wait randomly up to this number of milliseconds with each sourc query.</entry>
+ <entry>0</entry>
+ </row>
+ <row>
+ <entry>PollIntervalInMilli</entry>
+ <entry>if positive results will be "asynchronously" returned - that is a DataNotAvailableException will be thrown initially and the engine will wait the poll interval before polling for the results.</entry>
+ <entry>-1</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>
+ There are no import settings for the Loopback translator; it also does not
+ provide metadata - it should be used as a testing stub.
+ </para>
+
+ <section>
+ <title>JCA Resource Adapter</title>
+ <para>The source connection is required for this translator</para>
+ </section>
+
+ </section>
+
+ <section>
+ <title>Salesforce Translator</title>
+ <para>
+ The Salesforce translator, known by the type name <emphasis>salesforce</emphasis>
+ supports the SELECT, DELETE, INSERT and UPDATE operations against a Salesforce.com
+ account. It is designed for use with the Teiid Salesforce resource adapter.
+ </para>
+
+ <table>
+ <title>Execution Properties</title>
+ <tgroup cols="3">
+ <colspec colwidth="3*" />
+ <colspec colwidth="6*" />
+ <colspec colwidth="2*" />
+ <thead>
+ <row>
+ <entry>Name</entry>
+ <entry>Description</entry>
+ <entry>Default</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>ModelAuditFeilds</entry>
+ <entry>Audit Model Fields</entry>
+ <entry>false</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>
+ The Salesforce translator can import metadata, but does not currently
+ have import settings.
+ </para>
+
+ <section>
+ <title>Usage</title>
+ <section>
+ <title>SQL Processing</title>
+ <para>
+ Salesforce does not provide the same set of
+ functionality as a relational database. For example, Salesforce does
+ not support arbitrary joins between tables. However, working in
+ combination with the Teiid Query Planner, the Salesforce
+ connector supports nearly all of the SQL syntax supported by the
+ Teiid.
+ </para>
+ <para>
+ The Salesforce Connector executes SQL commands by “pushing
+ down” the command to Salesforce whenever possible, based on the
+ supported capabilities. Teiid will automatically provide
+ additional database functionality when the Salesforce Connector does
+ not explicitly provide support for a given SQL construct. In these
+ cases, the SQL construct cannot be “pushed down” to the data source,
+ so it will be evaluated in Teiid, in order to ensure that the
+ operation is performed.
+ </para>
+ <para>
+ In cases where certain SQL capabilities cannot be pushed down
+ to Salesforce, Teiid will push down the capabilities that are
+ supported, and fetch a set of data from Salesforce. Then, Teiid
+ will evaluate the additional capabilities, creating a subset of the
+ original data set. Finally, Teiid will pass the result to the
+ client.
+ </para>
+
+ <programlisting language="SQL"><![CDATA[SELECT sum(Reports) FROM Supervisor where Division = 'customer support';]]></programlisting>
+
+ <para>
+ Neither Salesforce nor the Salesforce Connector support
+ the sum() scalar function, but they do support CompareCriteriaEquals,
+ so the query that is passed to Salesforce by the connector will be
+ transformed to this query.
+ </para>
+
+ <programlisting language="SQL"><![CDATA[SELECT Reports FROM Supervisor where Division = 'customer support';]]></programlisting>
+
+ <para>
+ The sum() scalar function will be applied by the Teiid Query Engine to
+ the result set returned by the connector.
+ </para>
+
+ <para>
+ In some cases multiple calls to the Salesforce application
+ will be made to support the SQL passed to the connector.
+ </para>
+
+ <programlisting language="SQL"><![CDATA[DELETE From Case WHERE Status = 'Closed';]]></programlisting>
+
+ <para>
+ The API in Salesforce to delete objects only supports
+ deleting by ID. In order to accomplish this the Salesforce connector
+ will first execute a query to get the IDs of the correct objects, and
+ then delete those objects. So the above DELETE command will result in
+ the following two commands.
+ </para>
+
+ <programlisting language="SQL"><![CDATA[SELECT ID From Case WHERE Status = 'Closed';
+DELETE From Case where ID IN (<result of query>);]]></programlisting>
+
+ <para>
+ *The Salesforce API DELETE call is not expressed in SQL, but
+ the above is an SQL equivalent expression.
+ </para>
+
+ <para>
+ It's useful to be aware of unsupported capabilities, in order
+ to avoid fetching large data sets from Salesforce and making you
+ queries as performant as possible.
+ See all <link linkend="sf_supported">Supported Capabilities</link>.
+ </para>
+
+ </section>
+
+ <section>
+ <title>Selecting from Multi-Select Picklists</title>
+ <para>
+ A multi-select picklist is a field type in Salesforce that can
+ contain multiple values in a single field. Query criteria operators
+ for fields of this type in SOQL are limited to EQ, NE, includes and
+ excludes. The full Salesforce documentation for selecting from
+ mullti-select picklists can be found at the following link.
+ <ulink url="http://www.salesforce.com/us/developer/docs/api/index_Left.htm#StartTopic...">Querying Mulit-select Picklists</ulink>
+ </para>
+
+ <para>
+ Teiid SQL does not support the includes or
+ excludes operators, but the Salesforce connector provides user
+ defined function definitions for these operators that provided
+ equivalent functionality for fields of type multi-select. The
+ definition for the functions is:
+ </para>
+
+ <programlisting>boolean includes(Column column, String param)
+boolean excludes(Column column, String param)</programlisting>
+
+ <para>
+ For example, take a single multi-select picklist column
+ called Status that contains all of these values.
+ </para>
+
+ <itemizedlist mark='opencircle'>
+ <listitem>
+ <para>current</para>
+ </listitem>
+ <listitem>
+ <para>working</para>
+ </listitem>
+ <listitem>
+ <para>critical</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>
+ For that column, all of the below are valid queries:
+ </para>
+
+ <programlisting language="SQL"><![CDATA[SELECT * FROM Issue WHERE true = includes (Status, 'current, working' );
+SELECT * FROM Issue WHERE true = excludes (Status, 'current, working' );
+SELECT * FROM Issue WHERE true = includes (Status, 'current;working, critical' );]]></programlisting>
+
+ <para>
+ EQ and NE criteria will pass to Salesforce as supplied. For
+ example, these queries will not be modified by the connector.
+ </para>
+
+ <programlisting language="SQL"><![CDATA[SELECT * FROM Issue WHERE Status = 'current';
+SELECT * FROM Issue WHERE Status = 'current;critical';
+SELECT * FROM Issue WHERE Status != 'current;working';]]></programlisting>
+
+ </section>
+ <section>
+ <title>Selecting All Objects</title>
+ <para>
+ The Salesforce connector supports the calling the queryAll operation
+ from the Salesforce API. The queryAll operation is equivalent
+ to the query operation with the exception that it returns data about
+ <emphasis role="strong">all current and deleted</emphasis>
+ objects in the system.
+ </para>
+ <para>
+ The connector determines if it will call the
+ query or queryAll operation via reference to the
+ isDeleted property present on each Salesforce object,
+ and modeled as a column on each table generated by
+ the importer. By default this value is set to
+ False when the model is generated and thus the connector calls
+ query. Users are free to change the value in the model to True,
+ changing the default behavior of the connector to be queryAll.
+ </para>
+ <para>
+ The behavior is different if isDeleted is used as a parameter
+ in the query. If the isDeleted column is used as a parameter
+ in the query, and the value is 'true' the connector will call queryAll.
+ </para>
+
+ <programlisting language="SQL"><![CDATA[select * from Contact where isDeleted = true;]]></programlisting>
+
+ <para>
+ If the isDeleted column is used as a parameter in the query,
+ and the value is 'false' the connector perform the default behavior
+ will call query.
+ </para>
+
+ <programlisting language="SQL"><![CDATA[select * from Contact where isDeleted = false;]]></programlisting>
+ </section>
+ <section>
+ <title>Selecting Updated Objects</title>
+ <para>
+ If the option is selected when importing metadata from
+ Salesforce, a GetUpdated procedure is generated in the model with
+ the following structure:
+ </para>
+
+ <programlisting language="SQL"><![CDATA[GetUpdated (ObjectName IN string,
+ StartDate IN datetime,
+ EndDate IN datetime,
+ LatestDateCovered OUT datetime)
+returns
+ ID string]]></programlisting>
+
+ <para>
+ See the description of the
+ <ulink url="http://www.salesforce.com/us/developer/docs/api/Content/sforce_api_calls_...">GetUpdated</ulink>
+ operation in the Salesforce documentation for usage details.
+ </para>
+
+ </section>
+ <section>
+ <title>Selecting Deleted Objects</title>
+ <para>
+ If the option is selected when importing metadata from
+ Salesforce, a GetDeleted procedure is generated in the model with
+ the following structure:
+ </para>
+
+ <programlisting language="SQL"><![CDATA[GetDeleted (ObjectName IN string,
+ StartDate IN datetime,
+ EndDate IN datetime,
+ EarliestDateAvailable OUT datetime,
+ LatestDateCovered OUT datetime)
+returns
+ ID string,
+ DeletedDate datetime]]></programlisting>
+
+ <para>
+ See the description of the
+ <ulink url="http://www.salesforce.com/us/developer/docs/api/Content/sforce_api_calls_...">GetDeleted</ulink>
+ operation in the Salesforce documentation for usage details.
+ </para>
+
+ </section>
+ <section>
+ <title>Relationship Queries</title>
+ <para>
+ Salesforce does not support joins like a relational database,
+ but it does have support for queries that include parent-to-child
+ or child-to-parent relationships between objects. These are termed
+ Relationship Queries. The SalesForce connector supports Relationship
+ Queries through Outer Join syntax.
+ </para>
+
+ <programlisting language="SQL"><![CDATA[SELECT Account.name, Contact.Name from Contact LEFT OUTER JOIN Account
+on Contact.Accountid = Account.id]]></programlisting>
+
+ <para>
+ This query shows the correct syntax to query a SalesForce model with
+ to produce a relationship query from child to parent. It resolves to the
+ following query to SalesForce.
+ </para>
+
+ <programlisting language="SQL"><![CDATA[SELECT Contact.Account.Name, Contact.Name FROM Contact]]></programlisting>
+
+ <programlisting language="SQL"><![CDATA[select Contact.Name, Account.Name from Account Left outer Join Contact
+on Contact.Accountid = Account.id]]></programlisting>
+
+ <para>
+ This query shows the correct syntax to query a SalesForce model with
+ to produce a relationship query from parent to child. It resolves to the
+ following query to SalesForce.
+ </para>
+
+ <programlisting language="SQL"><![CDATA[SELECT Account.Name, (SELECT Contact.Name FROM
+Account.Contacts) FROM Account]]></programlisting>
+
+ <para>
+ See the description of the
+ <ulink url="http://www.salesforce.com/us/developer/docs/api/index_Left.htm#StartTopic...">Relationship Queries</ulink>
+ operation in the SalesForce documentation for limitations.
+ </para>
+ </section>
+
+ <section id="sf_supported">
+ <title>Supported Capabilities</title>
+ <para>
+ The following are the the connector capabilities supported by
+ the Salesforce Connector. These SQL constructs will be pushed down to
+ Salesforce.
+ </para>
+
+ <itemizedlist mark='opencircle'>
+ <listitem>
+ <para>SELECT command</para>
+ </listitem>
+ <listitem>
+ <para>INSERT Command</para>
+ </listitem>
+ <listitem>
+ <para>UPDATE Command</para>
+ </listitem>
+ <listitem>
+ <para>DELETE Command</para>
+ </listitem>
+ <listitem>
+ <para>CompareCriteriaEquals</para>
+ </listitem>
+ <listitem>
+ <para>InCriteria</para>
+ </listitem>
+ <listitem>
+ <para>LikeCriteria - Supported for String fields only.</para>
+ </listitem>
+ <listitem>
+ <para>RowLimit</para>
+ </listitem>
+ <listitem>
+ <para>AggregatesCountStar</para>
+ </listitem>
+ <listitem>
+ <para>NotCriteria</para>
+ </listitem>
+ <listitem>
+ <para>OrCriteria</para>
+ </listitem>
+ <listitem>
+ <para>CompareCriteriaOrdered</para>
+ </listitem>
+ <listitem>
+ <para>OuterJoins with join criteria KEY</para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
+ </section>
+
+ <section>
+ <title>JCA Resource Adapter</title>
+ <para>The resource adapter for this translator provided through "Salesforce Data Source",
+ Refer to Admin Guide for configuration.</para>
+ </section>
+
+ </section>
+
+ <section>
+ <title>Web Services Translator</title>
+ <para>
+ The Web Services translator, known by the type name <emphasis>ws</emphasis>,
+ exposes stored procedures for calling web services backed by a Teiid WS
+ resource adapter. It will commonly be used with the
+ <link linkend="texttable">TEXTTABLE</link> or
+ <link linkend="xmltable">XMLTABLE</link> table functions to use CSV or XML
+ formated data.
+ </para>
+ <note><para>Setting the proper binding value on the translator is recommended as it removes the need for callers to pass an explict value. If your service is actually uses SOAP11, but the binding used SOAP12 you will receive execution failures.</para></note>
+ <table>
+ <title>Execution Properties</title>
+ <tgroup cols="3">
+ <colspec colwidth="3*" />
+ <colspec colwidth="6*" />
+ <colspec colwidth="2*" />
+ <thead>
+ <row>
+ <entry>Name</entry>
+ <entry>Description</entry>
+ <entry>Default</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>DefaultBinding</entry>
+ <entry>The binding that should be used if one is not specified. Can be one of HTTP, SOAP11, or SOAP12
+ </entry>
+ <entry>SOAP12</entry>
+ </row>
+ <row>
+ <entry>DefaultServiceMode</entry>
+ <entry>The default service mode. For SOAP, MESSAGE mode indicates that the request will contain the entire SOAP envelope and not just the contents of the SOAP body. Can be one of MESSAGE or PAYLOAD</entry>
+ <entry>PAYLOAD</entry>
+ </row>
+ <row>
+ <entry>XMLParamName</entry>
+ <entry>Used with the HTTP binding (typically with the GET method) to indicate that the request document should be part of the query string.</entry>
+ <entry>null - unused</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>
+ There are ws importer settings, but it does provide metadata for dynamic VDBs.
+ </para>
+
+ <section>
+ <title>Usage</title>
+ <para>
+ The WS translator exposes low level procedures for accessing web services.
+ See also the ws-weather example in the kit.
+ </para>
+
+ <section>
+ <title>Invoke Procedure</title>
+ <para>
+ Invoke allows for multiple binding, or protocol modes, including
+ HTTP, SOAP11, and SOAP12.
+ </para>
+ <programlisting>Procedure invoke(binding in STRING, action in STRING, request in XML, endpoint in STRING) returns XML</programlisting>
+
+ <para>
+ The binding may be one of null (to use the default) HTTP, SOAP11, or
+ SOAP12. Action with a SOAP binding indicates the SOAPAction value.
+ Action with a HTTP binding indicates the HTTP method (GET, POST, etc.),
+ which defaults to POST.
+ </para>
+
+ <para>
+ A null value for the binding or endpoint will use the default value.
+ The default endpoint is specified in the WS resource adapter
+ configuration. The endpoint URL may be absolute or relative. If it's
+ relative then it will be combined with the default endpoint.
+ </para>
+
+ <para>
+ Since multiple parameters are not required to have values, it is often
+ more clear to call the invoke procedure with named parameter syntax.
+ </para>
+ <programlisting>call invoke(binding=>'HTTP', action=>'GET')</programlisting>
+ <para>The request XML should be a valid XML document or root element.</para>
+ </section>
+
+ <section>
+ <title>InvokeHTTP Procedure</title>
+ <para>
+ <methodname>invokeHttp</methodname> can return the byte contents of an HTTP(S) call.
+ </para>
+ <programlisting>Procedure invokeHttp(action in STRING, request in OBJECT, endpoint in STRING, contentType out STRING) returns BLOB</programlisting>
+
+ <para>
+ Action indicates the HTTP method (GET, POST, etc.), which defaults to POST.
+ </para>
+ <para>
+ A null value for endpoint will use the default value. The default endpoint
+ is specified in the WS resource adapter configuration. The endpoint URL may
+ be absolute or relative. If it's relative then it will be combined with the
+ default endpoint.
+ </para>
+ <para>
+ Since multiple parameters are not required to have values, it is often more
+ clear to call the invoke procedure with named parameter syntax.
+ </para>
+ <programlisting>call invokeHttp(action=>'GET')</programlisting>
+
+ <para>
+ The request can be one of SQLXML, STRING, BLOB, or CLOB. The request will be
+ sent as the POST payload in byte form. For STRING/CLOB values this will
+ default to the UTF-8 encoding. To control the byte encoding, see the
+ <link linkend="to_bytes">to_bytes</link> function.
+ </para>
+ </section>
+ </section>
+ <section>
+ <title>JCA Resource Adapter</title>
+ <para>Theresource adapter for this translator provided through "Web Service Data Source",
+ Refer to Admin Guide for configuration.</para>
+ </section>
+ </section>
+
+ <section>
+ <title>OLAP Translator</title>
+ <para>
+ The OLAP Services translator, known by the type name <emphasis>olap</emphasis>,
+ exposes stored procedures for calling analysis sevices backed by a OLAP server using MDX query lanaguage.
+ This translator exposes a stored procedure, invokeMDX, that returns a result set containing tuple array values for a given MDX query.
+ invokeMDX will commonly be used with the <link linkend="arraytable">ARRAYTABLE</link> table function to extract the results.
+ </para>
+ <para>
+ Since the Cube metadata exposed by the OLAP servers and relational database metadata are so different, there is no single
+ way to map the metadata from one to other. It is best to query OLAP system using its own native MDX language
+ through. MDX queries my be defined statically or built dynamically in Teiid's abstraction layers.
+ </para>
+
+ <section>
+ <title>Usage</title>
+ <para>
+ The olap translator exposes one low level procedure for accessing olap services.
+ </para>
+
+ <section>
+ <title>InvokeMDX Procedure</title>
+ <para>
+ <methodname>invokeMdx</methodname> returns a resultset of the tuples as array values.
+ </para>
+ <programlisting>Procedure invokeMdx(mdx in STRING) returns resultset (tuple object)</programlisting>
+
+ <para>
+ The mdx parameter is a MDX query to be executed on the OLAP server.
+ </para>
+ <para>
+ The results of the query will be returned such that each row on the row axis will be packed into an array value that will first contain each hierarcy member name on the row axis then each measure value from the column axis.
+ </para>
+ <note><para>The use of <xref linkend="dataroles"/> should be considered to prevent arbitrary MDX from being submitted to the invokeMDX procedure.</para></note>
+ <para>
+ </para>
+ </section>
+ </section>
+ <section>
+ <title>JCA Resource Adapter</title>
+ <para>The resource adapter for this translator provided through data source in JBoss AS,
+ Refer to Admin Guide for "JDBC Data Sources" configuration section. Two sample
+ -ds.xml files provided for accessing OLAP servers in teiid-examples section. One is Mondrian specific,
+ when Mondrian server is deloyed
+ in the same JBoss AS as Teiid (mondrian-ds.xml). To access any other OLAP servers using XMLA interface,
+ the data source for them can be created using them example template olap-xmla-ds.xml</para>
+ </section>
+ </section>
+
+ <section>
+ <title>Delegating Translators</title>
+ <para>
+ You may create a delegating translator by extending the <code>org.teiid.translator.BaseDelegatingExecutionFactory</code>.
+ Once your classes are then packaged as a custom translator, you will be able to wire another translator instance into your delegating translator at runtime in order to intercept
+ all of the calls to the delegate. This base class does not provide any functionality on its own, other than delegation.
+ </para>
+
+ <table>
+ <title>Execution Properties</title>
+ <tgroup cols="3">
+ <colspec colwidth="3*" />
+ <colspec colwidth="6*" />
+ <colspec colwidth="2*" />
+ <thead>
+ <row>
+ <entry>Name</entry>
+ <entry>Description</entry>
+ <entry>Default</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>delegateName</entry>
+ <entry>Translator instance name to delegate to</entry>
+ <entry></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
+ </section>
+
+ <section id="dynamic_vdbs">
+ <title>Dynamic VDBs</title>
+ <para>
+ Teiid integration is available via a "Dynamic VDB" without the need for Teiid Designer
+ tooling. While this mode of operation does not yet allow for the creation of view
+ layers, the underlying sources can still be queried as if they are a single source. See
+ the kit's "teiid-example/dynamicvdb-*" for working examples.
+ </para>
+
+ <para>
+ To build a dynamic VDB, you'll need to create a
+ <filename><replaceable>SOME-NAME</replaceable>-vdb.xml</filename> file. The XML file captures
+ information about the VDB, the sources it integrate, and preferences for importing metadata.
+ </para>
+
+ <note>
+ <para>
+ VDB name pattern must adhere to "-vdb.xml" for the Teiid VDB deployer to
+ recognize this file as a dynamic VDB.
+ </para>
+ </note>
+
+ <para>
+ my-vdb.xml: (The vdb-deployer.xml schema for this file is available in the schema
+ folder under the docs with the Teiid distribution.)
+ </para>
+
+ <programlisting role="XML" language="XML"><![CDATA[<vdb name="${vdb-name}" version="${vdb-version}">
+
+ <property name="UseConnectorMetadata" value="..." />
+
+ <!-- define a model fragment for each data source -->
+ <model name="${model-name}">
+
+ <property name="..." value="..." />
+ ...
+
+ <source name="${source-name}" translator-name="${translator-name}"
+
+ connection-jndi-name="${deployed-jndi-name}">
+ ...
+ </model>
+
+ <!-- create translator instances that override default properties -->
+
+ <translator name="${translator-name}" type="${translator-type}" />
+
+ <property name="..." value="..." />
+ ...
+
+ </translator>
+</vdb>]]></programlisting>
+
+ <section>
+ <title>VDB Element</title>
+ <itemizedlist>
+ <title>Attributes</title>
+ <listitem>
+ <para>
+ <emphasis>name</emphasis>
+ </para>
+ <para>
+ The name of the VDB. The VDB name
+ referenced through the driver or datasource during the connection time.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>version</emphasis>
+ </para>
+ <para>
+ The version of the VDB (should be an
+ positive integer). This determines the deployed directory location
+ (see Name), and provides an explicit versioning mechanism to the VDB
+ name.
+ </para>
+ </listitem>
+ </itemizedlist>
+
+ <itemizedlist>
+ <title>Property Elements</title>
+ <listitem>
+ <para>
+ <emphasis>UseConnectorMetadata</emphasis>
+ </para>
+ <para>
+ Setting to use connector
+ supplied metadata. Can be "true" or "cached". "true" will obtain
+ metadata once for every launch of Teiid. "cached" will save a file
+ containing the metadata into the
+ <filename><replaceable>PROFILE</replaceable>/data/teiid</filename> directory
+ </para>
+ </listitem>
+ </itemizedlist>
+
+ </section>
+
+ <section>
+ <title>Model Element</title>
+ <itemizedlist>
+ <title>Attributes</title>
+ <listitem>
+ <para>
+ <emphasis>name</emphasis>
+ </para>
+ <para>
+ The name of the model is used as a
+ top level schema name for all of the metadata imported from the
+ connector. The name should be unique among all Models in the VDB and
+ should not contain the '.' character.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>version</emphasis>
+ </para>
+ <para>
+ The version of the VDB (should be an
+ positive integer). This determines the deployed directory location
+ (see Name), and provides an explicit versioning mechanism to the VDB
+ name.
+ </para>
+ </listitem>
+ </itemizedlist>
+
+ <itemizedlist>
+ <title>Source Element</title>
+ <listitem>
+ <para>
+ <emphasis>name</emphasis>
+ </para>
+ <para>
+ The name of the source to use for this
+ model. This can be any name you like, but will typically be the same
+ as the model name. Having a name different than the model name is
+ only useful in multi-source scenarios.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>translator-name</emphasis>
+ </para>
+ <para>
+ The name or type of the Teiid Translator to use. Possible values include
+ the built-in types (ws, file, ldap, oracle, sqlserver, db2, derby, etc.)
+ and translators defined in the translators section.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>connection-jndi-name</emphasis>
+ </para>
+ <para>
+ The JNDI name of this source's connection factory. There should be a
+ corresponding "-ds.xml" file that defines the connection factory in
+ the JBoss AS. Check out the deploying VDB dependencies section for
+ info. You also need to deploy these connection factories before you
+ can deploy the VDB.
+ </para>
+ </listitem>
+ </itemizedlist>
+
+ <itemizedlist>
+ <title>Property Elements</title>
+ <listitem>
+ <para>
+ <emphasis>importer.<propertyname></emphasis>
+ </para>
+ <para>
+ Property to be used by the connector importer for the model for purposes
+ importing metadata. See possible property name/values in the
+ Translator specific section. Note that using these properties you
+ can narrow or widen the data elements available for integration.
+ </para>
+ </listitem>
+ </itemizedlist>
+
+ </section>
+ <section>
+ <title>Translator Element</title>
+ <itemizedlist>
+ <title>Attributes</title>
+ <listitem>
+ <para>
+ <emphasis>name</emphasis>
+ </para>
+ <para>
+ The name of the the Translator. Referenced by the source element.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>type</emphasis>
+ </para>
+ <para>
+ The base type of the Translator. Can be one of the built-in types (ws,
+ file, ldap, oracle, sqlserver, db2, derby, etc.).
+ </para>
+ </listitem>
+ </itemizedlist>
+
+ <itemizedlist>
+ <title>Property Elements</title>
+ <listitem>
+ <para>
+ Set a value that overrides a translator default property. See
+ possible property name/values in the Translator specific section.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
+ </section>
+ <section>
+ <title>Multi-Source Models and VDB</title>
+ <para>
+ When you have multiple instances of data that are using identical schema
+ (horizontal sharding), Teiid can help you aggregate data across all the
+ instances, using "multi-source" models. In this scenario, instead of
+ creating/importing a model for every data source, user needs to define one
+ source model that represents the schema and configure multiple data "sources"
+ underneath it. During runtime, when a query issued against this model, the query
+ engine analyzes the information and gathers the required data from all the
+ sources configured and aggregates the results and provides in a single result set.
+ </para>
+
+ <para>
+ To mark a model as multi-source, the user needs to supply property called
+ <property>supports-multi-source-bindings</property>, in the "vdb.xml" file.
+ Also, the user needs to define multiple sources. Here is code example showing dynamic vdb with single model with
+ multiple sources defined.
+ </para>
+
+ <programlisting role="XML" language="XML"><![CDATA[<vdb name="vdbname" version="1">
+ <model visible="true" type="PHYSICAL" name="Customers" path="/Test/Customers.xmi">
+ <property name="supports-multi-source-bindings" value="true"/>
+ <source name="chicago"
+ translator-name="oracle" connection-jndi-name="chicago-customers"/>
+ <source name="newyork"
+ translator-name="oracle" connection-jndi-name="newyork-customers"/>
+ <source name="la"
+ translator-name="oracle" connection-jndi-name="la-customers"/>
+ </model>
+</vdb>]]></programlisting>
+
+ <para>
+ In the above example, the VDB defined has single model called <literal>Customers</literal>,
+ that has multiple sources (<literal>chicago</literal>, <literal>newyork</literal>,
+ and <literal>la</literal>) that define different instances of data. Every
+ time a model is marked as "multi-source", the
+ runtime engine adds a additional column called "SOURCE_NAME" to every table in
+ that model. This column maps to the source's name from the XML. In
+ the above XML code that would be <literal>chicago</literal>, <literal>la</literal>,
+ <literal>newyork</literal>. This allows queries like the following:
+ </para>
+
+ <programlisting language="SQL"><![CDATA[select * from table where SOURCE_NAME = 'newyork'
+update table column=value where SOURCE_NAME='chicago'
+delete from table where column = x and SOURCE_NAME='la'
+insert into table (column, SOURCE_NAME) VALUES ('value', 'newyork')]]></programlisting>
+
+ <para>
+ Note that when user do not supply the "SOURCE_NAME" in the criteria, the command applies
+ to all the sources. If SOURCE_NAME supplied, the query is executed only aginst the source specified.
+ Another useful feature along with this feature is
+ "partial results" to skip unavailable sources if they are down.
+ </para>
+
+ <note>
+ <para>
+ Currently the tooling support for managing the multi-source feature is
+ limited, so if you need to use this feature build the VDB as usual in
+ the Teiid Designer and then edit the "vdb.xml" file in the VDB archive
+ using a Text editor to add the additional sources as defined above.
+ You must deploy a separate data source for each source defined in the xml file.
+ </para>
+ </note>
+
+ <note>
+ <para>
+ If you would like to use "SOURCE_NAME" in your transformations to control which sources are accessed or updated,
+ you would manually need to add this extra column on your view table in
+ the Designer. This column will not be automatically added on the source table, when you import
+ the medata from source.
+ </para>
+ </note>
+ </section>
+
+</chapter>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/engine/pom.xml
===================================================================
--- trunk/engine/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/engine/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>teiid-parent</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>teiid-engine</artifactId>
- <name>Engine</name>
- <description>Relational, procedural, and xml core engine.</description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <execution>
- <id>javacc</id>
- <goals>
- <goal>javacc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-client</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-client</artifactId>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>net.sourceforge.saxon</groupId>
- <artifactId>saxon</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sourceforge.saxon</groupId>
- <classifier>dom</classifier>
- <artifactId>saxon</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- </dependency>
-
- </dependencies>
-
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/engine/pom.xml (from rev 3140, trunk/engine/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/engine/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/engine/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>teiid-parent</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>teiid-engine</artifactId>
+ <name>Engine</name>
+ <description>Relational, procedural, and xml core engine.</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <id>javacc</id>
+ <goals>
+ <goal>javacc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-client</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-client</artifactId>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sourceforge.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sourceforge.saxon</groupId>
+ <classifier>dom</classifier>
+ <artifactId>saxon</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,571 +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 org.teiid.dqp.internal.process;
-
-import java.io.IOException;
-import java.sql.Clob;
-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-
-import javax.sql.rowset.serial.SerialClob;
-
-import org.teiid.adminapi.impl.ModelMetaData;
-import org.teiid.adminapi.impl.VDBMetaData;
-import org.teiid.api.exception.query.QueryMetadataException;
-import org.teiid.client.RequestMessage;
-import org.teiid.common.buffer.BlockedException;
-import org.teiid.common.buffer.BufferManager;
-import org.teiid.common.buffer.TupleSource;
-import org.teiid.core.CoreConstants;
-import org.teiid.core.TeiidComponentException;
-import org.teiid.core.TeiidProcessingException;
-import org.teiid.core.types.BlobType;
-import org.teiid.core.types.ClobType;
-import org.teiid.core.types.SQLXMLImpl;
-import org.teiid.core.types.XMLType;
-import org.teiid.core.util.Assertion;
-import org.teiid.core.util.ObjectConverterUtil;
-import org.teiid.core.util.StringUtil;
-import org.teiid.dqp.internal.datamgr.ConnectorManager;
-import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
-import org.teiid.dqp.internal.datamgr.ConnectorWork;
-import org.teiid.dqp.message.AtomicRequestMessage;
-import org.teiid.dqp.message.RequestID;
-import org.teiid.dqp.service.BufferService;
-import org.teiid.events.EventDistributor;
-import org.teiid.metadata.AbstractMetadataRecord;
-import org.teiid.metadata.Column;
-import org.teiid.metadata.ColumnStats;
-import org.teiid.metadata.Datatype;
-import org.teiid.metadata.ForeignKey;
-import org.teiid.metadata.KeyRecord;
-import org.teiid.metadata.MetadataRepository;
-import org.teiid.metadata.Procedure;
-import org.teiid.metadata.ProcedureParameter;
-import org.teiid.metadata.Schema;
-import org.teiid.metadata.Table;
-import org.teiid.metadata.TableStats;
-import org.teiid.query.QueryPlugin;
-import org.teiid.query.metadata.CompositeMetadataStore;
-import org.teiid.query.metadata.TempMetadataID;
-import org.teiid.query.metadata.TransformationMetadata;
-import org.teiid.query.optimizer.relational.RelationalPlanner;
-import org.teiid.query.processor.CollectionTupleSource;
-import org.teiid.query.processor.ProcessorDataManager;
-import org.teiid.query.sql.lang.Command;
-import org.teiid.query.sql.lang.Query;
-import org.teiid.query.sql.lang.StoredProcedure;
-import org.teiid.query.sql.lang.UnaryFromClause;
-import org.teiid.query.sql.symbol.Constant;
-import org.teiid.query.sql.symbol.GroupSymbol;
-import org.teiid.query.sql.visitor.GroupCollectorVisitor;
-import org.teiid.query.tempdata.TempTableStore;
-import org.teiid.query.tempdata.TempTableStore.MatTableInfo;
-import org.teiid.query.util.CommandContext;
-
-/**
- * Full {@link ProcessorDataManager} implementation that
- * controls access to {@link ConnectorManager}s and handles system queries.
- */
-public class DataTierManagerImpl implements ProcessorDataManager {
-
- private static final int MAX_VALUE_LENGTH = 1 << 21;
-
- private enum SystemTables {
- VIRTUALDATABASES,
- SCHEMAS,
- TABLES,
- DATATYPES,
- COLUMNS,
- KEYS,
- PROCEDURES,
- KEYCOLUMNS,
- PROCEDUREPARAMS,
- REFERENCEKEYCOLUMNS,
- PROPERTIES
- }
-
- private enum SystemAdminTables {
- MATVIEWS,
- VDBRESOURCES
- }
-
- private enum SystemAdminProcs {
- SETTABLESTATS,
- SETCOLUMNSTATS,
- SETPROPERTY
- }
-
- private enum SystemProcs {
- GETXMLSCHEMAS
- }
-
- // Resources
- private DQPCore requestMgr;
- private BufferService bufferService;
- private EventDistributor eventDistributor;
- private boolean detectChangeEvents;
- private MetadataRepository metadataRepository;
-
- public DataTierManagerImpl(DQPCore requestMgr, BufferService bufferService, boolean detectChangeEvents) {
- this.requestMgr = requestMgr;
- this.bufferService = bufferService;
- this.detectChangeEvents = detectChangeEvents;
- }
-
- public boolean detectChangeEvents() {
- return detectChangeEvents;
- }
-
- public void setEventDistributor(EventDistributor eventDistributor) {
- this.eventDistributor = eventDistributor;
- }
-
- public EventDistributor getEventDistributor() {
- return eventDistributor;
- }
-
- public MetadataRepository getMetadataRepository() {
- return metadataRepository;
- }
-
- public void setMetadataRepository(MetadataRepository metadataRepository) {
- this.metadataRepository = metadataRepository;
- }
-
- public TupleSource registerRequest(CommandContext context, Command command, String modelName, String connectorBindingId, int nodeID, int limit) throws TeiidComponentException, TeiidProcessingException {
- RequestWorkItem workItem = requestMgr.getRequestWorkItem((RequestID)context.getProcessorID());
-
- if(CoreConstants.SYSTEM_MODEL.equals(modelName) || CoreConstants.SYSTEM_ADMIN_MODEL.equals(modelName)) {
- return processSystemQuery(context, command, workItem.getDqpWorkContext());
- }
-
- AtomicRequestMessage aqr = createRequest(context.getProcessorID(), command, modelName, connectorBindingId, nodeID);
- if (limit > 0) {
- aqr.setFetchSize(Math.min(limit, aqr.getFetchSize()));
- }
- if (context.getDataObjects() != null) {
- for (GroupSymbol gs : GroupCollectorVisitor.getGroupsIgnoreInlineViews(command, false)) {
- context.accessedDataObject(gs.getMetadataID());
- }
- }
- ConnectorManagerRepository cmr = workItem.getDqpWorkContext().getVDB().getAttachment(ConnectorManagerRepository.class);
- ConnectorWork work = cmr.getConnectorManager(aqr.getConnectorName()).registerRequest(aqr);
- return new DataTierTupleSource(aqr, workItem, work, this, limit);
- }
-
- /**
- * TODO: it would be good if processing here was lazy, in response of next batch, rather than up front.
- * @param command
- * @param workItem
- * @return
- * @throws TeiidComponentException
- * @throws TeiidProcessingException
- */
- @SuppressWarnings("unchecked")
- private TupleSource processSystemQuery(CommandContext context, Command command,
- DQPWorkContext workContext) throws TeiidComponentException, TeiidProcessingException {
- String vdbName = workContext.getVdbName();
- int vdbVersion = workContext.getVdbVersion();
- VDBMetaData vdb = workContext.getVDB();
- CompositeMetadataStore metadata = vdb.getAttachment(TransformationMetadata.class).getMetadataStore();
- TransformationMetadata indexMetadata = vdb.getAttachment(TransformationMetadata.class);
- Collection rows = new ArrayList();
- int oid = 1;
- if (command instanceof Query) {
- Query query = (Query)command;
- UnaryFromClause ufc = (UnaryFromClause)query.getFrom().getClauses().get(0);
- GroupSymbol group = ufc.getGroup();
- if (StringUtil.startsWithIgnoreCase(group.getNonCorrelationName(), CoreConstants.SYSTEM_ADMIN_MODEL)) {
- final SystemAdminTables sysTable = SystemAdminTables.valueOf(group.getNonCorrelationName().substring(CoreConstants.SYSTEM_ADMIN_MODEL.length() + 1).toUpperCase());
- switch (sysTable) {
- case MATVIEWS:
- for (Schema schema : getVisibleSchemas(vdb, metadata)) {
- for (Table table : schema.getTables().values()) {
- if (!table.isMaterialized()) {
- continue;
- }
- String targetSchema = null;
- String matTableName = null;
- String state = null;
- Timestamp updated = null;
- Integer cardinaltity = null;
- Boolean valid = null;
- if (table.getMaterializedTable() == null) {
- TempTableStore globalStore = context.getGlobalTableStore();
- matTableName = RelationalPlanner.MAT_PREFIX+table.getFullName().toUpperCase();
- MatTableInfo info = globalStore.getMatTableInfo(matTableName);
- valid = info.isValid();
- state = info.getState().name();
- updated = info.getUpdateTime()==-1?null:new Timestamp(info.getUpdateTime());
- TempMetadataID id = globalStore.getMetadataStore().getTempGroupID(matTableName);
- if (id != null) {
- cardinaltity = id.getCardinality();
- }
- //ttl, pref_mem - not part of proper metadata
- } else {
- Table t = table.getMaterializedTable();
- matTableName = t.getName();
- targetSchema = t.getParent().getName();
- }
- rows.add(Arrays.asList(vdbName, schema.getName(), table.getName(), targetSchema, matTableName, valid, state, updated, cardinaltity));
- }
- }
- break;
- case VDBRESOURCES:
- String[] filePaths = indexMetadata.getVDBResourcePaths();
- for (String filePath : filePaths) {
- rows.add(Arrays.asList(filePath, new BlobType(indexMetadata.getVDBResourceAsBlob(filePath))));
- }
- break;
- }
- return new CollectionTupleSource(rows.iterator());
- }
- final SystemTables sysTable = SystemTables.valueOf(group.getNonCorrelationName().substring(CoreConstants.SYSTEM_MODEL.length() + 1).toUpperCase());
- switch (sysTable) {
- case DATATYPES:
- for (Datatype datatype : metadata.getDatatypes()) {
- rows.add(Arrays.asList(datatype.getName(), datatype.isBuiltin(), datatype.isBuiltin(), datatype.getName(), datatype.getJavaClassName(), datatype.getScale(),
- datatype.getLength(), datatype.getNullType().toString(), datatype.isSigned(), datatype.isAutoIncrement(), datatype.isCaseSensitive(), datatype.getPrecisionLength(),
- datatype.getRadix(), datatype.getSearchType().toString(), datatype.getUUID(), datatype.getRuntimeTypeName(), datatype.getBasetypeName(), datatype.getAnnotation(), oid++));
- }
- break;
- case VIRTUALDATABASES:
- rows.add(Arrays.asList(vdbName, vdbVersion));
- break;
- case SCHEMAS:
- for (Schema model : getVisibleSchemas(vdb, metadata)) {
- rows.add(Arrays.asList(vdbName, model.getName(), model.isPhysical(), model.getUUID(), model.getAnnotation(), model.getPrimaryMetamodelUri(), oid++));
- }
- break;
- case PROCEDURES:
- for (Schema schema : getVisibleSchemas(vdb, metadata)) {
- for (Procedure proc : schema.getProcedures().values()) {
- rows.add(Arrays.asList(vdbName, proc.getParent().getName(), proc.getName(), proc.getNameInSource(), proc.getResultSet() != null, proc.getUUID(), proc.getAnnotation(), oid++));
- }
- }
- break;
- case PROCEDUREPARAMS:
- for (Schema schema : getVisibleSchemas(vdb, metadata)) {
- for (Procedure proc : schema.getProcedures().values()) {
- for (ProcedureParameter param : proc.getParameters()) {
- Datatype dt = param.getDatatype();
- rows.add(Arrays.asList(vdbName, proc.getParent().getName(), proc.getName(), param.getName(), dt!=null?dt.getRuntimeTypeName():null, param.getPosition(), param.getType().toString(), param.isOptional(),
- param.getPrecision(), param.getLength(), param.getScale(), param.getRadix(), param.getNullType().toString(), param.getUUID(), param.getAnnotation(), oid++));
- }
- if (proc.getResultSet() != null) {
- for (Column param : proc.getResultSet().getColumns()) {
- Datatype dt = param.getDatatype();
- rows.add(Arrays.asList(vdbName, proc.getParent().getName(), proc.getName(), param.getName(), dt!=null?dt.getRuntimeTypeName():null, param.getPosition(), "ResultSet", false, //$NON-NLS-1$
- param.getPrecision(), param.getLength(), param.getScale(), param.getRadix(), param.getNullType().toString(), param.getUUID(), param.getAnnotation(), oid++));
- }
- }
- }
- }
- break;
- case PROPERTIES: //TODO: consider storing separately in the metadatastore
- Collection<AbstractMetadataRecord> records = getAllPropertiedObjects(metadata, getVisibleSchemas(vdb, metadata));
- for (AbstractMetadataRecord record : records) {
- for (Map.Entry<String, String> entry : record.getProperties().entrySet()) {
- String value = entry.getValue();
- Clob clobValue = null;
- if (value != null) {
- try {
- clobValue = new ClobType(new SerialClob(value.toCharArray()));
- } catch (SQLException e) {
- throw new TeiidProcessingException(e);
- }
- }
- rows.add(Arrays.asList(entry.getKey(), entry.getValue(), record.getUUID(), oid++, clobValue));
- }
- }
- break;
- default:
- for (Schema schema : getVisibleSchemas(vdb, metadata)) {
- for (Table table : schema.getTables().values()) {
- switch (sysTable) {
- case TABLES:
- rows.add(Arrays.asList(vdbName, schema.getName(), table.getName(), table.getTableType().toString(), table.getNameInSource(),
- table.isPhysical(), table.supportsUpdate(), table.getUUID(), table.getCardinality(), table.getAnnotation(), table.isSystem(), table.isMaterialized(), oid++));
- break;
- case COLUMNS:
- for (Column column : table.getColumns()) {
- Datatype dt = column.getDatatype();
- rows.add(Arrays.asList(vdbName, schema.getName(), table.getName(), column.getName(), column.getPosition(), column.getNameInSource(),
- dt!=null?dt.getRuntimeTypeName():null, column.getScale(), column.getLength(), column.isFixedLength(), column.isSelectable(), column.isUpdatable(),
- column.isCaseSensitive(), column.isSigned(), column.isCurrency(), column.isAutoIncremented(), column.getNullType().toString(), column.getMinimumValue(),
- column.getMaximumValue(), column.getDistinctValues(), column.getNullValues(), column.getSearchType().toString(), column.getFormat(),
- column.getDefaultValue(), dt!=null?dt.getJavaClassName():null, column.getPrecision(),
- column.getCharOctetLength(), column.getRadix(), column.getUUID(), column.getAnnotation(), oid++));
- }
- break;
- case KEYS:
- for (KeyRecord key : table.getAllKeys()) {
- rows.add(Arrays.asList(vdbName, table.getParent().getName(), table.getName(), key.getName(), key.getAnnotation(), key.getNameInSource(), key.getType().toString(),
- false, (key instanceof ForeignKey)?((ForeignKey)key).getUniqueKeyID():null, key.getUUID(), oid++));
- }
- break;
- case KEYCOLUMNS:
- for (KeyRecord key : table.getAllKeys()) {
- int postition = 1;
- for (Column column : key.getColumns()) {
- rows.add(Arrays.asList(vdbName, schema.getName(), table.getName(), column.getName(), key.getName(), key.getType().toString(),
- (key instanceof ForeignKey)?((ForeignKey)key).getUniqueKeyID():null, key.getUUID(), postition++, oid++));
- }
- }
- break;
- case REFERENCEKEYCOLUMNS:
- for (ForeignKey key : table.getForeignKeys()) {
- short postition = 0;
- for (Column column : key.getColumns()) {
- Table pkTable = key.getPrimaryKey().getParent();
- rows.add(Arrays.asList(vdbName, pkTable.getParent().getName(), pkTable.getName(), key.getPrimaryKey().getColumns().get(postition).getName(), vdbName, schema.getName(), table.getName(), column.getName(),
- ++postition, DatabaseMetaData.importedKeyNoAction, DatabaseMetaData.importedKeyNoAction, key.getName(), key.getPrimaryKey().getName(), DatabaseMetaData.importedKeyInitiallyDeferred));
- }
- }
- break;
- }
- }
- }
- break;
- }
- } else {
- StoredProcedure proc = (StoredProcedure)command;
- if (StringUtil.startsWithIgnoreCase(proc.getProcedureCallableName(), CoreConstants.SYSTEM_ADMIN_MODEL)) {
- final SystemAdminProcs sysProc = SystemAdminProcs.valueOf(proc.getProcedureCallableName().substring(CoreConstants.SYSTEM_ADMIN_MODEL.length() + 1).toUpperCase());
- switch (sysProc) {
- case SETPROPERTY:
- try {
- String uuid = (String)((Constant)proc.getParameter(2).getExpression()).getValue();
- String key = (String)((Constant)proc.getParameter(3).getExpression()).getValue();
- Clob value = (Clob)((Constant)proc.getParameter(4).getExpression()).getValue();
- String strVal = null;
- String result = null;
- if (value != null) {
- if (value.length() > MAX_VALUE_LENGTH) {
- throw new TeiidProcessingException(QueryPlugin.Util.getString("DataTierManagerImpl.max_value_length", MAX_VALUE_LENGTH)); //$NON-NLS-1$
- }
- strVal = ObjectConverterUtil.convertToString(value.getCharacterStream());
- }
- AbstractMetadataRecord target = getByUuid(metadata, uuid);
- if (target == null) {
- throw new TeiidProcessingException(QueryPlugin.Util.getString("DataTierManagerImpl.unknown_uuid", uuid)); //$NON-NLS-1$
- }
- if (value == null) {
- result = target.setProperty(key, null);
- } else {
- strVal = ObjectConverterUtil.convertToString(value.getCharacterStream());
- result = target.setProperty(key, strVal);
- }
- if (eventDistributor != null) {
- eventDistributor.setProperty(vdbName, vdbVersion, uuid, key, strVal);
- }
- if (this.metadataRepository != null) {
- this.metadataRepository.setProperty(vdbName, vdbVersion, target, key, strVal);
- }
- if (result == null) {
- rows.add(Arrays.asList((Clob)null));
- } else {
- rows.add(Arrays.asList(new ClobType(new SerialClob(result.toCharArray()))));
- }
- return new CollectionTupleSource(rows.iterator());
- } catch (SQLException e) {
- throw new TeiidProcessingException(e);
- } catch (IOException e) {
- throw new TeiidProcessingException(e);
- }
- }
- Table table = indexMetadata.getGroupID((String)((Constant)proc.getParameter(1).getExpression()).getValue());
- switch (sysProc) {
- case SETCOLUMNSTATS:
- String columnName = (String)((Constant)proc.getParameter(2).getExpression()).getValue();
- Column c = null;
- for (Column col : table.getColumns()) {
- if (col.getName().equalsIgnoreCase(columnName)) {
- c = col;
- break;
- }
- }
- if (c == null) {
- throw new TeiidProcessingException(columnName + TransformationMetadata.NOT_EXISTS_MESSAGE);
- }
- Integer distinctVals = (Integer)((Constant)proc.getParameter(3).getExpression()).getValue();
- Integer nullVals = (Integer)((Constant)proc.getParameter(4).getExpression()).getValue();
- String max = (String) ((Constant)proc.getParameter(5).getExpression()).getValue();
- String min = (String) ((Constant)proc.getParameter(6).getExpression()).getValue();
- if (distinctVals != null) {
- c.setDistinctValues(distinctVals);
- }
- if (nullVals != null) {
- c.setNullValues(nullVals);
- }
- if (max != null) {
- c.setMaximumValue(max);
- }
- if (min != null) {
- c.setMinimumValue(min);
- }
- ColumnStats columnStats = new ColumnStats();
- columnStats.setDistinctValues(distinctVals);
- columnStats.setNullValues(nullVals);
- columnStats.setMaximumValue(max);
- columnStats.setMinimumValue(min);
- if (eventDistributor != null) {
- eventDistributor.setColumnStats(vdbName, vdbVersion, table.getParent().getName(), table.getName(), columnName, columnStats);
- }
- if (this.metadataRepository != null) {
- this.metadataRepository.setColumnStats(vdbName, vdbVersion, c, columnStats);
- }
- break;
- case SETTABLESTATS:
- Constant val = (Constant)proc.getParameter(2).getExpression();
- int cardinality = (Integer)val.getValue();
- table.setCardinality(cardinality);
- TableStats tableStats = new TableStats();
- tableStats.setCardinality(cardinality);
- if (eventDistributor != null) {
- eventDistributor.setTableStats(vdbName, vdbVersion, table.getParent().getName(), table.getName(), tableStats);
- }
- if (this.metadataRepository != null) {
- this.metadataRepository.setTableStats(vdbName, vdbVersion, table, tableStats);
- }
- break;
- }
- table.setLastModified(System.currentTimeMillis());
- return new CollectionTupleSource(rows.iterator());
- }
- final SystemProcs sysTable = SystemProcs.valueOf(proc.getProcedureCallableName().substring(CoreConstants.SYSTEM_MODEL.length() + 1).toUpperCase());
- switch (sysTable) {
- case GETXMLSCHEMAS:
- try {
- Object groupID = indexMetadata.getGroupID((String)((Constant)proc.getParameter(1).getExpression()).getValue());
- List<SQLXMLImpl> schemas = indexMetadata.getXMLSchemas(groupID);
- for (SQLXMLImpl schema : schemas) {
- rows.add(Arrays.asList(new XMLType(schema)));
- }
- } catch (QueryMetadataException e) {
- throw new TeiidProcessingException(e);
- }
- break;
- }
- }
- return new CollectionTupleSource(rows.iterator());
- }
-
- //TODO: do better than a linear search
- public static AbstractMetadataRecord getByUuid(CompositeMetadataStore metadata,
- String uuid) {
- for (AbstractMetadataRecord object : getAllPropertiedObjects(metadata, metadata.getSchemas().values())) {
- if (object.getUUID().equals(uuid)) {
- return object;
- }
- }
- return null;
- }
-
- public static Collection<AbstractMetadataRecord> getAllPropertiedObjects(CompositeMetadataStore metadata, Collection<Schema> schemas) {
- Collection<AbstractMetadataRecord> records = new LinkedHashSet<AbstractMetadataRecord>();
- records.addAll(metadata.getDatatypes());
- for (Schema schema : schemas) {
- records.add(schema);
- for (Table table : schema.getTables().values()) {
- records.add(table);
- records.addAll(table.getColumns());
- records.addAll(table.getAllKeys());
- }
- for (Procedure proc : schema.getProcedures().values()) {
- records.add(proc);
- records.addAll(proc.getParameters());
- if (proc.getResultSet() != null) {
- records.addAll(proc.getResultSet().getColumns());
- }
- }
- }
- return records;
- }
-
- private List<Schema> getVisibleSchemas(VDBMetaData vdb, CompositeMetadataStore metadata) {
- ArrayList<Schema> result = new ArrayList<Schema>();
- for (Schema schema : metadata.getSchemas().values()) {
- if(vdb.isVisible(schema.getName())) {
- result.add(schema);
- }
- }
- return result;
- }
-
- private AtomicRequestMessage createRequest(Object processorId,
- Command command, String modelName, String connectorBindingId, int nodeID)
- throws TeiidProcessingException, TeiidComponentException {
- RequestWorkItem workItem = requestMgr.getRequestWorkItem((RequestID)processorId);
-
- RequestMessage request = workItem.requestMsg;
- // build the atomic request based on original request + context info
- AtomicRequestMessage aqr = new AtomicRequestMessage(request, workItem.getDqpWorkContext(), nodeID);
- aqr.setCommand(command);
- aqr.setModelName(modelName);
- aqr.setMaxResultRows(requestMgr.getMaxSourceRows());
- aqr.setExceptionOnMaxRows(requestMgr.isExceptionOnMaxSourceRows());
- aqr.setPartialResults(request.supportsPartialResults());
- aqr.setSerial(requestMgr.getUserRequestSourceConcurrency() == 1);
- if (nodeID >= 0) {
- aqr.setTransactionContext(workItem.getTransactionContext());
- }
- aqr.setFetchSize(this.bufferService.getBufferManager().getConnectorBatchSize());
- if (connectorBindingId == null) {
- VDBMetaData vdb = workItem.getDqpWorkContext().getVDB();
- ModelMetaData model = vdb.getModel(modelName);
- List<String> bindings = model.getSourceNames();
- if (bindings == null || bindings.size() != 1) {
- // this should not happen, but it did occur when setting up the SystemAdmin models
- throw new TeiidComponentException(QueryPlugin.Util.getString("DataTierManager.could_not_obtain_connector_binding", new Object[]{modelName, workItem.getDqpWorkContext().getVdbName(), workItem.getDqpWorkContext().getVdbVersion() })); //$NON-NLS-1$
- }
- connectorBindingId = bindings.get(0);
- Assertion.isNotNull(connectorBindingId, "could not obtain connector id"); //$NON-NLS-1$
- }
- aqr.setConnectorName(connectorBindingId);
- return aqr;
- }
-
- public Object lookupCodeValue(
- CommandContext context,
- String codeTableName,
- String returnElementName,
- String keyElementName,
- Object keyValue)
- throws BlockedException, TeiidComponentException, TeiidProcessingException {
- throw new UnsupportedOperationException();
- }
-
- BufferManager getBufferManager() {
- return bufferService.getBufferManager();
- }
-
-}
Copied: tags/teiid-parent-7.4.0.CR1/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java (from rev 3138, trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,555 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+package org.teiid.dqp.internal.process;
+
+import java.io.IOException;
+import java.sql.Clob;
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+
+import javax.sql.rowset.serial.SerialClob;
+
+import org.teiid.adminapi.impl.ModelMetaData;
+import org.teiid.adminapi.impl.VDBMetaData;
+import org.teiid.api.exception.query.QueryMetadataException;
+import org.teiid.client.RequestMessage;
+import org.teiid.common.buffer.BlockedException;
+import org.teiid.common.buffer.BufferManager;
+import org.teiid.common.buffer.TupleSource;
+import org.teiid.core.CoreConstants;
+import org.teiid.core.TeiidComponentException;
+import org.teiid.core.TeiidProcessingException;
+import org.teiid.core.types.BlobType;
+import org.teiid.core.types.ClobType;
+import org.teiid.core.types.SQLXMLImpl;
+import org.teiid.core.types.XMLType;
+import org.teiid.core.util.Assertion;
+import org.teiid.core.util.ObjectConverterUtil;
+import org.teiid.core.util.StringUtil;
+import org.teiid.dqp.internal.datamgr.ConnectorManager;
+import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
+import org.teiid.dqp.internal.datamgr.ConnectorWork;
+import org.teiid.dqp.message.AtomicRequestMessage;
+import org.teiid.dqp.message.RequestID;
+import org.teiid.dqp.service.BufferService;
+import org.teiid.events.EventDistributor;
+import org.teiid.metadata.AbstractMetadataRecord;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.ColumnStats;
+import org.teiid.metadata.Datatype;
+import org.teiid.metadata.ForeignKey;
+import org.teiid.metadata.KeyRecord;
+import org.teiid.metadata.MetadataRepository;
+import org.teiid.metadata.Procedure;
+import org.teiid.metadata.ProcedureParameter;
+import org.teiid.metadata.Schema;
+import org.teiid.metadata.Table;
+import org.teiid.metadata.TableStats;
+import org.teiid.query.QueryPlugin;
+import org.teiid.query.metadata.CompositeMetadataStore;
+import org.teiid.query.metadata.TempMetadataID;
+import org.teiid.query.metadata.TransformationMetadata;
+import org.teiid.query.optimizer.relational.RelationalPlanner;
+import org.teiid.query.processor.CollectionTupleSource;
+import org.teiid.query.processor.ProcessorDataManager;
+import org.teiid.query.sql.lang.Command;
+import org.teiid.query.sql.lang.Query;
+import org.teiid.query.sql.lang.StoredProcedure;
+import org.teiid.query.sql.lang.UnaryFromClause;
+import org.teiid.query.sql.symbol.Constant;
+import org.teiid.query.sql.symbol.GroupSymbol;
+import org.teiid.query.sql.visitor.GroupCollectorVisitor;
+import org.teiid.query.tempdata.TempTableStore;
+import org.teiid.query.tempdata.TempTableStore.MatTableInfo;
+import org.teiid.query.util.CommandContext;
+
+/**
+ * Full {@link ProcessorDataManager} implementation that
+ * controls access to {@link ConnectorManager}s and handles system queries.
+ */
+public class DataTierManagerImpl implements ProcessorDataManager {
+
+ private static final int MAX_VALUE_LENGTH = 1 << 21;
+
+ private enum SystemTables {
+ VIRTUALDATABASES,
+ SCHEMAS,
+ TABLES,
+ DATATYPES,
+ COLUMNS,
+ KEYS,
+ PROCEDURES,
+ KEYCOLUMNS,
+ PROCEDUREPARAMS,
+ REFERENCEKEYCOLUMNS,
+ PROPERTIES
+ }
+
+ private enum SystemAdminTables {
+ MATVIEWS,
+ VDBRESOURCES
+ }
+
+ private enum SystemAdminProcs {
+ SETTABLESTATS,
+ SETCOLUMNSTATS,
+ SETPROPERTY
+ }
+
+ private enum SystemProcs {
+ GETXMLSCHEMAS
+ }
+
+ // Resources
+ private DQPCore requestMgr;
+ private BufferService bufferService;
+ private EventDistributor eventDistributor;
+ private boolean detectChangeEvents;
+ private MetadataRepository metadataRepository;
+
+ public DataTierManagerImpl(DQPCore requestMgr, BufferService bufferService, boolean detectChangeEvents) {
+ this.requestMgr = requestMgr;
+ this.bufferService = bufferService;
+ this.detectChangeEvents = detectChangeEvents;
+ }
+
+ public boolean detectChangeEvents() {
+ return detectChangeEvents;
+ }
+
+ public void setEventDistributor(EventDistributor eventDistributor) {
+ this.eventDistributor = eventDistributor;
+ }
+
+ public EventDistributor getEventDistributor() {
+ return eventDistributor;
+ }
+
+ public MetadataRepository getMetadataRepository() {
+ return metadataRepository;
+ }
+
+ public void setMetadataRepository(MetadataRepository metadataRepository) {
+ this.metadataRepository = metadataRepository;
+ }
+
+ public TupleSource registerRequest(CommandContext context, Command command, String modelName, String connectorBindingId, int nodeID, int limit) throws TeiidComponentException, TeiidProcessingException {
+ RequestWorkItem workItem = requestMgr.getRequestWorkItem((RequestID)context.getProcessorID());
+
+ if(CoreConstants.SYSTEM_MODEL.equals(modelName) || CoreConstants.SYSTEM_ADMIN_MODEL.equals(modelName)) {
+ return processSystemQuery(context, command, workItem.getDqpWorkContext());
+ }
+
+ AtomicRequestMessage aqr = createRequest(context.getProcessorID(), command, modelName, connectorBindingId, nodeID);
+ if (limit > 0) {
+ aqr.setFetchSize(Math.min(limit, aqr.getFetchSize()));
+ }
+ if (context.getDataObjects() != null) {
+ for (GroupSymbol gs : GroupCollectorVisitor.getGroupsIgnoreInlineViews(command, false)) {
+ context.accessedDataObject(gs.getMetadataID());
+ }
+ }
+ ConnectorManagerRepository cmr = workItem.getDqpWorkContext().getVDB().getAttachment(ConnectorManagerRepository.class);
+ ConnectorWork work = cmr.getConnectorManager(aqr.getConnectorName()).registerRequest(aqr);
+ return new DataTierTupleSource(aqr, workItem, work, this, limit);
+ }
+
+ /**
+ * TODO: it would be good if processing here was lazy, in response of next batch, rather than up front.
+ * @param command
+ * @param workItem
+ * @return
+ * @throws TeiidComponentException
+ * @throws TeiidProcessingException
+ */
+ @SuppressWarnings("unchecked")
+ private TupleSource processSystemQuery(CommandContext context, Command command,
+ DQPWorkContext workContext) throws TeiidComponentException, TeiidProcessingException {
+ String vdbName = workContext.getVdbName();
+ int vdbVersion = workContext.getVdbVersion();
+ VDBMetaData vdb = workContext.getVDB();
+ CompositeMetadataStore metadata = vdb.getAttachment(TransformationMetadata.class).getMetadataStore();
+ TransformationMetadata indexMetadata = vdb.getAttachment(TransformationMetadata.class);
+ Collection rows = new ArrayList();
+ int oid = 1;
+ if (command instanceof Query) {
+ Query query = (Query)command;
+ UnaryFromClause ufc = (UnaryFromClause)query.getFrom().getClauses().get(0);
+ GroupSymbol group = ufc.getGroup();
+ if (StringUtil.startsWithIgnoreCase(group.getNonCorrelationName(), CoreConstants.SYSTEM_ADMIN_MODEL)) {
+ final SystemAdminTables sysTable = SystemAdminTables.valueOf(group.getNonCorrelationName().substring(CoreConstants.SYSTEM_ADMIN_MODEL.length() + 1).toUpperCase());
+ switch (sysTable) {
+ case MATVIEWS:
+ for (Schema schema : getVisibleSchemas(vdb, metadata)) {
+ for (Table table : schema.getTables().values()) {
+ if (!table.isMaterialized()) {
+ continue;
+ }
+ String targetSchema = null;
+ String matTableName = null;
+ String state = null;
+ Timestamp updated = null;
+ Integer cardinaltity = null;
+ Boolean valid = null;
+ if (table.getMaterializedTable() == null) {
+ TempTableStore globalStore = context.getGlobalTableStore();
+ matTableName = RelationalPlanner.MAT_PREFIX+table.getFullName().toUpperCase();
+ MatTableInfo info = globalStore.getMatTableInfo(matTableName);
+ valid = info.isValid();
+ state = info.getState().name();
+ updated = info.getUpdateTime()==-1?null:new Timestamp(info.getUpdateTime());
+ TempMetadataID id = globalStore.getMetadataStore().getTempGroupID(matTableName);
+ if (id != null) {
+ cardinaltity = id.getCardinality();
+ }
+ //ttl, pref_mem - not part of proper metadata
+ } else {
+ Table t = table.getMaterializedTable();
+ matTableName = t.getName();
+ targetSchema = t.getParent().getName();
+ }
+ rows.add(Arrays.asList(vdbName, schema.getName(), table.getName(), targetSchema, matTableName, valid, state, updated, cardinaltity));
+ }
+ }
+ break;
+ case VDBRESOURCES:
+ String[] filePaths = indexMetadata.getVDBResourcePaths();
+ for (String filePath : filePaths) {
+ rows.add(Arrays.asList(filePath, new BlobType(indexMetadata.getVDBResourceAsBlob(filePath))));
+ }
+ break;
+ }
+ return new CollectionTupleSource(rows.iterator());
+ }
+ final SystemTables sysTable = SystemTables.valueOf(group.getNonCorrelationName().substring(CoreConstants.SYSTEM_MODEL.length() + 1).toUpperCase());
+ switch (sysTable) {
+ case DATATYPES:
+ for (Datatype datatype : metadata.getDatatypes()) {
+ rows.add(Arrays.asList(datatype.getName(), datatype.isBuiltin(), datatype.isBuiltin(), datatype.getName(), datatype.getJavaClassName(), datatype.getScale(),
+ datatype.getLength(), datatype.getNullType().toString(), datatype.isSigned(), datatype.isAutoIncrement(), datatype.isCaseSensitive(), datatype.getPrecisionLength(),
+ datatype.getRadix(), datatype.getSearchType().toString(), datatype.getUUID(), datatype.getRuntimeTypeName(), datatype.getBasetypeName(), datatype.getAnnotation(), oid++));
+ }
+ break;
+ case VIRTUALDATABASES:
+ rows.add(Arrays.asList(vdbName, vdbVersion));
+ break;
+ case SCHEMAS:
+ for (Schema model : getVisibleSchemas(vdb, metadata)) {
+ rows.add(Arrays.asList(vdbName, model.getName(), model.isPhysical(), model.getUUID(), model.getAnnotation(), model.getPrimaryMetamodelUri(), oid++));
+ }
+ break;
+ case PROCEDURES:
+ for (Schema schema : getVisibleSchemas(vdb, metadata)) {
+ for (Procedure proc : schema.getProcedures().values()) {
+ rows.add(Arrays.asList(vdbName, proc.getParent().getName(), proc.getName(), proc.getNameInSource(), proc.getResultSet() != null, proc.getUUID(), proc.getAnnotation(), oid++));
+ }
+ }
+ break;
+ case PROCEDUREPARAMS:
+ for (Schema schema : getVisibleSchemas(vdb, metadata)) {
+ for (Procedure proc : schema.getProcedures().values()) {
+ for (ProcedureParameter param : proc.getParameters()) {
+ Datatype dt = param.getDatatype();
+ rows.add(Arrays.asList(vdbName, proc.getParent().getName(), proc.getName(), param.getName(), dt!=null?dt.getRuntimeTypeName():null, param.getPosition(), param.getType().toString(), param.isOptional(),
+ param.getPrecision(), param.getLength(), param.getScale(), param.getRadix(), param.getNullType().toString(), param.getUUID(), param.getAnnotation(), oid++));
+ }
+ if (proc.getResultSet() != null) {
+ for (Column param : proc.getResultSet().getColumns()) {
+ Datatype dt = param.getDatatype();
+ rows.add(Arrays.asList(vdbName, proc.getParent().getName(), proc.getName(), param.getName(), dt!=null?dt.getRuntimeTypeName():null, param.getPosition(), "ResultSet", false, //$NON-NLS-1$
+ param.getPrecision(), param.getLength(), param.getScale(), param.getRadix(), param.getNullType().toString(), param.getUUID(), param.getAnnotation(), oid++));
+ }
+ }
+ }
+ }
+ break;
+ case PROPERTIES: //TODO: consider storing separately in the metadatastore
+ Collection<AbstractMetadataRecord> records = getAllPropertiedObjects(metadata, getVisibleSchemas(vdb, metadata));
+ for (AbstractMetadataRecord record : records) {
+ for (Map.Entry<String, String> entry : record.getProperties().entrySet()) {
+ String value = entry.getValue();
+ Clob clobValue = null;
+ if (value != null) {
+ try {
+ clobValue = new ClobType(new SerialClob(value.toCharArray()));
+ } catch (SQLException e) {
+ throw new TeiidProcessingException(e);
+ }
+ }
+ rows.add(Arrays.asList(entry.getKey(), entry.getValue(), record.getUUID(), oid++, clobValue));
+ }
+ }
+ break;
+ default:
+ for (Schema schema : getVisibleSchemas(vdb, metadata)) {
+ for (Table table : schema.getTables().values()) {
+ switch (sysTable) {
+ case TABLES:
+ rows.add(Arrays.asList(vdbName, schema.getName(), table.getName(), table.getTableType().toString(), table.getNameInSource(),
+ table.isPhysical(), table.supportsUpdate(), table.getUUID(), table.getCardinality(), table.getAnnotation(), table.isSystem(), table.isMaterialized(), oid++));
+ break;
+ case COLUMNS:
+ for (Column column : table.getColumns()) {
+ Datatype dt = column.getDatatype();
+ rows.add(Arrays.asList(vdbName, schema.getName(), table.getName(), column.getName(), column.getPosition(), column.getNameInSource(),
+ dt!=null?dt.getRuntimeTypeName():null, column.getScale(), column.getLength(), column.isFixedLength(), column.isSelectable(), column.isUpdatable(),
+ column.isCaseSensitive(), column.isSigned(), column.isCurrency(), column.isAutoIncremented(), column.getNullType().toString(), column.getMinimumValue(),
+ column.getMaximumValue(), column.getDistinctValues(), column.getNullValues(), column.getSearchType().toString(), column.getFormat(),
+ column.getDefaultValue(), dt!=null?dt.getJavaClassName():null, column.getPrecision(),
+ column.getCharOctetLength(), column.getRadix(), column.getUUID(), column.getAnnotation(), oid++));
+ }
+ break;
+ case KEYS:
+ for (KeyRecord key : table.getAllKeys()) {
+ rows.add(Arrays.asList(vdbName, table.getParent().getName(), table.getName(), key.getName(), key.getAnnotation(), key.getNameInSource(), key.getType().toString(),
+ false, (key instanceof ForeignKey)?((ForeignKey)key).getUniqueKeyID():null, key.getUUID(), oid++));
+ }
+ break;
+ case KEYCOLUMNS:
+ for (KeyRecord key : table.getAllKeys()) {
+ int postition = 1;
+ for (Column column : key.getColumns()) {
+ rows.add(Arrays.asList(vdbName, schema.getName(), table.getName(), column.getName(), key.getName(), key.getType().toString(),
+ (key instanceof ForeignKey)?((ForeignKey)key).getUniqueKeyID():null, key.getUUID(), postition++, oid++));
+ }
+ }
+ break;
+ case REFERENCEKEYCOLUMNS:
+ for (ForeignKey key : table.getForeignKeys()) {
+ short postition = 0;
+ for (Column column : key.getColumns()) {
+ Table pkTable = key.getPrimaryKey().getParent();
+ rows.add(Arrays.asList(vdbName, pkTable.getParent().getName(), pkTable.getName(), key.getPrimaryKey().getColumns().get(postition).getName(), vdbName, schema.getName(), table.getName(), column.getName(),
+ ++postition, DatabaseMetaData.importedKeyNoAction, DatabaseMetaData.importedKeyNoAction, key.getName(), key.getPrimaryKey().getName(), DatabaseMetaData.importedKeyInitiallyDeferred));
+ }
+ }
+ break;
+ }
+ }
+ }
+ break;
+ }
+ } else {
+ StoredProcedure proc = (StoredProcedure)command;
+ if (StringUtil.startsWithIgnoreCase(proc.getProcedureCallableName(), CoreConstants.SYSTEM_ADMIN_MODEL)) {
+ final SystemAdminProcs sysProc = SystemAdminProcs.valueOf(proc.getProcedureCallableName().substring(CoreConstants.SYSTEM_ADMIN_MODEL.length() + 1).toUpperCase());
+ switch (sysProc) {
+ case SETPROPERTY:
+ try {
+ String uuid = (String)((Constant)proc.getParameter(2).getExpression()).getValue();
+ String key = (String)((Constant)proc.getParameter(3).getExpression()).getValue();
+ Clob value = (Clob)((Constant)proc.getParameter(4).getExpression()).getValue();
+ String strVal = null;
+ String result = null;
+ if (value != null) {
+ if (value.length() > MAX_VALUE_LENGTH) {
+ throw new TeiidProcessingException(QueryPlugin.Util.getString("DataTierManagerImpl.max_value_length", MAX_VALUE_LENGTH)); //$NON-NLS-1$
+ }
+ strVal = ObjectConverterUtil.convertToString(value.getCharacterStream());
+ }
+ AbstractMetadataRecord target = getByUuid(metadata, uuid);
+ if (target == null) {
+ throw new TeiidProcessingException(QueryPlugin.Util.getString("DataTierManagerImpl.unknown_uuid", uuid)); //$NON-NLS-1$
+ }
+ if (this.metadataRepository != null) {
+ this.metadataRepository.setProperty(vdbName, vdbVersion, target, key, strVal);
+ }
+ result = target.setProperty(key, strVal);
+ if (eventDistributor != null) {
+ eventDistributor.setProperty(vdbName, vdbVersion, uuid, key, strVal);
+ }
+ if (result == null) {
+ rows.add(Arrays.asList((Clob)null));
+ } else {
+ rows.add(Arrays.asList(new ClobType(new SerialClob(result.toCharArray()))));
+ }
+ return new CollectionTupleSource(rows.iterator());
+ } catch (SQLException e) {
+ throw new TeiidProcessingException(e);
+ } catch (IOException e) {
+ throw new TeiidProcessingException(e);
+ }
+ }
+ Table table = indexMetadata.getGroupID((String)((Constant)proc.getParameter(1).getExpression()).getValue());
+ switch (sysProc) {
+ case SETCOLUMNSTATS:
+ String columnName = (String)((Constant)proc.getParameter(2).getExpression()).getValue();
+ Column c = null;
+ for (Column col : table.getColumns()) {
+ if (col.getName().equalsIgnoreCase(columnName)) {
+ c = col;
+ break;
+ }
+ }
+ if (c == null) {
+ throw new TeiidProcessingException(columnName + TransformationMetadata.NOT_EXISTS_MESSAGE);
+ }
+ Integer distinctVals = (Integer)((Constant)proc.getParameter(3).getExpression()).getValue();
+ Integer nullVals = (Integer)((Constant)proc.getParameter(4).getExpression()).getValue();
+ String max = (String) ((Constant)proc.getParameter(5).getExpression()).getValue();
+ String min = (String) ((Constant)proc.getParameter(6).getExpression()).getValue();
+ ColumnStats columnStats = new ColumnStats();
+ columnStats.setDistinctValues(distinctVals);
+ columnStats.setNullValues(nullVals);
+ columnStats.setMaximumValue(max);
+ columnStats.setMinimumValue(min);
+ if (this.metadataRepository != null) {
+ this.metadataRepository.setColumnStats(vdbName, vdbVersion, c, columnStats);
+ }
+ c.setColumnStats(columnStats);
+ if (eventDistributor != null) {
+ eventDistributor.setColumnStats(vdbName, vdbVersion, table.getParent().getName(), table.getName(), columnName, columnStats);
+ }
+ break;
+ case SETTABLESTATS:
+ Constant val = (Constant)proc.getParameter(2).getExpression();
+ int cardinality = (Integer)val.getValue();
+ TableStats tableStats = new TableStats();
+ tableStats.setCardinality(cardinality);
+ if (this.metadataRepository != null) {
+ this.metadataRepository.setTableStats(vdbName, vdbVersion, table, tableStats);
+ }
+ table.setCardinality(cardinality);
+ if (eventDistributor != null) {
+ eventDistributor.setTableStats(vdbName, vdbVersion, table.getParent().getName(), table.getName(), tableStats);
+ }
+ break;
+ }
+ table.setLastModified(System.currentTimeMillis());
+ return new CollectionTupleSource(rows.iterator());
+ }
+ final SystemProcs sysTable = SystemProcs.valueOf(proc.getProcedureCallableName().substring(CoreConstants.SYSTEM_MODEL.length() + 1).toUpperCase());
+ switch (sysTable) {
+ case GETXMLSCHEMAS:
+ try {
+ Object groupID = indexMetadata.getGroupID((String)((Constant)proc.getParameter(1).getExpression()).getValue());
+ List<SQLXMLImpl> schemas = indexMetadata.getXMLSchemas(groupID);
+ for (SQLXMLImpl schema : schemas) {
+ rows.add(Arrays.asList(new XMLType(schema)));
+ }
+ } catch (QueryMetadataException e) {
+ throw new TeiidProcessingException(e);
+ }
+ break;
+ }
+ }
+ return new CollectionTupleSource(rows.iterator());
+ }
+
+ //TODO: do better than a linear search
+ public static AbstractMetadataRecord getByUuid(CompositeMetadataStore metadata,
+ String uuid) {
+ for (AbstractMetadataRecord object : getAllPropertiedObjects(metadata, metadata.getSchemas().values())) {
+ if (object.getUUID().equals(uuid)) {
+ return object;
+ }
+ }
+ return null;
+ }
+
+ public static Collection<AbstractMetadataRecord> getAllPropertiedObjects(CompositeMetadataStore metadata, Collection<Schema> schemas) {
+ Collection<AbstractMetadataRecord> records = new LinkedHashSet<AbstractMetadataRecord>();
+ records.addAll(metadata.getDatatypes());
+ for (Schema schema : schemas) {
+ records.add(schema);
+ for (Table table : schema.getTables().values()) {
+ records.add(table);
+ records.addAll(table.getColumns());
+ records.addAll(table.getAllKeys());
+ }
+ for (Procedure proc : schema.getProcedures().values()) {
+ records.add(proc);
+ records.addAll(proc.getParameters());
+ if (proc.getResultSet() != null) {
+ records.addAll(proc.getResultSet().getColumns());
+ }
+ }
+ }
+ return records;
+ }
+
+ private List<Schema> getVisibleSchemas(VDBMetaData vdb, CompositeMetadataStore metadata) {
+ ArrayList<Schema> result = new ArrayList<Schema>();
+ for (Schema schema : metadata.getSchemas().values()) {
+ if(vdb.isVisible(schema.getName())) {
+ result.add(schema);
+ }
+ }
+ return result;
+ }
+
+ private AtomicRequestMessage createRequest(Object processorId,
+ Command command, String modelName, String connectorBindingId, int nodeID)
+ throws TeiidProcessingException, TeiidComponentException {
+ RequestWorkItem workItem = requestMgr.getRequestWorkItem((RequestID)processorId);
+
+ RequestMessage request = workItem.requestMsg;
+ // build the atomic request based on original request + context info
+ AtomicRequestMessage aqr = new AtomicRequestMessage(request, workItem.getDqpWorkContext(), nodeID);
+ aqr.setCommand(command);
+ aqr.setModelName(modelName);
+ aqr.setMaxResultRows(requestMgr.getMaxSourceRows());
+ aqr.setExceptionOnMaxRows(requestMgr.isExceptionOnMaxSourceRows());
+ aqr.setPartialResults(request.supportsPartialResults());
+ aqr.setSerial(requestMgr.getUserRequestSourceConcurrency() == 1);
+ if (nodeID >= 0) {
+ aqr.setTransactionContext(workItem.getTransactionContext());
+ }
+ aqr.setFetchSize(this.bufferService.getBufferManager().getConnectorBatchSize());
+ if (connectorBindingId == null) {
+ VDBMetaData vdb = workItem.getDqpWorkContext().getVDB();
+ ModelMetaData model = vdb.getModel(modelName);
+ List<String> bindings = model.getSourceNames();
+ if (bindings == null || bindings.size() != 1) {
+ // this should not happen, but it did occur when setting up the SystemAdmin models
+ throw new TeiidComponentException(QueryPlugin.Util.getString("DataTierManager.could_not_obtain_connector_binding", new Object[]{modelName, workItem.getDqpWorkContext().getVdbName(), workItem.getDqpWorkContext().getVdbVersion() })); //$NON-NLS-1$
+ }
+ connectorBindingId = bindings.get(0);
+ Assertion.isNotNull(connectorBindingId, "could not obtain connector id"); //$NON-NLS-1$
+ }
+ aqr.setConnectorName(connectorBindingId);
+ return aqr;
+ }
+
+ public Object lookupCodeValue(
+ CommandContext context,
+ String codeTableName,
+ String returnElementName,
+ String keyElementName,
+ Object keyValue)
+ throws BlockedException, TeiidComponentException, TeiidProcessingException {
+ throw new UnsupportedOperationException();
+ }
+
+ BufferManager getBufferManager() {
+ return bufferService.getBufferManager();
+ }
+
+}
Deleted: tags/teiid-parent-7.4.0.CR1/engine/src/main/java/org/teiid/query/processor/DdlPlan.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/engine/src/main/java/org/teiid/query/processor/DdlPlan.java 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,228 +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 org.teiid.query.processor;
-
-import static org.teiid.query.analysis.AnalysisRecord.*;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.teiid.adminapi.impl.VDBMetaData;
-import org.teiid.client.plan.PlanNode;
-import org.teiid.common.buffer.BlockedException;
-import org.teiid.common.buffer.BufferManager;
-import org.teiid.common.buffer.TupleBatch;
-import org.teiid.core.TeiidComponentException;
-import org.teiid.core.TeiidProcessingException;
-import org.teiid.core.TeiidRuntimeException;
-import org.teiid.dqp.internal.process.DQPWorkContext;
-import org.teiid.language.SQLConstants;
-import org.teiid.metadata.Procedure;
-import org.teiid.metadata.Table;
-import org.teiid.metadata.Table.TriggerEvent;
-import org.teiid.query.QueryPlugin;
-import org.teiid.query.metadata.TransformationMetadata;
-import org.teiid.query.sql.LanguageVisitor;
-import org.teiid.query.sql.lang.AlterProcedure;
-import org.teiid.query.sql.lang.AlterTrigger;
-import org.teiid.query.sql.lang.AlterView;
-import org.teiid.query.sql.lang.Command;
-import org.teiid.query.sql.lang.StoredProcedure;
-import org.teiid.query.util.CommandContext;
-
-public class DdlPlan extends ProcessorPlan {
-
- class AlterProcessor extends LanguageVisitor {
- DQPWorkContext workContext = DQPWorkContext.getWorkContext();
-
- @Override
- public void visit(AlterView obj) {
- VDBMetaData vdb = workContext.getVDB();
- Table t = (Table)obj.getTarget().getMetadataID();
- String sql = obj.getDefinition().toString();
- alterView(vdb, t, sql);
- if (pdm.getEventDistributor() != null) {
- pdm.getEventDistributor().setViewDefinition(workContext.getVdbName(), workContext.getVdbVersion(), t.getParent().getName(), t.getName(), sql);
- }
- if (pdm.getMetadataRepository() != null) {
- pdm.getMetadataRepository().setViewDefinition(workContext.getVdbName(), workContext.getVdbVersion(), t, sql);
- }
- }
-
- @Override
- public void visit(AlterProcedure obj) {
- VDBMetaData vdb = workContext.getVDB();
- Procedure p = (Procedure)obj.getTarget().getMetadataID();
- String sql = obj.getDefinition().toString();
- alterProcedureDefinition(vdb, p, sql);
- if (pdm.getEventDistributor() != null) {
- pdm.getEventDistributor().setProcedureDefinition(workContext.getVdbName(), workContext.getVdbVersion(), p.getParent().getName(), p.getName(), sql);
- }
- if (pdm.getMetadataRepository() != null) {
- pdm.getMetadataRepository().setProcedureDefinition(workContext.getVdbName(), workContext.getVdbVersion(), p, sql);
- }
- }
-
- @Override
- public void visit(AlterTrigger obj) {
- VDBMetaData vdb = workContext.getVDB();
- Table t = (Table)obj.getTarget().getMetadataID();
- String sql = null;
- TriggerEvent event = obj.getEvent();
- if (obj.getEnabled() == null) {
- if (obj.isCreate()) {
- if (getPlanForEvent(t, event) != null) {
- throw new TeiidRuntimeException(new TeiidProcessingException(QueryPlugin.Util.getString("DdlPlan.event_already_exists", t.getName(), obj.getEvent()))); //$NON-NLS-1$
- }
- } else if (getPlanForEvent(t, event) == null) {
- throw new TeiidRuntimeException(new TeiidProcessingException(QueryPlugin.Util.getString("DdlPlan.event_not_exists", t.getName(), obj.getEvent()))); //$NON-NLS-1$
- }
- sql = obj.getDefinition().toString();
- } else if (getPlanForEvent(t, event) == null) {
- throw new TeiidRuntimeException(new TeiidProcessingException(QueryPlugin.Util.getString("DdlPlan.event_not_exists", t.getName(), obj.getEvent()))); //$NON-NLS-1$
- }
- alterInsteadOfTrigger(vdb, t, sql, obj.getEnabled(), event);
- if (pdm.getEventDistributor() != null) {
- pdm.getEventDistributor().setInsteadOfTriggerDefinition(workContext.getVdbName(), workContext.getVdbVersion(), t.getParent().getName(), t.getName(), obj.getEvent(), sql, obj.getEnabled());
- }
- if (pdm.getMetadataRepository() != null) {
- if (sql != null) {
- pdm.getMetadataRepository().setInsteadOfTriggerDefinition(workContext.getVdbName(), workContext.getVdbVersion(), t, obj.getEvent(), sql);
- } else {
- pdm.getMetadataRepository().setInsteadOfTriggerEnabled(workContext.getVdbName(), workContext.getVdbVersion(), t, obj.getEvent(), obj.getEnabled());
- }
- }
- }
- }
-
- public static void alterView(VDBMetaData vdb, Table t, String sql) {
- t.setSelectTransformation(sql);
- t.setLastModified(System.currentTimeMillis());
- TransformationMetadata indexMetadata = vdb.getAttachment(TransformationMetadata.class);
- indexMetadata.addToMetadataCache(t, "transformation/"+SQLConstants.Reserved.SELECT, null); //$NON-NLS-1$
- }
-
- public static void alterProcedureDefinition(VDBMetaData vdb, Procedure p, String sql) {
- p.setQueryPlan(sql);
- p.setLastModified(System.currentTimeMillis());
- TransformationMetadata indexMetadata = vdb.getAttachment(TransformationMetadata.class);
- indexMetadata.addToMetadataCache(p, "transformation/"+StoredProcedure.class.getSimpleName().toUpperCase(), null); //$NON-NLS-1$
- }
-
- public static void alterInsteadOfTrigger(VDBMetaData vdb, Table t,
- String sql, Boolean enabled, TriggerEvent event) {
- switch (event) {
- case DELETE:
- if (sql != null) {
- t.setDeletePlan(sql);
- } else {
- t.setDeletePlanEnabled(enabled);
- }
- break;
- case INSERT:
- if (sql != null) {
- t.setInsertPlan(sql);
- } else {
- t.setInsertPlanEnabled(enabled);
- }
- break;
- case UPDATE:
- if (sql != null) {
- t.setUpdatePlan(sql);
- } else {
- t.setUpdatePlanEnabled(enabled);
- }
- break;
- }
- TransformationMetadata indexMetadata = vdb.getAttachment(TransformationMetadata.class);
- indexMetadata.addToMetadataCache(t, "transformation/"+event, null); //$NON-NLS-1$
- t.setLastModified(System.currentTimeMillis());
- }
-
- private static String getPlanForEvent(Table t, TriggerEvent event) {
- switch (event) {
- case DELETE:
- return t.getDeletePlan();
- case INSERT:
- return t.getInsertPlan();
- case UPDATE:
- return t.getUpdatePlan();
- }
- throw new AssertionError();
- }
-
- private Command command;
- private ProcessorDataManager pdm;
-
- public DdlPlan(Command command) {
- this.command = command;
- }
-
- @Override
- public ProcessorPlan clone() {
- return new DdlPlan(command);
- }
-
- @Override
- public void close() throws TeiidComponentException {
- }
-
- @Override
- public List getOutputElements() {
- return command.getProjectedSymbols();
- }
-
- @Override
- public void initialize(CommandContext context,
- ProcessorDataManager dataMgr, BufferManager bufferMgr) {
- this.setContext(context);
- this.pdm = dataMgr;
- }
-
- @Override
- public TupleBatch nextBatch() throws BlockedException,
- TeiidComponentException, TeiidProcessingException {
- TupleBatch tupleBatch = new TupleBatch(1, new List[] {Arrays.asList(0)});
- tupleBatch.setTerminationFlag(true);
- return tupleBatch;
- }
-
- @Override
- public void open() throws TeiidComponentException, TeiidProcessingException {
- AlterProcessor ap = new AlterProcessor();
- ap.workContext = DQPWorkContext.getWorkContext();
- try {
- command.acceptVisitor(ap);
- } catch (TeiidRuntimeException e) {
- throw (TeiidProcessingException)e.getCause();
- }
- }
-
- @Override
- public PlanNode getDescriptionProperties() {
- PlanNode props = super.getDescriptionProperties();
- props.addProperty(PROP_SQL, this.command.toString());
- return props;
- }
-
-}
Copied: tags/teiid-parent-7.4.0.CR1/engine/src/main/java/org/teiid/query/processor/DdlPlan.java (from rev 3138, trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/engine/src/main/java/org/teiid/query/processor/DdlPlan.java (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/engine/src/main/java/org/teiid/query/processor/DdlPlan.java 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,228 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+package org.teiid.query.processor;
+
+import static org.teiid.query.analysis.AnalysisRecord.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.teiid.adminapi.impl.VDBMetaData;
+import org.teiid.client.plan.PlanNode;
+import org.teiid.common.buffer.BlockedException;
+import org.teiid.common.buffer.BufferManager;
+import org.teiid.common.buffer.TupleBatch;
+import org.teiid.core.TeiidComponentException;
+import org.teiid.core.TeiidProcessingException;
+import org.teiid.core.TeiidRuntimeException;
+import org.teiid.dqp.internal.process.DQPWorkContext;
+import org.teiid.language.SQLConstants;
+import org.teiid.metadata.Procedure;
+import org.teiid.metadata.Table;
+import org.teiid.metadata.Table.TriggerEvent;
+import org.teiid.query.QueryPlugin;
+import org.teiid.query.metadata.TransformationMetadata;
+import org.teiid.query.sql.LanguageVisitor;
+import org.teiid.query.sql.lang.AlterProcedure;
+import org.teiid.query.sql.lang.AlterTrigger;
+import org.teiid.query.sql.lang.AlterView;
+import org.teiid.query.sql.lang.Command;
+import org.teiid.query.sql.lang.StoredProcedure;
+import org.teiid.query.util.CommandContext;
+
+public class DdlPlan extends ProcessorPlan {
+
+ class AlterProcessor extends LanguageVisitor {
+ DQPWorkContext workContext = DQPWorkContext.getWorkContext();
+
+ @Override
+ public void visit(AlterView obj) {
+ VDBMetaData vdb = workContext.getVDB();
+ Table t = (Table)obj.getTarget().getMetadataID();
+ String sql = obj.getDefinition().toString();
+ if (pdm.getMetadataRepository() != null) {
+ pdm.getMetadataRepository().setViewDefinition(workContext.getVdbName(), workContext.getVdbVersion(), t, sql);
+ }
+ alterView(vdb, t, sql);
+ if (pdm.getEventDistributor() != null) {
+ pdm.getEventDistributor().setViewDefinition(workContext.getVdbName(), workContext.getVdbVersion(), t.getParent().getName(), t.getName(), sql);
+ }
+ }
+
+ @Override
+ public void visit(AlterProcedure obj) {
+ VDBMetaData vdb = workContext.getVDB();
+ Procedure p = (Procedure)obj.getTarget().getMetadataID();
+ String sql = obj.getDefinition().toString();
+ if (pdm.getMetadataRepository() != null) {
+ pdm.getMetadataRepository().setProcedureDefinition(workContext.getVdbName(), workContext.getVdbVersion(), p, sql);
+ }
+ alterProcedureDefinition(vdb, p, sql);
+ if (pdm.getEventDistributor() != null) {
+ pdm.getEventDistributor().setProcedureDefinition(workContext.getVdbName(), workContext.getVdbVersion(), p.getParent().getName(), p.getName(), sql);
+ }
+ }
+
+ @Override
+ public void visit(AlterTrigger obj) {
+ VDBMetaData vdb = workContext.getVDB();
+ Table t = (Table)obj.getTarget().getMetadataID();
+ String sql = null;
+ TriggerEvent event = obj.getEvent();
+ if (obj.getEnabled() == null) {
+ if (obj.isCreate()) {
+ if (getPlanForEvent(t, event) != null) {
+ throw new TeiidRuntimeException(new TeiidProcessingException(QueryPlugin.Util.getString("DdlPlan.event_already_exists", t.getName(), obj.getEvent()))); //$NON-NLS-1$
+ }
+ } else if (getPlanForEvent(t, event) == null) {
+ throw new TeiidRuntimeException(new TeiidProcessingException(QueryPlugin.Util.getString("DdlPlan.event_not_exists", t.getName(), obj.getEvent()))); //$NON-NLS-1$
+ }
+ sql = obj.getDefinition().toString();
+ } else if (getPlanForEvent(t, event) == null) {
+ throw new TeiidRuntimeException(new TeiidProcessingException(QueryPlugin.Util.getString("DdlPlan.event_not_exists", t.getName(), obj.getEvent()))); //$NON-NLS-1$
+ }
+ if (pdm.getMetadataRepository() != null) {
+ if (sql != null) {
+ pdm.getMetadataRepository().setInsteadOfTriggerDefinition(workContext.getVdbName(), workContext.getVdbVersion(), t, obj.getEvent(), sql);
+ } else {
+ pdm.getMetadataRepository().setInsteadOfTriggerEnabled(workContext.getVdbName(), workContext.getVdbVersion(), t, obj.getEvent(), obj.getEnabled());
+ }
+ }
+ alterInsteadOfTrigger(vdb, t, sql, obj.getEnabled(), event);
+ if (pdm.getEventDistributor() != null) {
+ pdm.getEventDistributor().setInsteadOfTriggerDefinition(workContext.getVdbName(), workContext.getVdbVersion(), t.getParent().getName(), t.getName(), obj.getEvent(), sql, obj.getEnabled());
+ }
+ }
+ }
+
+ public static void alterView(VDBMetaData vdb, Table t, String sql) {
+ t.setSelectTransformation(sql);
+ t.setLastModified(System.currentTimeMillis());
+ TransformationMetadata indexMetadata = vdb.getAttachment(TransformationMetadata.class);
+ indexMetadata.addToMetadataCache(t, "transformation/"+SQLConstants.Reserved.SELECT, null); //$NON-NLS-1$
+ }
+
+ public static void alterProcedureDefinition(VDBMetaData vdb, Procedure p, String sql) {
+ p.setQueryPlan(sql);
+ p.setLastModified(System.currentTimeMillis());
+ TransformationMetadata indexMetadata = vdb.getAttachment(TransformationMetadata.class);
+ indexMetadata.addToMetadataCache(p, "transformation/"+StoredProcedure.class.getSimpleName().toUpperCase(), null); //$NON-NLS-1$
+ }
+
+ public static void alterInsteadOfTrigger(VDBMetaData vdb, Table t,
+ String sql, Boolean enabled, TriggerEvent event) {
+ switch (event) {
+ case DELETE:
+ if (sql != null) {
+ t.setDeletePlan(sql);
+ } else {
+ t.setDeletePlanEnabled(enabled);
+ }
+ break;
+ case INSERT:
+ if (sql != null) {
+ t.setInsertPlan(sql);
+ } else {
+ t.setInsertPlanEnabled(enabled);
+ }
+ break;
+ case UPDATE:
+ if (sql != null) {
+ t.setUpdatePlan(sql);
+ } else {
+ t.setUpdatePlanEnabled(enabled);
+ }
+ break;
+ }
+ TransformationMetadata indexMetadata = vdb.getAttachment(TransformationMetadata.class);
+ indexMetadata.addToMetadataCache(t, "transformation/"+event, null); //$NON-NLS-1$
+ t.setLastModified(System.currentTimeMillis());
+ }
+
+ private static String getPlanForEvent(Table t, TriggerEvent event) {
+ switch (event) {
+ case DELETE:
+ return t.getDeletePlan();
+ case INSERT:
+ return t.getInsertPlan();
+ case UPDATE:
+ return t.getUpdatePlan();
+ }
+ throw new AssertionError();
+ }
+
+ private Command command;
+ private ProcessorDataManager pdm;
+
+ public DdlPlan(Command command) {
+ this.command = command;
+ }
+
+ @Override
+ public ProcessorPlan clone() {
+ return new DdlPlan(command);
+ }
+
+ @Override
+ public void close() throws TeiidComponentException {
+ }
+
+ @Override
+ public List getOutputElements() {
+ return command.getProjectedSymbols();
+ }
+
+ @Override
+ public void initialize(CommandContext context,
+ ProcessorDataManager dataMgr, BufferManager bufferMgr) {
+ this.setContext(context);
+ this.pdm = dataMgr;
+ }
+
+ @Override
+ public TupleBatch nextBatch() throws BlockedException,
+ TeiidComponentException, TeiidProcessingException {
+ TupleBatch tupleBatch = new TupleBatch(1, new List[] {Arrays.asList(0)});
+ tupleBatch.setTerminationFlag(true);
+ return tupleBatch;
+ }
+
+ @Override
+ public void open() throws TeiidComponentException, TeiidProcessingException {
+ AlterProcessor ap = new AlterProcessor();
+ ap.workContext = DQPWorkContext.getWorkContext();
+ try {
+ command.acceptVisitor(ap);
+ } catch (TeiidRuntimeException e) {
+ throw (TeiidProcessingException)e.getCause();
+ }
+ }
+
+ @Override
+ public PlanNode getDescriptionProperties() {
+ PlanNode props = super.getDescriptionProperties();
+ props.addProperty(PROP_SQL, this.command.toString());
+ return props;
+ }
+
+}
Deleted: tags/teiid-parent-7.4.0.CR1/hibernate-dialect/pom.xml
===================================================================
--- trunk/hibernate-dialect/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/hibernate-dialect/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,18 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>teiid-parent</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>teiid-hibernate-dialect</artifactId>
- <name>Hibernate Dialect</name>
- <description>Teiid Hibernate Dialect</description>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>3.5.2-Final</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/hibernate-dialect/pom.xml (from rev 3140, trunk/hibernate-dialect/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/hibernate-dialect/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/hibernate-dialect/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,18 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>teiid-parent</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>teiid-hibernate-dialect</artifactId>
+ <name>Hibernate Dialect</name>
+ <description>Teiid Hibernate Dialect</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.5.2-Final</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/jboss-integration/pom.xml
===================================================================
--- trunk/jboss-integration/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/jboss-integration/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,146 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>teiid-parent</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-jboss-integration</artifactId>
- <name>teiid-jboss-integration</name>
- <description>JBoss specific integration layer for teiid</description>
-
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-runtime</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-cache-jbosscache</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-client</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.integration</groupId>
- <artifactId>jboss-profileservice-spi</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-connector</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- <version>2.0.6.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbosssx</artifactId>
- <version>2.0.3.SP1</version>
- <scope>provided</scope>
- </dependency>
- <!-- these for just running profile service remotely -->
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnp-client</artifactId>
- <version>5.0.3.GA</version>
- <scope>test</scope>
- </dependency>
-<!--
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <classifier>client</classifier>
- <version>2.1.1.GA</version>
- <scope>test</scope>
- </dependency>
--->
-
- <dependency>
- <groupId>org.jboss.remoting</groupId>
- <artifactId>jboss-remoting</artifactId>
- <version>2.5.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.aspects</groupId>
- <artifactId>jboss-security-aspects</artifactId>
- <version>1.0.0.GA</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.aspects</groupId>
- <artifactId>jboss-remoting-aspects</artifactId>
- <version>1.0.1.GA</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4-jboss-update1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
- <version>5.1.0.GA</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-profileservice</artifactId>
- <version>5.1.0.GA</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
-</project>
Copied: tags/teiid-parent-7.4.0.CR1/jboss-integration/pom.xml (from rev 3140, trunk/jboss-integration/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/jboss-integration/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/jboss-integration/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,146 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>teiid-parent</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-jboss-integration</artifactId>
+ <name>teiid-jboss-integration</name>
+ <description>JBoss specific integration layer for teiid</description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-runtime</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-cache-jbosscache</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-client</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-profileservice-spi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ <version>2.0.6.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ <version>2.0.3.SP1</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- these for just running profile service remotely -->
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnp-client</artifactId>
+ <version>5.0.3.GA</version>
+ <scope>test</scope>
+ </dependency>
+<!--
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <classifier>client</classifier>
+ <version>2.1.1.GA</version>
+ <scope>test</scope>
+ </dependency>
+-->
+
+ <dependency>
+ <groupId>org.jboss.remoting</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ <version>2.5.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.aspects</groupId>
+ <artifactId>jboss-security-aspects</artifactId>
+ <version>1.0.0.GA</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.aspects</groupId>
+ <artifactId>jboss-remoting-aspects</artifactId>
+ <version>1.0.1.GA</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4-jboss-update1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <version>5.1.0.GA</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-profileservice</artifactId>
+ <version>5.1.0.GA</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Deleted: tags/teiid-parent-7.4.0.CR1/metadata/pom.xml
===================================================================
--- trunk/metadata/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/metadata/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>teiid-parent</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>teiid-metadata</artifactId>
- <name>Metadata</name>
- <description>Provides vdb metadata from index files.</description>
-
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-engine</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-engine</artifactId>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-client</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- </dependency>
-
- </dependencies>
-
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/metadata/pom.xml (from rev 3140, trunk/metadata/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/metadata/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/metadata/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>teiid-parent</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>teiid-metadata</artifactId>
+ <name>Metadata</name>
+ <description>Provides vdb metadata from index files.</description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-engine</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-engine</artifactId>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-client</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,496 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-parent</artifactId>
- <packaging>pom</packaging>
- <name>Teiid</name>
- <version>7.4.0.CR1-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>
- <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/trunk</developerConnection>
- </scm>
- <licenses>
- <license>
- <name>GNU Lesser General Public License</name>
- <url>http://www.gnu.org/licenses/lgpl.html</url>
- <distribution>repo</distribution>
- <comments>A business-friendly OSS license</comments>
- </license>
- </licenses>
- <url>${site.url}</url>
- <developers>
- <developer>
- <name>Steve Hawkins</name>
- <id>steve</id>
- <email>shawkins(a)redhat.com</email>
- <organization>Red Hat</organization>
- <roles>
- <role>Project Lead</role>
- </roles>
- <timezone>-6</timezone>
- </developer>
- <developer>
- <name>Ramesh Reddy</name>
- <id>ramesh</id>
- <email>rareddy(a)redhat.com</email>
- <organization>Red Hat</organization>
- <roles>
- <role>Project Lead</role>
- </roles>
- <timezone>-6</timezone>
- </developer>
- <developer>
- <name>Van Halbert</name>
- <id>van</id>
- <email>vhalbert(a)redhat.com</email>
- <organization>Red Hat</organization>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>-6</timezone>
- </developer>
- <developer>
- <name>Ted Jones</name>
- <id>ted</id>
- <email>tejones(a)redhat.com</email>
- <organization>Red Hat</organization>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>-6</timezone>
- </developer>
- </developers>
- <profiles>
- <profile>
- <!--
- This profile is activated manually, as in "mvn ... -P release ..."
- -->
- <id>release</id>
- <modules>
- <module>documentation</module>
- <module>build</module>
- </modules>
- </profile>
- <profile>
- <!--
- This is to enable faster build for development time.
- -->
- <id>dev</id>
- <modules>
- <module>build</module>
- </modules>
- </profile>
- </profiles>
- <build>
- <!-- This section defines the default plugin settings inherited by child projects. -->
- <pluginManagement>
- <plugins>
- <!-- Fixes how test resources of a project can be used in projects dependent on it -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-6-m1-jboss</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <!-- Specify the compiler options and settings -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <showDeprecation>false</showDeprecation>
- <showWarnings>false</showWarnings>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*TestCase.java</include>
- <include>**/*Test.java</include>
- <include>**/Test*.java</include>
- </includes>
- <excludes>
- <exclude>**/Abstract*TestCase.java</exclude>
- <!-- hack to prevent anonymous inner classes in Tests from being run as tests -->
- <include>**/Test*$*.java</include>
- </excludes>
- <systemProperties>
- <property>
- <name>user.dir</name>
- <value>${basedir}/target</value>
- </property>
- <property>
- <name>java.io.tmpdir</name>
- <value>${basedir}/target</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- <!--
- Build a test-jar for each project, so that src/test/* resources and classes can be used
- in other projects. Also customize how the jar files are assembled.
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries> true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries> true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-URL>${pom.url}</Implementation-URL>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- </plugins>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- <maxmemory>512m</maxmemory>
- <excludePackageNames>*.internal</excludePackageNames>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- <repositories>
- <repository>
- <id>jboss-public-repository</id>
- <name>JBoss Public Maven Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- </repositories>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.5</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <dependencyManagement>
- <dependencies>
- <!--
- Declare all dependency versions and default scopes here, but not optional.
- Each module should declare it's direct dependency and possibily overwrite scope/optional.
- -->
-
- <!-- Internal dependencies -->
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <type>test-jar</type>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- <type>test-jar</type>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-console</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-console</artifactId>
- <type>test-jar</type>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-client</artifactId>
- <type>test-jar</type>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-engine</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-engine</artifactId>
- <type>test-jar</type>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-metadata</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-metadata</artifactId>
- <type>test-jar</type>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-txn-jbossts</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-cache-jbosscache</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-jboss-integration</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-runtime</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- External dependencies -->
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <version>1.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- <exclusions>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
- <version>2.6.15.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- <version>3.2.5.GA</version>
- <exclusions>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- </exclusions>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <version>2.1.0.SP1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-metatype</artifactId>
- <version>2.1.0.SP1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.integration</groupId>
- <artifactId>jboss-profileservice-spi</artifactId>
- <version>5.1.0.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>2.1.2.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <version>2.0.7.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- <version>2.0.7.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-connector</artifactId>
- <version>5.1.0.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- <version>2.0.2.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.remoting</groupId>
- <artifactId>jboss-remoting</artifactId>
- <version>2.5.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.saxon</groupId>
- <artifactId>saxon</artifactId>
- <version>9.1.0.8</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.saxon</groupId>
- <artifactId>saxon</artifactId>
- <classifier>dom</classifier>
- <version>9.1.0.8</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.netty</groupId>
- <artifactId>netty</artifactId>
- <version>3.2.1.Final</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>${ant.version}</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <modules>
- <module>common-core</module>
- <module>api</module>
- <module>client</module>
- <module>engine</module>
- <module>connectors</module>
- <module>console</module>
- <module>metadata</module>
- <module>runtime</module>
- <module>adminshell</module>
- <module>cache-jbosscache</module>
- <module>hibernate-dialect</module>
- <module>jboss-integration</module>
- <module>test-integration</module>
- <module>client-jdk15</module>
- </modules>
- <distributionManagement>
- <repository>
- <id>jboss-releases-repository</id>
- <name>JBoss Releases Repository</name>
- <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url>
- </repository>
- <snapshotRepository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </snapshotRepository>
- </distributionManagement>
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/pom.xml (from rev 3140, trunk/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,496 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Teiid</name>
+ <version>7.4.0.CR1</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>
+ <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-7.4.0.CR1</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-7.4.0.CR1</developerConnection>
+ </scm>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/lgpl.html</url>
+ <distribution>repo</distribution>
+ <comments>A business-friendly OSS license</comments>
+ </license>
+ </licenses>
+ <url>${site.url}</url>
+ <developers>
+ <developer>
+ <name>Steve Hawkins</name>
+ <id>steve</id>
+ <email>shawkins(a)redhat.com</email>
+ <organization>Red Hat</organization>
+ <roles>
+ <role>Project Lead</role>
+ </roles>
+ <timezone>-6</timezone>
+ </developer>
+ <developer>
+ <name>Ramesh Reddy</name>
+ <id>ramesh</id>
+ <email>rareddy(a)redhat.com</email>
+ <organization>Red Hat</organization>
+ <roles>
+ <role>Project Lead</role>
+ </roles>
+ <timezone>-6</timezone>
+ </developer>
+ <developer>
+ <name>Van Halbert</name>
+ <id>van</id>
+ <email>vhalbert(a)redhat.com</email>
+ <organization>Red Hat</organization>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>-6</timezone>
+ </developer>
+ <developer>
+ <name>Ted Jones</name>
+ <id>ted</id>
+ <email>tejones(a)redhat.com</email>
+ <organization>Red Hat</organization>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>-6</timezone>
+ </developer>
+ </developers>
+ <profiles>
+ <profile>
+ <!--
+ This profile is activated manually, as in "mvn ... -P release ..."
+ -->
+ <id>release</id>
+ <modules>
+ <module>documentation</module>
+ <module>build</module>
+ </modules>
+ </profile>
+ <profile>
+ <!--
+ This is to enable faster build for development time.
+ -->
+ <id>dev</id>
+ <modules>
+ <module>build</module>
+ </modules>
+ </profile>
+ </profiles>
+ <build>
+ <!-- This section defines the default plugin settings inherited by child projects. -->
+ <pluginManagement>
+ <plugins>
+ <!-- Fixes how test resources of a project can be used in projects dependent on it -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-6-m1-jboss</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <!-- Specify the compiler options and settings -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <showDeprecation>false</showDeprecation>
+ <showWarnings>false</showWarnings>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*TestCase.java</include>
+ <include>**/*Test.java</include>
+ <include>**/Test*.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/Abstract*TestCase.java</exclude>
+ <!-- hack to prevent anonymous inner classes in Tests from being run as tests -->
+ <include>**/Test*$*.java</include>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>user.dir</name>
+ <value>${basedir}/target</value>
+ </property>
+ <property>
+ <name>java.io.tmpdir</name>
+ <value>${basedir}/target</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <!--
+ Build a test-jar for each project, so that src/test/* resources and classes can be used
+ in other projects. Also customize how the jar files are assembled.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries> true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries> true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-URL>${pom.url}</Implementation-URL>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ <maxmemory>512m</maxmemory>
+ <excludePackageNames>*.internal</excludePackageNames>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ <repositories>
+ <repository>
+ <id>jboss-public-repository</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <!--
+ Declare all dependency versions and default scopes here, but not optional.
+ Each module should declare it's direct dependency and possibily overwrite scope/optional.
+ -->
+
+ <!-- Internal dependencies -->
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <type>test-jar</type>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-api</artifactId>
+ <type>test-jar</type>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-console</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-console</artifactId>
+ <type>test-jar</type>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-client</artifactId>
+ <type>test-jar</type>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-engine</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-engine</artifactId>
+ <type>test-jar</type>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-metadata</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-metadata</artifactId>
+ <type>test-jar</type>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-txn-jbossts</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-cache-jbosscache</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-jboss-integration</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-runtime</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- External dependencies -->
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <version>1.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <version>2.6.15.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ <version>3.2.5.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <version>2.1.0.SP1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-metatype</artifactId>
+ <version>2.1.0.SP1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-profileservice-spi</artifactId>
+ <version>5.1.0.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>2.1.2.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <version>2.0.7.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <version>2.0.7.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <version>5.1.0.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <version>2.0.2.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.remoting</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ <version>2.5.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ <version>9.1.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ <classifier>dom</classifier>
+ <version>9.1.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.2.1.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <modules>
+ <module>common-core</module>
+ <module>api</module>
+ <module>client</module>
+ <module>engine</module>
+ <module>connectors</module>
+ <module>console</module>
+ <module>metadata</module>
+ <module>runtime</module>
+ <module>adminshell</module>
+ <module>cache-jbosscache</module>
+ <module>hibernate-dialect</module>
+ <module>jboss-integration</module>
+ <module>test-integration</module>
+ <module>client-jdk15</module>
+ </modules>
+ <distributionManagement>
+ <repository>
+ <id>jboss-releases-repository</id>
+ <name>JBoss Releases Repository</name>
+ <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url>
+ </repository>
+ <snapshotRepository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </snapshotRepository>
+ </distributionManagement>
+</project>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/runtime/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>teiid-parent</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-runtime</artifactId>
- <name>Runtime Engine</name>
- <description>Teiid Runtime Engine</description>
- <dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-client</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-engine</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-engine</artifactId>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-metadata</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.netty</groupId>
- <artifactId>netty</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.integration</groupId>
- <artifactId>jboss-profileservice-spi</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/runtime/pom.xml (from rev 3140, trunk/runtime/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/runtime/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/runtime/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>teiid-parent</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-runtime</artifactId>
+ <name>Runtime Engine</name>
+ <description>Teiid Runtime Engine</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-client</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-engine</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-engine</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-metadata</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-profileservice-spi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,347 +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 org.teiid.deployers;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.NavigableMap;
-import java.util.Properties;
-import java.util.concurrent.ConcurrentSkipListMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.jboss.deployers.spi.DeploymentException;
-import org.teiid.adminapi.AdminException;
-import org.teiid.adminapi.AdminProcessingException;
-import org.teiid.adminapi.impl.VDBMetaData;
-import org.teiid.core.CoreConstants;
-import org.teiid.core.types.DataTypeManager;
-import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
-import org.teiid.logging.LogConstants;
-import org.teiid.logging.LogManager;
-import org.teiid.metadata.AbstractMetadataRecord;
-import org.teiid.metadata.Column;
-import org.teiid.metadata.ColumnStats;
-import org.teiid.metadata.Datatype;
-import org.teiid.metadata.MetadataRepository;
-import org.teiid.metadata.MetadataStore;
-import org.teiid.metadata.Procedure;
-import org.teiid.metadata.Schema;
-import org.teiid.metadata.Table;
-import org.teiid.metadata.TableStats;
-import org.teiid.query.function.SystemFunctionManager;
-import org.teiid.query.metadata.TransformationMetadata.Resource;
-import org.teiid.runtime.RuntimePlugin;
-import org.teiid.translator.TranslatorException;
-import org.teiid.vdb.runtime.VDBKey;
-
-
-/**
- * Repository for VDBs
- */
-public class VDBRepository implements Serializable{
- private static final long serialVersionUID = 312177538191772674L;
-
- private NavigableMap<VDBKey, CompositeVDB> vdbRepo = new ConcurrentSkipListMap<VDBKey, CompositeVDB>();
- private MetadataStore systemStore;
- private MetadataStore odbcStore;
- private boolean odbcEnabled = false;
- private List<VDBLifeCycleListener> listeners = new CopyOnWriteArrayList<VDBLifeCycleListener>();
- private SystemFunctionManager systemFunctionManager;
- private MetadataRepository metadataRepository;
-
- public MetadataRepository getMetadataRepository() {
- return metadataRepository;
- }
-
- public void addVDB(VDBMetaData vdb, MetadataStoreGroup stores, LinkedHashMap<String, Resource> visibilityMap, UDFMetaData udf, ConnectorManagerRepository cmr) throws DeploymentException {
- if (getVDB(vdb.getName(), vdb.getVersion()) != null) {
- throw new DeploymentException(RuntimePlugin.Util.getString("duplicate_vdb", vdb.getName(), vdb.getVersion())); //$NON-NLS-1$
- }
-
- // get the system VDB metadata store
- if (this.systemStore == null) {
- throw new DeploymentException(RuntimePlugin.Util.getString("system_vdb_load_error")); //$NON-NLS-1$
- }
-
- if (this.odbcEnabled && odbcStore == null) {
- this.odbcStore = getODBCMetadataStore();
- }
- CompositeVDB cvdb = null;
- if (this.odbcStore == null) {
- cvdb = new CompositeVDB(vdb, stores, visibilityMap, udf, this.systemFunctionManager.getSystemFunctions(), cmr, this.systemStore);
- }
- else {
- cvdb = new CompositeVDB(vdb, stores, visibilityMap, udf, this.systemFunctionManager.getSystemFunctions(), cmr, this.systemStore, odbcStore);
- }
- updateFromMetadataRepository(stores, cvdb);
- this.vdbRepo.put(vdbId(vdb), cvdb);
- notifyAdd(vdb.getName(), vdb.getVersion());
- }
-
- private void updateFromMetadataRepository(MetadataStoreGroup stores,
- CompositeVDB cvdb) {
- if (metadataRepository == null) {
- return;
- }
- String vdbName = cvdb.getVDB().getName();
- int vdbVersion = cvdb.getVDB().getVersion();
- LinkedList<MetadataStore> allStores = new LinkedList<MetadataStore>(stores.getStores());
- allStores.addAll(Arrays.asList(cvdb.getAdditionalStores()));
- for (MetadataStore metadataStore : allStores) {
- Collection<AbstractMetadataRecord> records = new LinkedHashSet<AbstractMetadataRecord>();
- for (Schema schema : metadataStore.getSchemas().values()) {
- records.add(schema);
- for (Table t : schema.getTables().values()) {
- records.add(t);
- records.addAll(t.getColumns());
- records.addAll(t.getAllKeys());
- if (t.isPhysical()) {
- TableStats stats = metadataRepository.getTableStats(vdbName, vdbVersion, t);
- if (stats != null) {
- t.setTableStats(stats);
- }
- for (Column c : t.getColumns()) {
- ColumnStats cStats = metadataRepository.getColumnStats(vdbName, vdbVersion, c);
- if (cStats != null) {
- c.setColumnStats(cStats);
- }
- }
- } else {
- String def = metadataRepository.getViewDefinition(vdbName, vdbVersion, t);
- if (def != null) {
- t.setSelectTransformation(def);
- }
- if (t.supportsUpdate()) {
- def = metadataRepository.getInsteadOfTriggerDefinition(vdbName, vdbVersion, t, Table.TriggerEvent.INSERT);
- if (def != null) {
- t.setInsertPlan(def);
- }
- Boolean enabled = metadataRepository.isInsteadOfTriggerEnabled(vdbName, vdbVersion, t, Table.TriggerEvent.INSERT);
- if (enabled != null) {
- t.setInsertPlanEnabled(enabled);
- }
- def = metadataRepository.getInsteadOfTriggerDefinition(vdbName, vdbVersion, t, Table.TriggerEvent.UPDATE);
- if (def != null) {
- t.setUpdatePlan(def);
- }
- enabled = metadataRepository.isInsteadOfTriggerEnabled(vdbName, vdbVersion, t, Table.TriggerEvent.UPDATE);
- if (enabled != null) {
- t.setUpdatePlanEnabled(enabled);
- }
- def = metadataRepository.getInsteadOfTriggerDefinition(vdbName, vdbVersion, t, Table.TriggerEvent.DELETE);
- if (def != null) {
- t.setDeletePlan(def);
- }
- enabled = metadataRepository.isInsteadOfTriggerEnabled(vdbName, vdbVersion, t, Table.TriggerEvent.DELETE);
- if (enabled != null) {
- t.setDeletePlanEnabled(enabled);
- }
- }
- }
- }
- for (Procedure p : schema.getProcedures().values()) {
- records.add(p);
- records.addAll(p.getParameters());
- if (p.getResultSet() != null) {
- records.addAll(p.getResultSet().getColumns());
- }
- if (p.isVirtual() && !p.isFunction()) {
- String proc = metadataRepository.getProcedureDefinition(vdbName, vdbVersion, p);
- if (proc != null) {
- p.setQueryPlan(proc);
- }
- }
- }
- }
- for (AbstractMetadataRecord abstractMetadataRecord : records) {
- LinkedHashMap<String, String> p = metadataRepository.getProperties(vdbName, vdbVersion, abstractMetadataRecord);
- if (p != null) {
- abstractMetadataRecord.setProperties(p);
- }
- }
- }
- }
-
- public VDBMetaData getVDB(String name, int version) {
- CompositeVDB v = this.vdbRepo.get(new VDBKey(name, version));
- if (v != null) {
- return v.getVDB();
- }
- return null;
- }
-
- public List<VDBMetaData> getVDBs(){
- ArrayList<VDBMetaData> vdbs = new ArrayList<VDBMetaData>();
- for(CompositeVDB cVDB:this.vdbRepo.values()) {
- vdbs.add(cVDB.getVDB());
- }
- return vdbs;
- }
-
- protected VDBKey vdbId(VDBMetaData vdb) {
- return new VDBKey(vdb.getName(), vdb.getVersion());
- }
-
- public VDBMetaData getVDB(String vdbName) {
- int latestVersion = 0;
- for (VDBKey key:this.vdbRepo.tailMap(new VDBKey(vdbName, 0)).keySet()) {
- if(!key.getName().equalsIgnoreCase(vdbName)) {
- break;
- }
- VDBMetaData vdb = this.vdbRepo.get(key).getVDB();
- switch (vdb.getConnectionType()) {
- case ANY:
- latestVersion = Math.max(vdb.getVersion(), latestVersion);
- break;
- case BY_VERSION:
- if (latestVersion == 0) {
- latestVersion = vdb.getVersion();
- }
- break;
- }
- }
- if(latestVersion == 0) {
- return null;
- }
-
- return getVDB(vdbName, latestVersion);
- }
-
- public MetadataStore getSystemStore() {
- return systemStore;
- }
-
- public MetadataStore getODBCStore() {
- return this.odbcStore;
- }
-
- public void setSystemStore(MetadataStore store) {
- this.systemStore = store;
- }
-
- public void setMetadataRepository(MetadataRepository metadataRepository) {
- this.metadataRepository = metadataRepository;
- }
-
- private MetadataStore getODBCMetadataStore() {
- try {
- PgCatalogMetadataStore pg = new PgCatalogMetadataStore(CoreConstants.ODBC_MODEL, getBuiltinDatatypes(), new Properties());
- return pg.getMetadataStore();
- } catch (TranslatorException e) {
- LogManager.logError(LogConstants.CTX_DQP, RuntimePlugin.Util.getString("failed_to_load_odbc_metadata")); //$NON-NLS-1$
- }
- return null;
- }
-
- public void odbcEnabled() {
- this.odbcEnabled = true;
- }
-
- public boolean removeVDB(String vdbName, int vdbVersion) {
- VDBKey key = new VDBKey(vdbName, vdbVersion);
- CompositeVDB removed = this.vdbRepo.remove(key);
- if (removed != null) {
- // if this VDB was part of another VDB; then remove them.
- for (CompositeVDB other:this.vdbRepo.values()) {
- other.removeChild(key);
- }
- notifyRemove(key.getName(), key.getVersion());
- return true;
- }
- return false;
- }
-
- public Map<String, Datatype> getBuiltinDatatypes() {
- Collection<Datatype> datatypes = this.systemStore.getDatatypes();
- Map<String, Datatype> datatypeMap = new HashMap<String, Datatype>();
- for (Class<?> typeClass : DataTypeManager.getAllDataTypeClasses()) {
- for (Datatype datatypeRecordImpl : datatypes) {
- if (datatypeRecordImpl.getJavaClassName().equals(typeClass.getName())) {
- datatypeMap.put(DataTypeManager.getDataTypeName(typeClass), datatypeRecordImpl);
- break;
- }
- }
- }
- return datatypeMap;
- }
-
- public void mergeVDBs(String sourceVDBName, int sourceVDBVersion, String targetVDBName, int targetVDBVersion) throws AdminException{
- CompositeVDB source = this.vdbRepo.get(new VDBKey(sourceVDBName, sourceVDBVersion));
- if (source == null) {
- throw new AdminProcessingException(RuntimePlugin.Util.getString("vdb_not_found", sourceVDBName, sourceVDBVersion)); //$NON-NLS-1$
- }
-
- CompositeVDB target = this.vdbRepo.get(new VDBKey(targetVDBName, targetVDBVersion));
- if (target == null) {
- throw new AdminProcessingException(RuntimePlugin.Util.getString("vdb_not_found", sourceVDBName, sourceVDBVersion)); //$NON-NLS-1$
- }
-
- // merge them
- target.addChild(source);
- }
-
- // this is called by mc
- public void start() {
- if (this.odbcEnabled) {
- this.odbcStore = getODBCMetadataStore();
- }
- }
-
- void updateVDB(String name, int version) {
- CompositeVDB v = this.vdbRepo.get(new VDBKey(name, version));
- if (v!= null) {
- v.update(v.getVDB(), systemFunctionManager.getSystemFunctions());
- }
- }
-
- public void addListener(VDBLifeCycleListener listener) {
- this.listeners.add(listener);
- }
-
- public void removeListener(VDBLifeCycleListener listener) {
- this.listeners.remove(listener);
- }
-
- private void notifyAdd(String name, int version) {
- for(VDBLifeCycleListener l:this.listeners) {
- l.added(name, version);
- }
- }
-
- private void notifyRemove(String name, int version) {
- for(VDBLifeCycleListener l:this.listeners) {
- l.removed(name, version);
- }
- }
-
- public void setSystemFunctionManager(SystemFunctionManager mgr) {
- this.systemFunctionManager = mgr;
- }
-}
Copied: tags/teiid-parent-7.4.0.CR1/runtime/src/main/java/org/teiid/deployers/VDBRepository.java (from rev 3138, trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/runtime/src/main/java/org/teiid/deployers/VDBRepository.java (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,349 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+package org.teiid.deployers;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.Properties;
+import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.AdminProcessingException;
+import org.teiid.adminapi.impl.VDBMetaData;
+import org.teiid.core.CoreConstants;
+import org.teiid.core.types.DataTypeManager;
+import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
+import org.teiid.logging.LogConstants;
+import org.teiid.logging.LogManager;
+import org.teiid.metadata.AbstractMetadataRecord;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.ColumnStats;
+import org.teiid.metadata.Datatype;
+import org.teiid.metadata.MetadataRepository;
+import org.teiid.metadata.MetadataStore;
+import org.teiid.metadata.Procedure;
+import org.teiid.metadata.Schema;
+import org.teiid.metadata.Table;
+import org.teiid.metadata.TableStats;
+import org.teiid.query.function.SystemFunctionManager;
+import org.teiid.query.metadata.TransformationMetadata.Resource;
+import org.teiid.runtime.RuntimePlugin;
+import org.teiid.translator.TranslatorException;
+import org.teiid.vdb.runtime.VDBKey;
+
+
+/**
+ * Repository for VDBs
+ */
+public class VDBRepository implements Serializable{
+ private static final long serialVersionUID = 312177538191772674L;
+
+ private NavigableMap<VDBKey, CompositeVDB> vdbRepo = new ConcurrentSkipListMap<VDBKey, CompositeVDB>();
+ private MetadataStore systemStore;
+ private MetadataStore odbcStore;
+ private boolean odbcEnabled = false;
+ private List<VDBLifeCycleListener> listeners = new CopyOnWriteArrayList<VDBLifeCycleListener>();
+ private SystemFunctionManager systemFunctionManager;
+ private MetadataRepository metadataRepository;
+
+ public MetadataRepository getMetadataRepository() {
+ return metadataRepository;
+ }
+
+ public void addVDB(VDBMetaData vdb, MetadataStoreGroup stores, LinkedHashMap<String, Resource> visibilityMap, UDFMetaData udf, ConnectorManagerRepository cmr) throws DeploymentException {
+ if (getVDB(vdb.getName(), vdb.getVersion()) != null) {
+ throw new DeploymentException(RuntimePlugin.Util.getString("duplicate_vdb", vdb.getName(), vdb.getVersion())); //$NON-NLS-1$
+ }
+
+ // get the system VDB metadata store
+ if (this.systemStore == null) {
+ throw new DeploymentException(RuntimePlugin.Util.getString("system_vdb_load_error")); //$NON-NLS-1$
+ }
+
+ if (this.odbcEnabled && odbcStore == null) {
+ this.odbcStore = getODBCMetadataStore();
+ }
+ CompositeVDB cvdb = null;
+ if (this.odbcStore == null) {
+ cvdb = new CompositeVDB(vdb, stores, visibilityMap, udf, this.systemFunctionManager.getSystemFunctions(), cmr, this.systemStore);
+ }
+ else {
+ cvdb = new CompositeVDB(vdb, stores, visibilityMap, udf, this.systemFunctionManager.getSystemFunctions(), cmr, this.systemStore, odbcStore);
+ }
+ updateFromMetadataRepository(stores, cvdb);
+ this.vdbRepo.put(vdbId(vdb), cvdb);
+ notifyAdd(vdb.getName(), vdb.getVersion());
+ }
+
+ private void updateFromMetadataRepository(MetadataStoreGroup stores,
+ CompositeVDB cvdb) {
+ if (metadataRepository == null) {
+ return;
+ }
+ String vdbName = cvdb.getVDB().getName();
+ int vdbVersion = cvdb.getVDB().getVersion();
+ LinkedList<MetadataStore> allStores = new LinkedList<MetadataStore>(stores.getStores());
+ allStores.addAll(Arrays.asList(cvdb.getAdditionalStores()));
+ metadataRepository.startLoadVdb(vdbName, vdbVersion);
+ for (MetadataStore metadataStore : allStores) {
+ Collection<AbstractMetadataRecord> records = new LinkedHashSet<AbstractMetadataRecord>();
+ for (Schema schema : metadataStore.getSchemas().values()) {
+ records.add(schema);
+ for (Table t : schema.getTables().values()) {
+ records.add(t);
+ records.addAll(t.getColumns());
+ records.addAll(t.getAllKeys());
+ if (t.isPhysical()) {
+ TableStats stats = metadataRepository.getTableStats(vdbName, vdbVersion, t);
+ if (stats != null) {
+ t.setTableStats(stats);
+ }
+ for (Column c : t.getColumns()) {
+ ColumnStats cStats = metadataRepository.getColumnStats(vdbName, vdbVersion, c);
+ if (cStats != null) {
+ c.setColumnStats(cStats);
+ }
+ }
+ } else {
+ String def = metadataRepository.getViewDefinition(vdbName, vdbVersion, t);
+ if (def != null) {
+ t.setSelectTransformation(def);
+ }
+ if (t.supportsUpdate()) {
+ def = metadataRepository.getInsteadOfTriggerDefinition(vdbName, vdbVersion, t, Table.TriggerEvent.INSERT);
+ if (def != null) {
+ t.setInsertPlan(def);
+ }
+ Boolean enabled = metadataRepository.isInsteadOfTriggerEnabled(vdbName, vdbVersion, t, Table.TriggerEvent.INSERT);
+ if (enabled != null) {
+ t.setInsertPlanEnabled(enabled);
+ }
+ def = metadataRepository.getInsteadOfTriggerDefinition(vdbName, vdbVersion, t, Table.TriggerEvent.UPDATE);
+ if (def != null) {
+ t.setUpdatePlan(def);
+ }
+ enabled = metadataRepository.isInsteadOfTriggerEnabled(vdbName, vdbVersion, t, Table.TriggerEvent.UPDATE);
+ if (enabled != null) {
+ t.setUpdatePlanEnabled(enabled);
+ }
+ def = metadataRepository.getInsteadOfTriggerDefinition(vdbName, vdbVersion, t, Table.TriggerEvent.DELETE);
+ if (def != null) {
+ t.setDeletePlan(def);
+ }
+ enabled = metadataRepository.isInsteadOfTriggerEnabled(vdbName, vdbVersion, t, Table.TriggerEvent.DELETE);
+ if (enabled != null) {
+ t.setDeletePlanEnabled(enabled);
+ }
+ }
+ }
+ }
+ for (Procedure p : schema.getProcedures().values()) {
+ records.add(p);
+ records.addAll(p.getParameters());
+ if (p.getResultSet() != null) {
+ records.addAll(p.getResultSet().getColumns());
+ }
+ if (p.isVirtual() && !p.isFunction()) {
+ String proc = metadataRepository.getProcedureDefinition(vdbName, vdbVersion, p);
+ if (proc != null) {
+ p.setQueryPlan(proc);
+ }
+ }
+ }
+ }
+ for (AbstractMetadataRecord abstractMetadataRecord : records) {
+ LinkedHashMap<String, String> p = metadataRepository.getProperties(vdbName, vdbVersion, abstractMetadataRecord);
+ if (p != null) {
+ abstractMetadataRecord.setProperties(p);
+ }
+ }
+ }
+ metadataRepository.endLoadVdb(vdbName, vdbVersion);
+ }
+
+ public VDBMetaData getVDB(String name, int version) {
+ CompositeVDB v = this.vdbRepo.get(new VDBKey(name, version));
+ if (v != null) {
+ return v.getVDB();
+ }
+ return null;
+ }
+
+ public List<VDBMetaData> getVDBs(){
+ ArrayList<VDBMetaData> vdbs = new ArrayList<VDBMetaData>();
+ for(CompositeVDB cVDB:this.vdbRepo.values()) {
+ vdbs.add(cVDB.getVDB());
+ }
+ return vdbs;
+ }
+
+ protected VDBKey vdbId(VDBMetaData vdb) {
+ return new VDBKey(vdb.getName(), vdb.getVersion());
+ }
+
+ public VDBMetaData getVDB(String vdbName) {
+ int latestVersion = 0;
+ for (VDBKey key:this.vdbRepo.tailMap(new VDBKey(vdbName, 0)).keySet()) {
+ if(!key.getName().equalsIgnoreCase(vdbName)) {
+ break;
+ }
+ VDBMetaData vdb = this.vdbRepo.get(key).getVDB();
+ switch (vdb.getConnectionType()) {
+ case ANY:
+ latestVersion = Math.max(vdb.getVersion(), latestVersion);
+ break;
+ case BY_VERSION:
+ if (latestVersion == 0) {
+ latestVersion = vdb.getVersion();
+ }
+ break;
+ }
+ }
+ if(latestVersion == 0) {
+ return null;
+ }
+
+ return getVDB(vdbName, latestVersion);
+ }
+
+ public MetadataStore getSystemStore() {
+ return systemStore;
+ }
+
+ public MetadataStore getODBCStore() {
+ return this.odbcStore;
+ }
+
+ public void setSystemStore(MetadataStore store) {
+ this.systemStore = store;
+ }
+
+ public void setMetadataRepository(MetadataRepository metadataRepository) {
+ this.metadataRepository = metadataRepository;
+ }
+
+ private MetadataStore getODBCMetadataStore() {
+ try {
+ PgCatalogMetadataStore pg = new PgCatalogMetadataStore(CoreConstants.ODBC_MODEL, getBuiltinDatatypes(), new Properties());
+ return pg.getMetadataStore();
+ } catch (TranslatorException e) {
+ LogManager.logError(LogConstants.CTX_DQP, RuntimePlugin.Util.getString("failed_to_load_odbc_metadata")); //$NON-NLS-1$
+ }
+ return null;
+ }
+
+ public void odbcEnabled() {
+ this.odbcEnabled = true;
+ }
+
+ public boolean removeVDB(String vdbName, int vdbVersion) {
+ VDBKey key = new VDBKey(vdbName, vdbVersion);
+ CompositeVDB removed = this.vdbRepo.remove(key);
+ if (removed != null) {
+ // if this VDB was part of another VDB; then remove them.
+ for (CompositeVDB other:this.vdbRepo.values()) {
+ other.removeChild(key);
+ }
+ notifyRemove(key.getName(), key.getVersion());
+ return true;
+ }
+ return false;
+ }
+
+ public Map<String, Datatype> getBuiltinDatatypes() {
+ Collection<Datatype> datatypes = this.systemStore.getDatatypes();
+ Map<String, Datatype> datatypeMap = new HashMap<String, Datatype>();
+ for (Class<?> typeClass : DataTypeManager.getAllDataTypeClasses()) {
+ for (Datatype datatypeRecordImpl : datatypes) {
+ if (datatypeRecordImpl.getJavaClassName().equals(typeClass.getName())) {
+ datatypeMap.put(DataTypeManager.getDataTypeName(typeClass), datatypeRecordImpl);
+ break;
+ }
+ }
+ }
+ return datatypeMap;
+ }
+
+ public void mergeVDBs(String sourceVDBName, int sourceVDBVersion, String targetVDBName, int targetVDBVersion) throws AdminException{
+ CompositeVDB source = this.vdbRepo.get(new VDBKey(sourceVDBName, sourceVDBVersion));
+ if (source == null) {
+ throw new AdminProcessingException(RuntimePlugin.Util.getString("vdb_not_found", sourceVDBName, sourceVDBVersion)); //$NON-NLS-1$
+ }
+
+ CompositeVDB target = this.vdbRepo.get(new VDBKey(targetVDBName, targetVDBVersion));
+ if (target == null) {
+ throw new AdminProcessingException(RuntimePlugin.Util.getString("vdb_not_found", sourceVDBName, sourceVDBVersion)); //$NON-NLS-1$
+ }
+
+ // merge them
+ target.addChild(source);
+ }
+
+ // this is called by mc
+ public void start() {
+ if (this.odbcEnabled) {
+ this.odbcStore = getODBCMetadataStore();
+ }
+ }
+
+ void updateVDB(String name, int version) {
+ CompositeVDB v = this.vdbRepo.get(new VDBKey(name, version));
+ if (v!= null) {
+ v.update(v.getVDB(), systemFunctionManager.getSystemFunctions());
+ }
+ }
+
+ public void addListener(VDBLifeCycleListener listener) {
+ this.listeners.add(listener);
+ }
+
+ public void removeListener(VDBLifeCycleListener listener) {
+ this.listeners.remove(listener);
+ }
+
+ private void notifyAdd(String name, int version) {
+ for(VDBLifeCycleListener l:this.listeners) {
+ l.added(name, version);
+ }
+ }
+
+ private void notifyRemove(String name, int version) {
+ for(VDBLifeCycleListener l:this.listeners) {
+ l.removed(name, version);
+ }
+ }
+
+ public void setSystemFunctionManager(SystemFunctionManager mgr) {
+ this.systemFunctionManager = mgr;
+ }
+}
Deleted: tags/teiid-parent-7.4.0.CR1/test-integration/common/pom.xml
===================================================================
--- trunk/test-integration/common/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/test-integration/common/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>teiid-test-integration</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>test-integration-common</artifactId>
- <name>Common Integration Tests</name>
- <description>Common Integration tests that do not require external dependencies</description>
- <dependencies>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.3-606.jdbc3</version>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/test-integration/common/pom.xml (from rev 3140, trunk/test-integration/common/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/test-integration/common/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/test-integration/common/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>teiid-test-integration</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>test-integration-common</artifactId>
+ <name>Common Integration Tests</name>
+ <description>Common Integration tests that do not require external dependencies</description>
+ <dependencies>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.3-606.jdbc3</version>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/test-integration/db/pom.xml
===================================================================
--- trunk/test-integration/db/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/test-integration/db/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,537 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-<!--
- The database dependent tests are meant to be run on their own, not as part of the continous or nightly
- build for Teiid.
--->
-
- <parent>
- <artifactId>teiid-test-integration</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>test-integration-db</artifactId>
-
- <name>DB Dependent Integration Tests</name>
- <groupId>org.jboss.teiid.teiid-test-integration</groupId>
- <description>Integration tests that require external database dependencies </description>
- <dependencies>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- </dependency>
-
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-client</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-client</artifactId>
- <type>test-jar</type>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <type>test-jar</type>
- <scope>compile</scope>
- </dependency>
-
-
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-engine</artifactId>
- <type>test-jar</type>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>test-integration-common</artifactId>
- <type>test-jar</type>
- <scope>compile</scope>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.7.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-launcher</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>ant-contrib</groupId>
- <artifactId>ant-contrib</artifactId>
- <version>1.0b3</version>
- <exclusions>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- </exclusions>
-
- </dependency>
-
- <dependency>
- <groupId>ant-contrib</groupId>
- <artifactId>cpptasks</artifactId>
- <version>1.0b3</version>
- <exclusions>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
-
- <!-- DBUnit dependencies -->
-
- <dependency>
- <groupId>org.dbunit</groupId>
- <artifactId>dbunit</artifactId>
- <version>2.2</version>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.6</version>
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>3.2-FINAL</version>
- </dependency>
-
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>${postgresql.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql.connector.version}</version>
- </dependency>
-
- </dependencies>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
- <build>
- <plugins>
- <!-- Specify the compiler options and settings -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <showDeprecation>false</showDeprecation>
- <showWarnings>false</showWarnings>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/binaries.xml</descriptor>
- </descriptors>
- <outputDirectory>target/distribution</outputDirectory>
- <workDirectory>target/assembly/work</workDirectory>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
-
- <profile>
- <id>runalltests</id>
- <build>
- <plugins>
-
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <additionalClasspathElements>
- <additionalClasspathElement>${basedir}/lib/ojdbc6.jar</additionalClasspathElement>
- <additionalClasspathElement>${basedir}/lib/sqljdbc4.jar</additionalClasspathElement>
- <additionalClasspathElement>${basedir}/lib/db2jcc4.jar</additionalClasspathElement>
-
- </additionalClasspathElements>
- <systemProperties>
- <property>
- <name>usedatasources</name>
- <value>${usedatasources}</value>
- </property>
- <property>
- <name>datasourceloc</name>
- <value>${datasourceloc}</value>
- </property>
- </systemProperties>
-
-<!--
-<forkMode>always</forkMode>
- <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- -->
- <includes>
- <!-- <include>**/*TestCase.java</include> -->
- <include>**/*Test.java</include>
- <include>**/*Tests.java</include>
- <include>**/Test*.java</include>
- </includes>
- <excludes>
- <exclude>**/*Abstract*TestCase.java</exclude>
- <exclude>**/*Abstract*Test.java</exclude>
- <!-- hack to prevent anonymous inner classes in Tests from being run as tests -->
- <exclude>**/Test*$*.java</exclude>
- </excludes>
-
- </configuration>
- </plugin>
-
- </plugins>
-
- </build>
-
-<!-- <version>2.4.2</version> -->
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
-
- <configuration>
- <outputDirectory>${basedir}/target/newsite</outputDirectory>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- </profile>
-
- <profile>
- <id>runsingletest</id>
- <activation>
- <property>
- <name>classname</name>
- </property>
- </activation>
- <build>
- <plugins>
-
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <additionalClasspathElements>
- <additionalClasspathElement>${basedir}/lib/ojdbc6.jar</additionalClasspathElement>
- <additionalClasspathElement>${basedir}/lib/sqljdbc4.jar</additionalClasspathElement>
- <additionalClasspathElement>${basedir}/lib/db2jcc4.jar</additionalClasspathElement>
- </additionalClasspathElements>
- <systemProperties>
- <property>
- <name>usedatasources</name>
- <value>${usedatasources}</value>
- </property>
- <property>
- <name>datasourceloc</name>
- <value>${datasourceloc}</value>
- </property>
- </systemProperties>
-
-<!--
- <forkMode>always</forkMode>
-
- <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- -->
- <includes>
- <include>**/${classname}.java</include>
- </includes>
-
- </configuration>
- </plugin>
-
- </plugins>
- </build>
- </profile>
-
-
- <profile>
- <id>setupdatasources</id>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>${apache.ant.version}</version>
- </dependency>
- </dependencies>
- <configuration>
- </configuration>
- <executions>
- <execution>
- <id>setupalldatasources</id>
- <phase>pre-integration-test</phase>
- <configuration>
- <tasks>
- <property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
- <property name="relative.resources.dir" value="src/main/resources" />
- <property name="datasourceloc" value="${datasourceloc}" />
- <ant antfile="src/main/resources/ddl/manage_schemas.xml" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
-
- </plugins>
- </build>
- </profile>
- <profile>
- <id>singledatasource</id>
- <activation>
- <property>
- <name>datasource</name>
- </property>
- </activation>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>${apache.ant.version}</version>
- </dependency>
- </dependencies>
- <configuration>
-
- </configuration>
- <executions>
- <execution>
- <id>setupsingledatasource</id>
- <phase>pre-integration-test</phase>
- <configuration>
- <tasks>
-
- <property name="single" value="${datasource}" />
- <property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
- <property name="datasourceloc" value="${datasourceloc}" />
-
- <property name="relative.resources.dir" value="src/main/resources" />
- <ant antfile="src/main/resources/ddl/manage_schemas.xml" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
-
- </plugins>
- </build>
- </profile>
-
-
- <profile>
- <id>runclienttests</id>
- <activation>
- <property>
- <name>scenario.dir</name>
- </property>
- </activation>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>${apache.ant.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>run-client-test</id>
- <phase>integration-test</phase>
- <configuration>
- <tasks>
-
- <property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
- <property name="scenario.dir" value="${scenario.dir}" />
- <property name="queryset.artifacts.dir" value="${queryset.artifacts.dir}" />
- <property name="vdb.artifacts.dir" value="${vdb.artifacts.dir}" />
- <!-- optional properties -->
- <property name="config.file" value="${config.file}" />
- <property name="query.scenario.classname" value="${query.scenario.classname}" />
- <property name="proj.dir" value="${project.basedir}/target/" />
- <property name="usedatasources" value="${usedatasources}" />
- <property name="datasourceloc" value="${datasourceloc}" />
-
- <ant antfile="src/main/resources/ctc_tests/ctc.xml" />
-
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
- </plugins>
- </build>
-
- </profile>
-
- <profile>
- <id>assemble</id>
-<!-- assemble will compile, but not run the tests prior to assemblying the kit -->
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/binaries.xml</descriptor>
- </descriptors>
- <outputDirectory>target/distribution</outputDirectory>
- <workDirectory>target/work/assembly</workDirectory>
-
- </configuration>
- <executions>
-
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
-
- </profiles>
-
-
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/test-integration/db/pom.xml (from rev 3140, trunk/test-integration/db/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/test-integration/db/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/test-integration/db/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,537 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+<!--
+ The database dependent tests are meant to be run on their own, not as part of the continous or nightly
+ build for Teiid.
+-->
+
+ <parent>
+ <artifactId>teiid-test-integration</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>test-integration-db</artifactId>
+
+ <name>DB Dependent Integration Tests</name>
+ <groupId>org.jboss.teiid.teiid-test-integration</groupId>
+ <description>Integration tests that require external database dependencies </description>
+ <dependencies>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-client</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-client</artifactId>
+ <type>test-jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <type>test-jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-engine</artifactId>
+ <type>test-jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>test-integration-common</artifactId>
+ <type>test-jar</type>
+ <scope>compile</scope>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+
+ </dependency>
+
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>cpptasks</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+
+ <!-- DBUnit dependencies -->
+
+ <dependency>
+ <groupId>org.dbunit</groupId>
+ <artifactId>dbunit</artifactId>
+ <version>2.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>3.2-FINAL</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>${postgresql.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${mysql.connector.version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <build>
+ <plugins>
+ <!-- Specify the compiler options and settings -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <showDeprecation>false</showDeprecation>
+ <showWarnings>false</showWarnings>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/binaries.xml</descriptor>
+ </descriptors>
+ <outputDirectory>target/distribution</outputDirectory>
+ <workDirectory>target/assembly/work</workDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+
+ <profile>
+ <id>runalltests</id>
+ <build>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${basedir}/lib/ojdbc6.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/lib/sqljdbc4.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/lib/db2jcc4.jar</additionalClasspathElement>
+
+ </additionalClasspathElements>
+ <systemProperties>
+ <property>
+ <name>usedatasources</name>
+ <value>${usedatasources}</value>
+ </property>
+ <property>
+ <name>datasourceloc</name>
+ <value>${datasourceloc}</value>
+ </property>
+ </systemProperties>
+
+<!--
+<forkMode>always</forkMode>
+ <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+ -->
+ <includes>
+ <!-- <include>**/*TestCase.java</include> -->
+ <include>**/*Test.java</include>
+ <include>**/*Tests.java</include>
+ <include>**/Test*.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/*Abstract*TestCase.java</exclude>
+ <exclude>**/*Abstract*Test.java</exclude>
+ <!-- hack to prevent anonymous inner classes in Tests from being run as tests -->
+ <exclude>**/Test*$*.java</exclude>
+ </excludes>
+
+ </configuration>
+ </plugin>
+
+ </plugins>
+
+ </build>
+
+<!-- <version>2.4.2</version> -->
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+
+ <configuration>
+ <outputDirectory>${basedir}/target/newsite</outputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+
+ <profile>
+ <id>runsingletest</id>
+ <activation>
+ <property>
+ <name>classname</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${basedir}/lib/ojdbc6.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/lib/sqljdbc4.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/lib/db2jcc4.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ <systemProperties>
+ <property>
+ <name>usedatasources</name>
+ <value>${usedatasources}</value>
+ </property>
+ <property>
+ <name>datasourceloc</name>
+ <value>${datasourceloc}</value>
+ </property>
+ </systemProperties>
+
+<!--
+ <forkMode>always</forkMode>
+
+ <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+ -->
+ <includes>
+ <include>**/${classname}.java</include>
+ </includes>
+
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+
+
+ <profile>
+ <id>setupdatasources</id>
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${apache.ant.version}</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ </configuration>
+ <executions>
+ <execution>
+ <id>setupalldatasources</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
+ <property name="relative.resources.dir" value="src/main/resources" />
+ <property name="datasourceloc" value="${datasourceloc}" />
+ <ant antfile="src/main/resources/ddl/manage_schemas.xml" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>singledatasource</id>
+ <activation>
+ <property>
+ <name>datasource</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${apache.ant.version}</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+
+ </configuration>
+ <executions>
+ <execution>
+ <id>setupsingledatasource</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+
+ <property name="single" value="${datasource}" />
+ <property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
+ <property name="datasourceloc" value="${datasourceloc}" />
+
+ <property name="relative.resources.dir" value="src/main/resources" />
+ <ant antfile="src/main/resources/ddl/manage_schemas.xml" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+
+ </plugins>
+ </build>
+ </profile>
+
+
+ <profile>
+ <id>runclienttests</id>
+ <activation>
+ <property>
+ <name>scenario.dir</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${apache.ant.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>run-client-test</id>
+ <phase>integration-test</phase>
+ <configuration>
+ <tasks>
+
+ <property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
+ <property name="scenario.dir" value="${scenario.dir}" />
+ <property name="queryset.artifacts.dir" value="${queryset.artifacts.dir}" />
+ <property name="vdb.artifacts.dir" value="${vdb.artifacts.dir}" />
+ <!-- optional properties -->
+ <property name="config.file" value="${config.file}" />
+ <property name="query.scenario.classname" value="${query.scenario.classname}" />
+ <property name="proj.dir" value="${project.basedir}/target/" />
+ <property name="usedatasources" value="${usedatasources}" />
+ <property name="datasourceloc" value="${datasourceloc}" />
+
+ <ant antfile="src/main/resources/ctc_tests/ctc.xml" />
+
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+
+ <profile>
+ <id>assemble</id>
+<!-- assemble will compile, but not run the tests prior to assemblying the kit -->
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/binaries.xml</descriptor>
+ </descriptors>
+ <outputDirectory>target/distribution</outputDirectory>
+ <workDirectory>target/work/assembly</workDirectory>
+
+ </configuration>
+ <executions>
+
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
+
+</project>
\ No newline at end of file
Deleted: tags/teiid-parent-7.4.0.CR1/test-integration/pom.xml
===================================================================
--- trunk/test-integration/pom.xml 2011-05-03 09:43:58 UTC (rev 3137)
+++ tags/teiid-parent-7.4.0.CR1/test-integration/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>teiid-parent</artifactId>
- <groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>teiid-test-integration</artifactId>
- <packaging>pom</packaging>
- <name>Integration Tests</name>
- <description>Integration tests spanning server/embedded/connectors.</description>
-
- <properties>
- <derby.version>10.2.1.6</derby.version>
- <mysql.connector.version>5.1.5</mysql.connector.version>
- <postgresql.version>8.3-603.jdbc3</postgresql.version>
-
- <apache.ant.version>1.7.0</apache.ant.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-metadata</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-metadata</artifactId>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>translator-jdbc</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-client</artifactId>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-engine</artifactId>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-adminshell</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-runtime</artifactId>
- </dependency>
-
- <!-- external dependencies -->
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
-
- </dependency>
-
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
- <modules>
- <module>common</module>
- <module>db</module>
- </modules>
-</project>
\ No newline at end of file
Copied: tags/teiid-parent-7.4.0.CR1/test-integration/pom.xml (from rev 3140, trunk/test-integration/pom.xml)
===================================================================
--- tags/teiid-parent-7.4.0.CR1/test-integration/pom.xml (rev 0)
+++ tags/teiid-parent-7.4.0.CR1/test-integration/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>teiid-parent</artifactId>
+ <groupId>org.jboss.teiid</groupId>
+ <version>7.4.0.CR1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>teiid-test-integration</artifactId>
+ <packaging>pom</packaging>
+ <name>Integration Tests</name>
+ <description>Integration tests spanning server/embedded/connectors.</description>
+
+ <properties>
+ <derby.version>10.2.1.6</derby.version>
+ <mysql.connector.version>5.1.5</mysql.connector.version>
+ <postgresql.version>8.3-603.jdbc3</postgresql.version>
+
+ <apache.ant.version>1.7.0</apache.ant.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-core</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-metadata</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-metadata</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <artifactId>translator-jdbc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-client</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-engine</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-adminshell</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-runtime</artifactId>
+ </dependency>
+
+ <!-- external dependencies -->
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+
+ </dependency>
+
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+ <modules>
+ <module>common</module>
+ <module>db</module>
+ </modules>
+</project>
\ No newline at end of file
13 years, 7 months
- 1
- 0