August 2010 - teiid-commits - Jboss List Archives

teiid SVN: r2403 - in tags: teiid-7.1.0.CR1 and 35 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-08-03 13:29:44 -0400 (Tue, 03 Aug 2010) New Revision: 2403 Added: tags/teiid-7.1.0.CR1/ tags/teiid-7.1.0.CR1/adminshell/pom.xml tags/teiid-7.1.0.CR1/api/pom.xml tags/teiid-7.1.0.CR1/build/pom.xml tags/teiid-7.1.0.CR1/cache-jbosscache/pom.xml tags/teiid-7.1.0.CR1/client/pom.xml tags/teiid-7.1.0.CR1/common-core/pom.xml tags/teiid-7.1.0.CR1/connectors/connector-file/pom.xml tags/teiid-7.1.0.CR1/connectors/connector-ldap/pom.xml tags/teiid-7.1.0.CR1/connectors/connector-salesforce/pom.xml tags/teiid-7.1.0.CR1/connectors/connector-ws/pom.xml tags/teiid-7.1.0.CR1/connectors/pom.xml tags/teiid-7.1.0.CR1/connectors/salesforce-api/pom.xml tags/teiid-7.1.0.CR1/connectors/sandbox/pom.xml tags/teiid-7.1.0.CR1/connectors/sandbox/translator-yahoo/pom.xml tags/teiid-7.1.0.CR1/connectors/translator-file/pom.xml tags/teiid-7.1.0.CR1/connectors/translator-jdbc/pom.xml tags/teiid-7.1.0.CR1/connectors/translator-ldap/pom.xml tags/teiid-7.1.0.CR1/connectors/translator-loopback/pom.xml tags/teiid-7.1.0.CR1/connectors/translator-salesforce/pom.xml tags/teiid-7.1.0.CR1/connectors/translator-ws/pom.xml tags/teiid-7.1.0.CR1/console/pom.xml tags/teiid-7.1.0.CR1/documentation/admin-guide/pom.xml tags/teiid-7.1.0.CR1/documentation/client-developers-guide/pom.xml tags/teiid-7.1.0.CR1/documentation/developer-guide/pom.xml tags/teiid-7.1.0.CR1/documentation/pom.xml tags/teiid-7.1.0.CR1/documentation/quick-start-example/pom.xml tags/teiid-7.1.0.CR1/documentation/reference/pom.xml tags/teiid-7.1.0.CR1/engine/pom.xml tags/teiid-7.1.0.CR1/hibernate-dialect/pom.xml tags/teiid-7.1.0.CR1/jboss-integration/pom.xml tags/teiid-7.1.0.CR1/metadata/pom.xml tags/teiid-7.1.0.CR1/pom.xml tags/teiid-7.1.0.CR1/runtime/pom.xml tags/teiid-7.1.0.CR1/test-integration/common/pom.xml tags/teiid-7.1.0.CR1/test-integration/db/pom.xml tags/teiid-7.1.0.CR1/test-integration/pom.xml Removed: tags/teiid-7.1.0.CR1/adminshell/pom.xml tags/teiid-7.1.0.CR1/api/pom.xml tags/teiid-7.1.0.CR1/build/pom.xml tags/teiid-7.1.0.CR1/cache-jbosscache/pom.xml tags/teiid-7.1.0.CR1/client/pom.xml tags/teiid-7.1.0.CR1/common-core/pom.xml tags/teiid-7.1.0.CR1/connectors/connector-file/pom.xml tags/teiid-7.1.0.CR1/connectors/connector-ldap/pom.xml tags/teiid-7.1.0.CR1/connectors/connector-salesforce/pom.xml tags/teiid-7.1.0.CR1/connectors/connector-ws/pom.xml tags/teiid-7.1.0.CR1/connectors/pom.xml tags/teiid-7.1.0.CR1/connectors/salesforce-api/pom.xml tags/teiid-7.1.0.CR1/connectors/sandbox/pom.xml tags/teiid-7.1.0.CR1/connectors/sandbox/translator-yahoo/pom.xml tags/teiid-7.1.0.CR1/connectors/translator-file/pom.xml tags/teiid-7.1.0.CR1/connectors/translator-jdbc/pom.xml tags/teiid-7.1.0.CR1/connectors/translator-ldap/pom.xml tags/teiid-7.1.0.CR1/connectors/translator-loopback/pom.xml tags/teiid-7.1.0.CR1/connectors/translator-salesforce/pom.xml tags/teiid-7.1.0.CR1/connectors/translator-ws/pom.xml tags/teiid-7.1.0.CR1/console/pom.xml tags/teiid-7.1.0.CR1/documentation/admin-guide/pom.xml tags/teiid-7.1.0.CR1/documentation/client-developers-guide/pom.xml tags/teiid-7.1.0.CR1/documentation/developer-guide/pom.xml tags/teiid-7.1.0.CR1/documentation/pom.xml tags/teiid-7.1.0.CR1/documentation/quick-start-example/pom.xml tags/teiid-7.1.0.CR1/documentation/reference/pom.xml tags/teiid-7.1.0.CR1/engine/pom.xml tags/teiid-7.1.0.CR1/hibernate-dialect/pom.xml tags/teiid-7.1.0.CR1/jboss-integration/pom.xml tags/teiid-7.1.0.CR1/metadata/pom.xml tags/teiid-7.1.0.CR1/pom.xml tags/teiid-7.1.0.CR1/runtime/pom.xml tags/teiid-7.1.0.CR1/test-integration/common/pom.xml tags/teiid-7.1.0.CR1/test-integration/db/pom.xml tags/teiid-7.1.0.CR1/test-integration/pom.xml Log: [maven-release-plugin] copy for tag teiid-7.1.0.CR1 Copied: tags/teiid-7.1.0.CR1 (from rev 2401, trunk) Deleted: tags/teiid-7.1.0.CR1/adminshell/pom.xml =================================================================== --- trunk/adminshell/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/adminshell/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,70 +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</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-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-7.1.0.CR1/adminshell/pom.xml (from rev 2402, trunk/adminshell/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/adminshell/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/adminshell/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.1.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-7.1.0.CR1/api/pom.xml =================================================================== --- trunk/api/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/api/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,36 +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</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-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-7.1.0.CR1/api/pom.xml (from rev 2402, trunk/api/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/api/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/api/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.1.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-7.1.0.CR1/build/pom.xml =================================================================== --- trunk/build/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/build/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,39 +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</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>build</artifactId> - <name>Build</name> - <description>Teiid Build</description> - <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> - </build> -</project> \ No newline at end of file Copied: tags/teiid-7.1.0.CR1/build/pom.xml (from rev 2402, trunk/build/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/build/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/build/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -0,0 +1,38 @@ +<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</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.1.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>build</artifactId> + <name>Build</name> + <description>Teiid Build</description> + <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> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-7.1.0.CR1/cache-jbosscache/pom.xml =================================================================== --- trunk/cache-jbosscache/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/cache-jbosscache/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,30 +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</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-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-engine</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/teiid-7.1.0.CR1/cache-jbosscache/pom.xml (from rev 2402, trunk/cache-jbosscache/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/cache-jbosscache/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/cache-jbosscache/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -0,0 +1,29 @@ +<?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</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.1.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-engine</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/teiid-7.1.0.CR1/client/pom.xml =================================================================== --- trunk/client/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/client/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,29 +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</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-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-7.1.0.CR1/client/pom.xml (from rev 2402, trunk/client/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/client/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/client/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.1.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-7.1.0.CR1/common-core/pom.xml =================================================================== --- trunk/common-core/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/common-core/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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>teiid</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-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-7.1.0.CR1/common-core/pom.xml (from rev 2402, trunk/common-core/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/common-core/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/common-core/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.1.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-7.1.0.CR1/connectors/connector-file/pom.xml =================================================================== --- trunk/connectors/connector-file/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/connectors/connector-file/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-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-7.1.0.CR1/connectors/connector-file/pom.xml (from rev 2402, trunk/connectors/connector-file/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/connectors/connector-file/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/connectors/connector-file/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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.1.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-7.1.0.CR1/connectors/connector-ldap/pom.xml =================================================================== --- trunk/connectors/connector-ldap/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/connectors/connector-ldap/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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.1.0-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-7.1.0.CR1/connectors/connector-ldap/pom.xml (from rev 2402, trunk/connectors/connector-ldap/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/connectors/connector-ldap/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/connectors/connector-ldap/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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.1.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-7.1.0.CR1/connectors/connector-salesforce/pom.xml =================================================================== --- trunk/connectors/connector-salesforce/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/connectors/connector-salesforce/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-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> - </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-7.1.0.CR1/connectors/connector-salesforce/pom.xml (from rev 2402, trunk/connectors/connector-salesforce/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/connectors/connector-salesforce/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/connectors/connector-salesforce/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -0,0 +1,70 @@ +<?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.1.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> + </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-7.1.0.CR1/connectors/connector-ws/pom.xml =================================================================== --- trunk/connectors/connector-ws/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/connectors/connector-ws/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-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.jboss.ws.native</groupId> - <artifactId>jbossws-native-core</artifactId> - <version>3.1.1.GA</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-7.1.0.CR1/connectors/connector-ws/pom.xml (from rev 2402, trunk/connectors/connector-ws/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/connectors/connector-ws/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/connectors/connector-ws/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -0,0 +1,64 @@ +<?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.1.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.jboss.ws.native</groupId> + <artifactId>jbossws-native-core</artifactId> + <version>3.1.1.GA</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-7.1.0.CR1/connectors/pom.xml =================================================================== --- trunk/connectors/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/connectors/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,95 +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</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-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> - -  - <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> - -  - <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> - </modules> -</project> Copied: tags/teiid-7.1.0.CR1/connectors/pom.xml (from rev 2402, trunk/connectors/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/connectors/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/connectors/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.1.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> + +  + <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> + +  + <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> + </modules> +</project> Deleted: tags/teiid-7.1.0.CR1/connectors/salesforce-api/pom.xml =================================================================== --- trunk/connectors/salesforce-api/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/connectors/salesforce-api/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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.1.0-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-7.1.0.CR1/connectors/salesforce-api/pom.xml (from rev 2402, trunk/connectors/salesforce-api/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/connectors/salesforce-api/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/connectors/salesforce-api/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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.1.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-7.1.0.CR1/connectors/sandbox/pom.xml =================================================================== --- trunk/connectors/sandbox/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/connectors/sandbox/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-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-7.1.0.CR1/connectors/sandbox/pom.xml (from rev 2402, trunk/connectors/sandbox/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/connectors/sandbox/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/connectors/sandbox/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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.1.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-7.1.0.CR1/connectors/sandbox/translator-yahoo/pom.xml =================================================================== --- trunk/connectors/sandbox/translator-yahoo/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/connectors/sandbox/translator-yahoo/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <parent> - <artifactId>sandbox</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <version>7.1.0-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-7.1.0.CR1/connectors/sandbox/translator-yahoo/pom.xml (from rev 2402, trunk/connectors/sandbox/translator-yahoo/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/connectors/sandbox/translator-yahoo/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/connectors/sandbox/translator-yahoo/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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.1.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-7.1.0.CR1/connectors/translator-file/pom.xml =================================================================== --- trunk/connectors/translator-file/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/connectors/translator-file/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-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-7.1.0.CR1/connectors/translator-file/pom.xml (from rev 2402, trunk/connectors/translator-file/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/connectors/translator-file/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/connectors/translator-file/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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.1.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-7.1.0.CR1/connectors/translator-jdbc/pom.xml =================================================================== --- trunk/connectors/translator-jdbc/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/connectors/translator-jdbc/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,56 +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.1.0-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-7.1.0.CR1/connectors/translator-jdbc/pom.xml (from rev 2402, trunk/connectors/translator-jdbc/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/connectors/translator-jdbc/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/connectors/translator-jdbc/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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.1.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-7.1.0.CR1/connectors/translator-ldap/pom.xml =================================================================== --- trunk/connectors/translator-ldap/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/connectors/translator-ldap/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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.1.0-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-7.1.0.CR1/connectors/translator-ldap/pom.xml (from rev 2402, trunk/connectors/translator-ldap/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/connectors/translator-ldap/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/connectors/translator-ldap/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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.1.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-7.1.0.CR1/connectors/translator-loopback/pom.xml =================================================================== --- trunk/connectors/translator-loopback/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/connectors/translator-loopback/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,55 +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.1.0-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-7.1.0.CR1/connectors/translator-loopback/pom.xml (from rev 2402, trunk/connectors/translator-loopback/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/connectors/translator-loopback/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/connectors/translator-loopback/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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.1.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-7.1.0.CR1/connectors/translator-salesforce/pom.xml =================================================================== --- trunk/connectors/translator-salesforce/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/connectors/translator-salesforce/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-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-7.1.0.CR1/connectors/translator-salesforce/pom.xml (from rev 2402, trunk/connectors/translator-salesforce/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/connectors/translator-salesforce/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/connectors/translator-salesforce/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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.1.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-7.1.0.CR1/connectors/translator-ws/pom.xml =================================================================== --- trunk/connectors/translator-ws/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/connectors/translator-ws/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-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-7.1.0.CR1/connectors/translator-ws/pom.xml (from rev 2402, trunk/connectors/translator-ws/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/connectors/translator-ws/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/connectors/translator-ws/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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.1.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-7.1.0.CR1/console/pom.xml =================================================================== --- trunk/console/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/console/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,180 +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</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-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.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> - - - </properties> - - <dependencies> -  - <dependency> - <groupId>org.rhq</groupId> - <artifactId>rhq-core-domain</artifactId> - <version>${org.rhq.version}</version> - <scope>provided</scope> -  - </dependency> - - - <dependency> - <groupId>org.rhq</groupId> - <artifactId>rhq-core-plugin-api</artifactId> - <version>${org.rhq.version}</version> - <scope>provided</scope>  - </dependency> - - <dependency> - <groupId>org.rhq</groupId> - <artifactId>rhq-core-native-system</artifactId> - <version>${org.rhq.version}</version> - <scope>provided</scope>  - </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> - -  - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope>  - </dependency> - - -  - <dependency> - <groupId>jboss.jboss-embeddable-ejb3</groupId> - <artifactId>hibernate-all</artifactId> - <version>1.0.0.Alpha9</version> - <scope>provided</scope>  - </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> - </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> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> - - -</project> \ No newline at end of file Copied: tags/teiid-7.1.0.CR1/console/pom.xml (from rev 2402, trunk/console/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/console/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/console/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -0,0 +1,180 @@ +<?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</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.1.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.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> + + + </properties> + + <dependencies> +  + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-core-domain</artifactId> + <version>${org.rhq.version}</version> + <scope>provided</scope> +  + </dependency> + + + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-core-plugin-api</artifactId> + <version>${org.rhq.version}</version> + <scope>provided</scope>  + </dependency> + + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-core-native-system</artifactId> + <version>${org.rhq.version}</version> + <scope>provided</scope>  + </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> + +  + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>1.0</version> + <scope>provided</scope>  + </dependency> + + +  + <dependency> + <groupId>jboss.jboss-embeddable-ejb3</groupId> + <artifactId>hibernate-all</artifactId> + <version>1.0.0.Alpha9</version> + <scope>provided</scope>  + </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> + </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> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> + + +</project> \ No newline at end of file Deleted: tags/teiid-7.1.0.CR1/documentation/admin-guide/pom.xml =================================================================== --- trunk/documentation/admin-guide/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/documentation/admin-guide/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,78 +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.1.0-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-7.1.0.CR1/documentation/admin-guide/pom.xml (from rev 2402, trunk/documentation/admin-guide/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/documentation/admin-guide/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/documentation/admin-guide/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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.1.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-7.1.0.CR1/documentation/client-developers-guide/pom.xml =================================================================== --- trunk/documentation/client-developers-guide/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/documentation/client-developers-guide/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,78 +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.1.0-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-7.1.0.CR1/documentation/client-developers-guide/pom.xml (from rev 2402, trunk/documentation/client-developers-guide/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/documentation/client-developers-guide/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/documentation/client-developers-guide/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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.1.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-7.1.0.CR1/documentation/developer-guide/pom.xml =================================================================== --- trunk/documentation/developer-guide/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/documentation/developer-guide/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,78 +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.1.0-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>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_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-7.1.0.CR1/documentation/developer-guide/pom.xml (from rev 2402, trunk/documentation/developer-guide/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/documentation/developer-guide/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/documentation/developer-guide/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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.1.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>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_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-7.1.0.CR1/documentation/pom.xml =================================================================== --- trunk/documentation/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/documentation/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-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> - </modules> -</project> \ No newline at end of file Copied: tags/teiid-7.1.0.CR1/documentation/pom.xml (from rev 2402, trunk/documentation/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/documentation/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/documentation/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -0,0 +1,20 @@ +<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</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.1.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> + </modules> +</project> \ No newline at end of file Deleted: tags/teiid-7.1.0.CR1/documentation/quick-start-example/pom.xml =================================================================== --- trunk/documentation/quick-start-example/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/documentation/quick-start-example/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,78 +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.1.0-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-7.1.0.CR1/documentation/quick-start-example/pom.xml (from rev 2402, trunk/documentation/quick-start-example/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/documentation/quick-start-example/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/documentation/quick-start-example/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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.1.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-7.1.0.CR1/documentation/reference/pom.xml =================================================================== --- trunk/documentation/reference/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/documentation/reference/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,78 +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.1.0-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-7.1.0.CR1/documentation/reference/pom.xml (from rev 2402, trunk/documentation/reference/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/documentation/reference/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/documentation/reference/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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.1.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-7.1.0.CR1/engine/pom.xml =================================================================== --- trunk/engine/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/engine/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,93 +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</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-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> - - </dependencies> - -</project> \ No newline at end of file Copied: tags/teiid-7.1.0.CR1/engine/pom.xml (from rev 2402, trunk/engine/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/engine/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/engine/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -0,0 +1,92 @@ +<?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</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.1.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> + + </dependencies> + +</project> \ No newline at end of file Deleted: tags/teiid-7.1.0.CR1/hibernate-dialect/pom.xml =================================================================== --- trunk/hibernate-dialect/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/hibernate-dialect/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,19 +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</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-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-7.1.0.CR1/hibernate-dialect/pom.xml (from rev 2402, trunk/hibernate-dialect/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/hibernate-dialect/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/hibernate-dialect/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.1.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-7.1.0.CR1/jboss-integration/pom.xml =================================================================== --- trunk/jboss-integration/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/jboss-integration/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,142 +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</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-jboss-integration</artifactId> - <name>teiid-jboss-integration</name> - <version>7.1.0-SNAPSHOT</version> - <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.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.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-7.1.0.CR1/jboss-integration/pom.xml (from rev 2402, trunk/jboss-integration/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/jboss-integration/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/jboss-integration/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -0,0 +1,142 @@ +<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</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.1.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-jboss-integration</artifactId> + <name>teiid-jboss-integration</name> + <version>7.1.0.CR1</version> + <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.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.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-7.1.0.CR1/metadata/pom.xml =================================================================== --- trunk/metadata/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/metadata/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-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-7.1.0.CR1/metadata/pom.xml (from rev 2402, trunk/metadata/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/metadata/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/metadata/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.1.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-7.1.0.CR1/pom.xml =================================================================== --- trunk/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,521 +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</artifactId> - <packaging>pom</packaging> - <name>Teiid</name> - <version>7.1.0-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> -  - <id>release</id> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> - <configuration> - <descriptors> - <descriptor>build/assembly/src.xml</descriptor> - <descriptor>build/assembly/docs.xml</descriptor> - <descriptor>build/assembly/client-jar.xml</descriptor> - <descriptor>build/assembly/jboss-container/dist.xml</descriptor> - <descriptor>build/assembly/adminshell/adminshell-dist.xml</descriptor> - </descriptors> - <outputDirectory>target/distribution</outputDirectory> - <workDirectory>target/assembly/work</workDirectory> - </configuration> - </plugin> - </plugins> - </build> - <modules> - <module>build</module> - <module>documentation</module> - </modules> - </profile> - <profile> -  - <id>dev</id> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> - <configuration> - <descriptors> - <descriptor>build/assembly/client-jar.xml</descriptor> - <descriptor>build/assembly/jboss-container/dist.xml</descriptor> - <descriptor>build/assembly/adminshell/adminshell-dist.xml</descriptor> - </descriptors> - <outputDirectory>target/distribution</outputDirectory> - <workDirectory>target/assembly/work</workDirectory> - </configuration> - </plugin> - </plugins> - </build> - <modules> - <module>build</module> - </modules> - </profile> - </profiles> - <build> -  - <pluginManagement> - <plugins> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> - </plugin> - </plugins> - </pluginManagement> - <plugins> -  - <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> -  - <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> -  - <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> -  - -  - <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> - -  - <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.10.GA</version> - </dependency> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <version>3.1.0.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> - </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.0.Final</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>${ant.version}</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> - </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> Copied: tags/teiid-7.1.0.CR1/pom.xml (from rev 2402, trunk/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -0,0 +1,520 @@ +<?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</artifactId> + <packaging>pom</packaging> + <name>Teiid</name> + <version>7.1.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-7.1.0.CR1</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-7.1.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> +  + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-5</version> + <configuration> + <descriptors> + <descriptor>build/assembly/src.xml</descriptor> + <descriptor>build/assembly/docs.xml</descriptor> + <descriptor>build/assembly/client-jar.xml</descriptor> + <descriptor>build/assembly/jboss-container/dist.xml</descriptor> + <descriptor>build/assembly/adminshell/adminshell-dist.xml</descriptor> + </descriptors> + <outputDirectory>target/distribution</outputDirectory> + <workDirectory>target/assembly/work</workDirectory> + </configuration> + </plugin> + </plugins> + </build> + <modules> + <module>build</module> + <module>documentation</module> + </modules> + </profile> + <profile> +  + <id>dev</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-5</version> + <configuration> + <descriptors> + <descriptor>build/assembly/client-jar.xml</descriptor> + <descriptor>build/assembly/jboss-container/dist.xml</descriptor> + <descriptor>build/assembly/adminshell/adminshell-dist.xml</descriptor> + </descriptors> + <outputDirectory>target/distribution</outputDirectory> + <workDirectory>target/assembly/work</workDirectory> + </configuration> + </plugin> + </plugins> + </build> + <modules> + <module>build</module> + </modules> + </profile> + </profiles> + <build> +  + <pluginManagement> + <plugins> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> + </plugin> + </plugins> + </pluginManagement> + <plugins> +  + <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> +  + <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> +  + <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> +  + +  + <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> + +  + <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.10.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>3.1.0.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> + </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.0.Final</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>${ant.version}</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> + </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> Deleted: tags/teiid-7.1.0.CR1/runtime/pom.xml =================================================================== --- trunk/runtime/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/runtime/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <parent> - <artifactId>teiid</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-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-7.1.0.CR1/runtime/pom.xml (from rev 2402, trunk/runtime/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/runtime/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/runtime/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.1.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-7.1.0.CR1/test-integration/common/pom.xml =================================================================== --- trunk/test-integration/common/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/test-integration/common/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,14 +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.1.0-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> - -</project> \ No newline at end of file Copied: tags/teiid-7.1.0.CR1/test-integration/common/pom.xml (from rev 2402, trunk/test-integration/common/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/test-integration/common/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/test-integration/common/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -0,0 +1,13 @@ +<?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.1.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> + +</project> \ No newline at end of file Deleted: tags/teiid-7.1.0.CR1/test-integration/db/pom.xml =================================================================== --- trunk/test-integration/db/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/test-integration/db/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,543 +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.1.0-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> - - <version>7.1.0-SNAPSHOT</version> - - <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> - - -  - - <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> -  - <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> - <version>2.2-beta-2</version> - <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> - - - <includes> -  - <include>**/*Test.java</include> - <include>**/*Tests.java</include> - <include>**/Test*.java</include> - </includes> - <excludes> - <exclude>**/*Abstract*TestCase.java</exclude> - <exclude>**/*Abstract*Test.java</exclude> -  - <exclude>**/Test*$*.java</exclude> - </excludes> - - </configuration> - </plugin> - - </plugins> - - </build> - - - - <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> - - - <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> - <property name="datasourceloc" value="${datasourceloc}"></property> - <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> - <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> - <property name="datasourceloc" value="${datasourceloc}"></property> - - <property name="relative.resources.dir" value="src/main/resources"></property> - <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> - <property name="queryset.artifacts.dir" value="${queryset.artifacts.dir}"></property> - <property name="vdb.artifacts.dir" value="${vdb.artifacts.dir}"></property> -  - <property name="config.file" value="${config.file}"></property> - <property name="query.scenario.classname" value="${query.scenario.classname}"></property> - <property name="proj.dir" value="${project.basedir}/target/" /> - <property name="usedatasources" value="${usedatasources}"></property> - <property name="datasourceloc" value="${datasourceloc}"></property> - - <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> - - - <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> - <version>2.2-beta-2</version> - <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-7.1.0.CR1/test-integration/db/pom.xml (from rev 2402, trunk/test-integration/db/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/test-integration/db/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/test-integration/db/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -0,0 +1,542 @@ +<?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.1.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> + + <version>7.1.0.CR1</version> + + <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> + + +  + + <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> +  + <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> + <version>2.2-beta-2</version> + <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> + + + <includes> +  + <include>**/*Test.java</include> + <include>**/*Tests.java</include> + <include>**/Test*.java</include> + </includes> + <excludes> + <exclude>**/*Abstract*TestCase.java</exclude> + <exclude>**/*Abstract*Test.java</exclude> +  + <exclude>**/Test*$*.java</exclude> + </excludes> + + </configuration> + </plugin> + + </plugins> + + </build> + + + + <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> + + + <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}" /> +  + <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> + + + <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> + <version>2.2-beta-2</version> + <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-7.1.0.CR1/test-integration/pom.xml =================================================================== --- trunk/test-integration/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ tags/teiid-7.1.0.CR1/test-integration/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -1,108 +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</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.1.0-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> - -  - <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-7.1.0.CR1/test-integration/pom.xml (from rev 2402, trunk/test-integration/pom.xml) =================================================================== --- tags/teiid-7.1.0.CR1/test-integration/pom.xml (rev 0) +++ tags/teiid-7.1.0.CR1/test-integration/pom.xml 2010-08-03 17:29:44 UTC (rev 2403) @@ -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</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.1.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> + +  + <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

14 years, 5 months

1
0
0 / 0

teiid SVN: r2402 - in trunk: adminshell and 34 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-08-03 13:28:07 -0400 (Tue, 03 Aug 2010) New Revision: 2402 Modified: trunk/adminshell/pom.xml trunk/api/pom.xml trunk/build/pom.xml trunk/cache-jbosscache/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-salesforce/pom.xml trunk/connectors/translator-ws/pom.xml trunk/console/pom.xml trunk/documentation/admin-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 release teiid-7.1.0.CR1 Modified: trunk/adminshell/pom.xml =================================================================== --- trunk/adminshell/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/adminshell/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,10 +1,9 @@ <?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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-adminshell</artifactId> Modified: trunk/api/pom.xml =================================================================== --- trunk/api/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/api/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,11 +1,9 @@ <?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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-api</artifactId> Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/build/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,9 +1,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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>build</artifactId> Modified: trunk/cache-jbosscache/pom.xml =================================================================== --- trunk/cache-jbosscache/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/cache-jbosscache/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,10 +1,9 @@ <?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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-cache-jbosscache</artifactId> Modified: trunk/client/pom.xml =================================================================== --- trunk/client/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/client/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,10 +1,9 @@ <?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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-client</artifactId> Modified: trunk/common-core/pom.xml =================================================================== --- trunk/common-core/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/common-core/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,10 +1,9 @@ <?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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</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 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/connectors/connector-file/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<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.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-file</artifactId> Modified: trunk/connectors/connector-ldap/pom.xml =================================================================== --- trunk/connectors/connector-ldap/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/connectors/connector-ldap/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ldap</artifactId> Modified: trunk/connectors/connector-salesforce/pom.xml =================================================================== --- trunk/connectors/connector-salesforce/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/connectors/connector-salesforce/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<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.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-salesforce</artifactId> Modified: trunk/connectors/connector-ws/pom.xml =================================================================== --- trunk/connectors/connector-ws/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/connectors/connector-ws/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<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.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ws</artifactId> Modified: trunk/connectors/pom.xml =================================================================== --- trunk/connectors/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/connectors/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,10 +1,9 @@ <?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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</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 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/connectors/salesforce-api/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>salesforce-api</artifactId> Modified: trunk/connectors/sandbox/pom.xml =================================================================== --- trunk/connectors/sandbox/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/connectors/sandbox/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<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.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</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 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/connectors/sandbox/translator-yahoo/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<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.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-yahoo</artifactId> Modified: trunk/connectors/translator-file/pom.xml =================================================================== --- trunk/connectors/translator-file/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/connectors/translator-file/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<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.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-file</artifactId> Modified: trunk/connectors/translator-jdbc/pom.xml =================================================================== --- trunk/connectors/translator-jdbc/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/connectors/translator-jdbc/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,11 +1,9 @@ <?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"> +<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.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-jdbc</artifactId> Modified: trunk/connectors/translator-ldap/pom.xml =================================================================== --- trunk/connectors/translator-ldap/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/connectors/translator-ldap/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ldap</artifactId> Modified: trunk/connectors/translator-loopback/pom.xml =================================================================== --- trunk/connectors/translator-loopback/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/connectors/translator-loopback/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,11 +1,9 @@ <?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"> +<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.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-loopback</artifactId> Modified: trunk/connectors/translator-salesforce/pom.xml =================================================================== --- trunk/connectors/translator-salesforce/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/connectors/translator-salesforce/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<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.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-salesforce</artifactId> Modified: trunk/connectors/translator-ws/pom.xml =================================================================== --- trunk/connectors/translator-ws/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/connectors/translator-ws/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<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.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ws</artifactId> Modified: trunk/console/pom.xml =================================================================== --- trunk/console/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/console/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/documentation/admin-guide/pom.xml =================================================================== --- trunk/documentation/admin-guide/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/documentation/admin-guide/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,9 +1,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/xsd/maven-4.0.0.xsd"> +<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.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>admin-guide</artifactId> Modified: trunk/documentation/client-developers-guide/pom.xml =================================================================== --- trunk/documentation/client-developers-guide/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/documentation/client-developers-guide/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,9 +1,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/xsd/maven-4.0.0.xsd"> +<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.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</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 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/documentation/developer-guide/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,9 +1,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/xsd/maven-4.0.0.xsd"> +<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.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>developer-guide</artifactId> Modified: trunk/documentation/pom.xml =================================================================== --- trunk/documentation/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/documentation/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,9 +1,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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</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 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/documentation/quick-start-example/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,9 +1,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/xsd/maven-4.0.0.xsd"> +<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.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>quick-start-example</artifactId> Modified: trunk/documentation/reference/pom.xml =================================================================== --- trunk/documentation/reference/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/documentation/reference/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,9 +1,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/xsd/maven-4.0.0.xsd"> +<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.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>reference</artifactId> Modified: trunk/engine/pom.xml =================================================================== --- trunk/engine/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/engine/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,10 +1,9 @@ <?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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-engine</artifactId> Modified: trunk/hibernate-dialect/pom.xml =================================================================== --- trunk/hibernate-dialect/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/hibernate-dialect/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,9 +1,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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-hibernate-dialect</artifactId> Modified: trunk/jboss-integration/pom.xml =================================================================== --- trunk/jboss-integration/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/jboss-integration/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -2,13 +2,13 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-jboss-integration</artifactId> <name>teiid-jboss-integration</name> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> <description>JBoss specific integration layer for teiid</description> <dependencies> Modified: trunk/metadata/pom.xml =================================================================== --- trunk/metadata/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/metadata/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-metadata</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,20 +1,19 @@ <?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"> +<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</artifactId> <packaging>pom</packaging> <name>Teiid</name> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.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/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/trunk</developerConnection> + <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/teiid-7.1.0.CR1</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-7.1.0.CR1</developerConnection> </scm> <licenses> <license> Modified: trunk/runtime/pom.xml =================================================================== --- trunk/runtime/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/runtime/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</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 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/test-integration/common/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,10 +1,9 @@ <?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"> +<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.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</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 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/test-integration/db/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,6 +1,5 @@ <?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"> +<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">  - <property name="config.file" value="${config.file}"></property> - <property name="query.scenario.classname" value="${query.scenario.classname}"></property> + <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> - <property name="datasourceloc" value="${datasourceloc}"></property> + <property name="usedatasources" value="${usedatasources}" /> + <property name="datasourceloc" value="${datasourceloc}" /> <ant antfile="src/main/resources/ctc_tests/ctc.xml" /> Modified: trunk/test-integration/pom.xml =================================================================== --- trunk/test-integration/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) +++ trunk/test-integration/pom.xml 2010-08-03 17:28:07 UTC (rev 2402) @@ -1,10 +1,9 @@ <?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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-test-integration</artifactId>

14 years, 5 months

1
0
0 / 0

Teiid-NightlyBuild - Build # 900 - Unstable!

by jboss-qa-internal＠redhat.com

Teiid-NightlyBuild - Build # 900 - Unstable: Check console output at http://hudson.qa.jboss.com/hudson/job/Teiid-NightlyBuild/900/ to view the results.

14 years, 5 months

1
9
0 / 0

teiid SVN: r2401 - in trunk: build/kits/jboss-container and 5 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-08-03 12:19:15 -0400 (Tue, 03 Aug 2010) New Revision: 2401 Removed: trunk/runtime/src/test/java/com/ Modified: trunk/build/kits/jboss-container/teiid-releasenotes.html trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java trunk/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java trunk/pom.xml Log: TEIID-168 changing the default mat view logic slightly and updating the parent pom Modified: trunk/build/kits/jboss-container/teiid-releasenotes.html =================================================================== --- trunk/build/kits/jboss-container/teiid-releasenotes.html 2010-08-03 04:32:09 UTC (rev 2400) +++ trunk/build/kits/jboss-container/teiid-releasenotes.html 2010-08-03 16:19:15 UTC (rev 2401) @@ -27,7 +27,8 @@ <H2><A NAME="Highlights"></A>Highlights</H2> <UL> <LI><B>ODBC Support</B> - Support for ODBC access is now available through PostgreSQL ODBC driver clients. See the Client Developer's Guide for more on how - to use Teiid's ODBC access. + to use Teiid's ODBC access. + <LI><B>Native Materialized Tables</B> - views marked as materialized without a target table will be materialized internally by Teiid. <LI><B>SQL Support</B> <ul> <li>Added NULLS FIST/LAST handling - including pushdown support. Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2010-08-03 04:32:09 UTC (rev 2400) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2010-08-03 16:19:15 UTC (rev 2401) @@ -23,6 +23,7 @@ package org.teiid.query.optimizer.relational; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -66,6 +67,7 @@ import org.teiid.query.processor.relational.JoinNode.JoinStrategyType; import org.teiid.query.resolver.QueryResolver; import org.teiid.query.resolver.util.BindVariableVisitor; +import org.teiid.query.resolver.util.ResolverUtil; import org.teiid.query.rewriter.QueryRewriter; import org.teiid.query.sql.LanguageObject; import org.teiid.query.sql.LanguageObject.Util; @@ -91,6 +93,7 @@ import org.teiid.query.sql.lang.TableFunctionReference; import org.teiid.query.sql.lang.UnaryFromClause; import org.teiid.query.sql.proc.CreateUpdateProcedureCommand; +import org.teiid.query.sql.symbol.AllSymbol; import org.teiid.query.sql.symbol.GroupSymbol; import org.teiid.query.sql.symbol.Reference; import org.teiid.query.sql.symbol.SingleElementSymbol; @@ -904,15 +907,59 @@ String groupName = metadata.getFullName(metadataID); if( isMaterializedGroup) { + Object matMetadataId = metadata.getMaterialization(metadataID); + String matTableName = null; + boolean isGlobal = matMetadataId == null; + if (isGlobal) { + matTableName = MAT_PREFIX + groupName; + TempMetadataStore store = context.getGlobalTableStore().getMetadataStore(); + TempMetadataID id = store.getTempGroupID(matTableName); + //define the table preserving the primary key + if (id == null) { + synchronized (store) { + id = store.getTempGroupID(matTableName); + if (id == null) { + //this is really just temporary and will be replaced by the real table + id = store.addTempGroup(matTableName, ResolverUtil.resolveElementsInGroup(virtualGroup, metadata), false, true); + + id.setCardinality(metadata.getCardinality(metadataID)); + + Object pk = metadata.getPrimaryKey(virtualGroup.getMetadataID()); + //primary key + if (pk != null) { + List cols = metadata.getElementIDsInKey(pk); + ArrayList<TempMetadataID> primaryKey = new ArrayList<TempMetadataID>(cols.size()); + for (Object coldId : cols) { + int pos = metadata.getPosition(coldId) - 1; + primaryKey.add(id.getElements().get(pos)); + } + id.setPrimaryKey(primaryKey); + } + //version column? + + //add timestamp? + } + } + } + matMetadataId = id; + } else { + matTableName = metadata.getFullName(matMetadataId); + } + if(noCache){ //not use cache qnode = metadata.getVirtualPlan(metadataID); - String matTableName = metadata.getFullName(metadata.getMaterialization(metadataID)); + //TODO: update the table for defaultMat recordMaterializationTableAnnotation(virtualGroup, analysisRecord, matTableName, "SimpleQueryResolver.materialized_table_not_used"); //$NON-NLS-1$ }else{ - // Default query for a materialized group - go to cached table - String matTableName = metadata.getFullName(metadata.getMaterialization(metadataID)); - qnode = new QueryNode(groupName, "SELECT * FROM " + matTableName); //$NON-NLS-1$ + qnode = new QueryNode(groupName, null); + Query query = new Query(); + query.setSelect(new Select(Arrays.asList(new AllSymbol()))); + GroupSymbol gs = new GroupSymbol(matTableName); + gs.setGlobalTable(isGlobal); + gs.setMetadataID(matMetadataId); + query.setFrom(new From(Arrays.asList(new UnaryFromClause(gs)))); + qnode.setCommand(query); cacheString = "matview"; //$NON-NLS-1$ recordMaterializationTableAnnotation(virtualGroup, analysisRecord, matTableName, "SimpleQueryResolver.Query_was_redirected_to_Mat_table"); //$NON-NLS-1$ } @@ -922,9 +969,6 @@ } Command result = getCommand(virtualGroup, qnode, cacheString, metadata); - if (!isMaterializedGroup && result.isCache()) { - result = handleCacheHint(virtualGroup, groupName, noCache, result); - } return QueryRewriter.rewrite(result, metadata, context); } @@ -936,8 +980,21 @@ if (result != null) { result = (Command)result.clone(); } else { - //parse, resolve, validate - result = convertToSubquery(qnode, qmi); + result = qnode.getCommand(); + + if (result == null) { + try { + result = QueryParser.getQueryParser().parseCommand(qnode.getQuery()); + } catch(QueryParserException e) { + throw new QueryResolverException(e, ErrorMessageKeys.RESOLVER_0011, QueryPlugin.Util.getString(ErrorMessageKeys.RESOLVER_0011, qnode.getGroupName())); + } + + //Handle bindings and references + List bindings = qnode.getBindings(); + if (bindings != null){ + BindVariableVisitor.bindReferences(result, bindings, metadata); + } + } QueryResolver.resolveCommand(result, Collections.EMPTY_MAP, qmi, analysisRecord); Request.validateWithVisitor(new ValidationVisitor(), qmi, result); qmi.addToMetadataCache(virtualGroup.getMetadataID(), "transformation/" + cacheString, result.clone()); //$NON-NLS-1$ @@ -945,49 +1002,6 @@ return result; } - private Command handleCacheHint(GroupSymbol virtualGroup, String name, boolean noCache, Command result) - throws TeiidComponentException, QueryMetadataException, QueryResolverException, QueryValidatorException { - TempMetadataStore store = context.getGlobalTableStore().getMetadataStore(); - String matTableName = MAT_PREFIX + name; - TempMetadataID id = store.getTempGroupID(matTableName); - //define the table preserving the primary key - if (id == null) { - synchronized (store) { - id = store.getTempGroupID(matTableName); - if (id == null) { - //TODO: this could be done with a generated create - id = store.addTempGroup(matTableName, result.getProjectedSymbols(), false, true); - - Object pk = metadata.getPrimaryKey(virtualGroup.getMetadataID()); - //primary key - if (pk != null) { - List cols = metadata.getElementIDsInKey(pk); - ArrayList<TempMetadataID> primaryKey = new ArrayList<TempMetadataID>(cols.size()); - for (Object coldId : cols) { - int pos = metadata.getPosition(coldId) - 1; - primaryKey.add(id.getElements().get(pos)); - } - id.setPrimaryKey(primaryKey); - } - //version column? - - //add timestamp? - } - } - } - if (noCache) { - recordMaterializationTableAnnotation(virtualGroup, analysisRecord, matTableName, "SimpleQueryResolver.materialized_table_not_used"); //$NON-NLS-1$ - //TODO: update the table - return result; - } - QueryMetadataInterface qmi = new TempMetadataAdapter(metadata, context.getGlobalTableStore().getMetadataStore()); - QueryNode qn = new QueryNode(virtualGroup.getName(), "select * from " + matTableName); //$NON-NLS-1$ - Query query = (Query)getCommand(virtualGroup, qn, "matview", qmi); //$NON-NLS-1$ - query.getFrom().getGroups().get(0).setGlobalTable(true); - recordMaterializationTableAnnotation(virtualGroup, analysisRecord, matTableName, "SimpleQueryResolver.Query_was_redirected_to_Mat_table"); //$NON-NLS-1$ - return query; - } - public static boolean isNoCacheGroup(QueryMetadataInterface metadata, Object metadataID, Option option) throws QueryMetadataException, @@ -1026,27 +1040,4 @@ } } - private static Command convertToSubquery(QueryNode qnode, QueryMetadataInterface metadata) - throws QueryResolverException, TeiidComponentException { - - // Parse this node's command - Command command = qnode.getCommand(); - - if (command == null) { - try { - command = QueryParser.getQueryParser().parseCommand(qnode.getQuery()); - } catch(QueryParserException e) { - throw new QueryResolverException(e, ErrorMessageKeys.RESOLVER_0011, QueryPlugin.Util.getString(ErrorMessageKeys.RESOLVER_0011, qnode.getGroupName())); - } - - //Handle bindings and references - List bindings = qnode.getBindings(); - if (bindings != null){ - BindVariableVisitor.bindReferences(command, bindings, metadata); - } - } - - return command; - } - } \ No newline at end of file Modified: trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java 2010-08-03 04:32:09 UTC (rev 2400) +++ trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java 2010-08-03 16:19:15 UTC (rev 2401) @@ -189,6 +189,7 @@ try { String actualViewName = tableName.substring(RelationalPlanner.MAT_PREFIX.length()); Object id = metadata.getGroupID(actualViewName); + //TODO: order by primary key nulls first - then have an insert ordered optimization String transformation = metadata.getVirtualPlan(id).getQuery(); QueryProcessor qp = context.getQueryProcessorFactory().createQueryProcessor(transformation, actualViewName, context); qp.setNonBlocking(true); Modified: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java 2010-08-03 04:32:09 UTC (rev 2400) +++ trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java 2010-08-03 16:19:15 UTC (rev 2401) @@ -153,7 +153,7 @@ CommandContext cc = new CommandContext(); cc.setGlobalTableStore(new TempTableStore("SYSTEM")); ProcessorPlan plan = TestOptimizer.getPlan(command, metadata, getGenericFinder(), analysis, true, cc); - TestOptimizer.checkAtomicQueries(new String[] {"SELECT #MAT_MatView.VGroup2.X FROM #MAT_MatView.VGroup2"}, plan); + TestOptimizer.checkAtomicQueries(new String[] {"SELECT #MAT_MatView.VGroup2.x FROM #MAT_MatView.VGroup2"}, plan); Collection<Annotation> annotations = analysis.getAnnotations(); assertNotNull("Expected annotations but got none", annotations); //$NON-NLS-1$ assertTrue("Expected one annotation", annotations.size() == 1); //$NON-NLS-1$ @@ -171,7 +171,7 @@ cc.setGlobalTableStore(new TempTableStore("SYSTEM")); RelationalPlan plan = (RelationalPlan)TestOptimizer.getPlan(command, metadata, getGenericFinder(), analysis, true, cc); assertEquals(1f, plan.getRootNode().getEstimateNodeCardinality()); - TestOptimizer.checkAtomicQueries(new String[] {"SELECT #MAT_MatView.VGroup3.X, #MAT_MatView.VGroup3.y FROM #MAT_MatView.VGroup3 WHERE #MAT_MatView.VGroup3.X = 'foo'"}, plan); + TestOptimizer.checkAtomicQueries(new String[] {"SELECT #MAT_MatView.VGroup3.x, #MAT_MatView.VGroup3.y FROM #MAT_MatView.VGroup3 WHERE #MAT_MatView.VGroup3.x = 'foo'"}, plan); Collection<Annotation> annotations = analysis.getAnnotations(); assertNotNull("Expected annotations but got none", annotations); //$NON-NLS-1$ assertTrue("Expected one annotation", annotations.size() == 1); //$NON-NLS-1$ Modified: trunk/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java 2010-08-03 04:32:09 UTC (rev 2400) +++ trunk/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java 2010-08-03 16:19:15 UTC (rev 2401) @@ -331,14 +331,16 @@ virtGroup1.setMaterializedTable(physGroup1); virtGroup1.setMaterializedStageTable(physGroupStage1); - QueryNode vTrans2 = new QueryNode("VGroup2", "/* cache */ SELECT x FROM matsrc"); //$NON-NLS-1$ //$NON-NLS-2$ + QueryNode vTrans2 = new QueryNode("VGroup2", "SELECT x FROM matsrc"); //$NON-NLS-1$ //$NON-NLS-2$ Table vGroup2 = createVirtualGroup("VGroup2", virtModel, vTrans2); //$NON-NLS-1$ + vGroup2.setMaterialized(true); createElements(vGroup2, new String[] { "x" }, //$NON-NLS-1$ new String[] { DataTypeManager.DefaultDataTypes.STRING}); - QueryNode vTrans3 = new QueryNode("VGroup3", "/* cache */ SELECT x, 'z' || substring(x, 2) as y FROM matsrc"); //$NON-NLS-1$ //$NON-NLS-2$ + QueryNode vTrans3 = new QueryNode("VGroup3", "SELECT x, 'z' || substring(x, 2) as y FROM matsrc"); //$NON-NLS-1$ //$NON-NLS-2$ Table vGroup3 = createVirtualGroup("VGroup3", virtModel, vTrans3); //$NON-NLS-1$ + vGroup3.setMaterialized(true); List<Column> vElements3 = createElements(vGroup3, new String[] { "x", "y" }, //$NON-NLS-1$ new String[] { DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING}); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-03 04:32:09 UTC (rev 2400) +++ trunk/pom.xml 2010-08-03 16:19:15 UTC (rev 2401) @@ -226,7 +226,7 @@ <configuration> <aggregate>true</aggregate> <maxmemory>512m</maxmemory> - <excludePackageNames>*.internal:com.arjuna.*:*.connector.object:*.connector.sysadmin:*.connector.yahoo:*.connector.exec</excludePackageNames> + <excludePackageNames>*.internal</excludePackageNames> </configuration> </plugin> </plugins>

14 years, 5 months

1
0
0 / 0

teiid SVN: r2400 - in trunk: engine/src/main/java/org/teiid/query/metadata and 12 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-08-03 00:32:09 -0400 (Tue, 03 Aug 2010) New Revision: 2400 Added: trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java Removed: trunk/engine/src/main/java/org/teiid/query/processor/TempTableDataManager.java Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java trunk/engine/src/main/java/org/teiid/query/metadata/BasicQueryMetadata.java trunk/engine/src/main/java/org/teiid/query/metadata/BasicQueryMetadataWrapper.java trunk/engine/src/main/java/org/teiid/query/metadata/QueryMetadataInterface.java trunk/engine/src/main/java/org/teiid/query/metadata/TempMetadataAdapter.java trunk/engine/src/main/java/org/teiid/query/metadata/TempMetadataID.java trunk/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java trunk/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java trunk/engine/src/main/java/org/teiid/query/processor/relational/GroupingNode.java trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLPlan.java trunk/engine/src/main/java/org/teiid/query/resolver/command/SetQueryResolver.java trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverUtil.java trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableStore.java trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFacade.java trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFactory.java trunk/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java Log: TEIID-168 added support for implicit materialized view creation. still need to add refersh logic Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -73,6 +73,7 @@ import org.teiid.logging.MessageLevel; import org.teiid.logging.CommandLogMessage.Event; import org.teiid.query.processor.ProcessorDataManager; +import org.teiid.query.tempdata.TempTableDataManager; import org.teiid.query.tempdata.TempTableStore; @@ -236,7 +237,7 @@ public ClientState getClientState(String key, boolean create) { ClientState state = clientState.get(key); if (state == null && create) { - state = new ClientState(new TempTableStore(bufferManager, key)); + state = new ClientState(new TempTableStore(key)); clientState.put(key, state); } return state; @@ -612,10 +613,6 @@ return this.dataTierMgr; } - public void setDataTierManager(ProcessorDataManager dataTierMgr) { - this.dataTierMgr = dataTierMgr; - } - public BufferManager getBufferManager() { return bufferManager; } @@ -662,12 +659,12 @@ this.processWorkerPool = new ThreadReuseExecutor(DQPConfiguration.PROCESS_PLAN_QUEUE_NAME, config.getMaxThreads()); - dataTierMgr = new DataTierManagerImpl(this, + dataTierMgr = new TempTableDataManager(new DataTierManagerImpl(this, this.connectorManagerRepository, this.bufferService, this.maxCodeTables, this.maxCodeRecords, - this.maxCodeTableRecords); + this.maxCodeTableRecords), this.bufferManager); } public void setBufferService(BufferService service) { Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -70,7 +70,6 @@ import org.teiid.query.processor.ProcessorDataManager; import org.teiid.query.processor.ProcessorPlan; import org.teiid.query.processor.QueryProcessor; -import org.teiid.query.processor.TempTableDataManager; import org.teiid.query.processor.xml.XMLPlan; import org.teiid.query.resolver.QueryResolver; import org.teiid.query.rewriter.QueryRewriter; @@ -177,15 +176,6 @@ VDBMetaData vdbMetadata = workContext.getVDB(); metadata = vdbMetadata.getAttachment(QueryMetadataInterface.class); globalTables = vdbMetadata.getAttachment(TempTableStore.class); - if (globalTables == null) { - synchronized (vdbMetadata) { - globalTables = vdbMetadata.getAttachment(TempTableStore.class); - if (globalTables == null) { - globalTables = new TempTableStore(bufferManager, "SYSTEM"); //$NON-NLS-1$ - vdbMetadata.addAttchment(TempTableStore.class, globalTables); - } - } - } if (metadata == null) { throw new TeiidComponentException(DQPPlugin.Util.getString("DQPCore.Unable_to_load_metadata_for_VDB_name__{0},_version__{1}", this.vdbName, this.vdbVersion)); //$NON-NLS-1$ @@ -362,7 +352,7 @@ } this.transactionContext = tc; - this.processor = new QueryProcessor(processPlan, context, bufferManager, new TempTableDataManager(processorDataManager)); + this.processor = new QueryProcessor(processPlan, context, bufferManager, processorDataManager); } /** Modified: trunk/engine/src/main/java/org/teiid/query/metadata/BasicQueryMetadata.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/BasicQueryMetadata.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/main/java/org/teiid/query/metadata/BasicQueryMetadata.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -505,8 +505,8 @@ } @Override - public boolean isPrimaryKey(Object metadataID) { - return false; + public Object getPrimaryKey(Object metadataID) { + return null; } } Modified: trunk/engine/src/main/java/org/teiid/query/metadata/BasicQueryMetadataWrapper.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/BasicQueryMetadataWrapper.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/main/java/org/teiid/query/metadata/BasicQueryMetadataWrapper.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -370,8 +370,8 @@ } @Override - public boolean isPrimaryKey(Object metadataID) { - return actualMetadata.isPrimaryKey(metadataID); + public Object getPrimaryKey(Object metadataID) { + return actualMetadata.getPrimaryKey(metadataID); } } Modified: trunk/engine/src/main/java/org/teiid/query/metadata/QueryMetadataInterface.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/QueryMetadataInterface.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/main/java/org/teiid/query/metadata/QueryMetadataInterface.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -679,5 +679,5 @@ FunctionLibrary getFunctionLibrary(); - boolean isPrimaryKey(Object metadataID); + Object getPrimaryKey(Object metadataID); } Modified: trunk/engine/src/main/java/org/teiid/query/metadata/TempMetadataAdapter.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/TempMetadataAdapter.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/main/java/org/teiid/query/metadata/TempMetadataAdapter.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -526,11 +526,7 @@ public int getPosition(Object elementID) throws TeiidComponentException, QueryMetadataException { if (elementID instanceof TempMetadataID) { - String elementName = ((TempMetadataID)elementID).getID(); - String groupName = elementName.substring(0, elementName.lastIndexOf(SEPARATOR)); - TempMetadataID groupID = this.tempStore.getTempGroupID(groupName); - List elements = groupID.getElements(); - return elements.indexOf(elementID); + return ((TempMetadataID)elementID).getPosition(); } return actualMetadata.getPosition(elementID); } @@ -694,15 +690,11 @@ } @Override - public boolean isPrimaryKey(Object metadataID) { + public Object getPrimaryKey(Object metadataID) { if (metadataID instanceof TempMetadataID) { - TempMetadataID tid = (TempMetadataID)metadataID; - if (tid.getPrimaryKey() != null) { - return true; - } - return false; + return metadataID; } - return this.actualMetadata.isPrimaryKey(metadataID); + return this.actualMetadata.getPrimaryKey(metadataID); } } Modified: trunk/engine/src/main/java/org/teiid/query/metadata/TempMetadataID.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/TempMetadataID.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/main/java/org/teiid/query/metadata/TempMetadataID.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -41,7 +41,8 @@ private static final int LOCAL_CACHE_SIZE = 8; private String ID; // never null, upper cased fully-qualified string - private int position = -1; //used for order by symbol resolving. refers to the position in the select clause + private int selectPosition = -1; //used for order by symbol resolving. refers to the position in the select clause + private int position; private Class<?> type; // type of this element, only for element private List<TempMetadataID> elements; // of TempMetadataID, only for group private Object originalMetadataID; @@ -71,6 +72,10 @@ public TempMetadataID(String ID, List<TempMetadataID> elements, boolean isVirtual, boolean isTempTable) { this.ID = ID; this.elements = elements; + int pos = 1; + for (TempMetadataID tempMetadataID : elements) { + tempMetadataID.setPosition(pos++); + } this.isVirtual = isVirtual; this.isTempTable = isTempTable; } @@ -128,6 +133,7 @@ protected void addElement(TempMetadataID elem) { if (this.elements != null) { this.elements.add(elem); + elem.setPosition(this.elements.size()); } if (this.localCache != null) { this.localCache.clear(); @@ -217,12 +223,12 @@ this.isTempTable = isTempTable; } - public int getPosition() { - return this.position; + public int getSelectPosition() { + return this.selectPosition; } - public void setPosition(int position) { - this.position = position; + public void setSelectPosition(int position) { + this.selectPosition = position; } Object getProperty(Object key) { @@ -254,5 +260,13 @@ public void setPrimaryKey(List<TempMetadataID> primaryKey) { this.primaryKey = primaryKey; } + + public int getPosition() { + return position; + } + + public void setPosition(int position) { + this.position = position; + } } Modified: trunk/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -1069,9 +1069,9 @@ } @Override - public boolean isPrimaryKey(Object metadataID) { - ArgCheck.isInstanceOf(KeyRecord.class, metadataID); - KeyRecord key = (KeyRecord)metadataID; - return key.getType() == org.teiid.metadata.KeyRecord.Type.Primary; + public Object getPrimaryKey(Object metadataID) { + ArgCheck.isInstanceOf(Table.class, metadataID); + Table table = (Table)metadataID; + return table.getPrimaryKey(); } } \ No newline at end of file Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -115,6 +115,8 @@ */ public class RelationalPlanner { + public static final String MAT_PREFIX = "#MAT_"; //$NON-NLS-1$ + private AnalysisRecord analysisRecord; private Command parentCommand; private IDGenerator idGenerator; @@ -946,7 +948,7 @@ private Command handleCacheHint(GroupSymbol virtualGroup, String name, boolean noCache, Command result) throws TeiidComponentException, QueryMetadataException, QueryResolverException, QueryValidatorException { TempMetadataStore store = context.getGlobalTableStore().getMetadataStore(); - String matTableName = "#MAT_" + name; //$NON-NLS-1$ + String matTableName = MAT_PREFIX + name; TempMetadataID id = store.getTempGroupID(matTableName); //define the table preserving the primary key if (id == null) { @@ -956,19 +958,16 @@ //TODO: this could be done with a generated create id = store.addTempGroup(matTableName, result.getProjectedSymbols(), false, true); + Object pk = metadata.getPrimaryKey(virtualGroup.getMetadataID()); //primary key - Collection keys = metadata.getUniqueKeysInGroup(virtualGroup.getMetadataID()); - for (Object object : keys) { - if (metadata.isPrimaryKey(object)) { - List cols = metadata.getElementIDsInKey(object); - ArrayList<TempMetadataID> primaryKey = new ArrayList<TempMetadataID>(cols.size()); - for (Object coldId : cols) { - int pos = metadata.getPosition(coldId) - 1; - primaryKey.add(id.getElements().get(pos)); - } - id.setPrimaryKey(primaryKey); - break; + if (pk != null) { + List cols = metadata.getElementIDsInKey(pk); + ArrayList<TempMetadataID> primaryKey = new ArrayList<TempMetadataID>(cols.size()); + for (Object coldId : cols) { + int pos = metadata.getPosition(coldId) - 1; + primaryKey.add(id.getElements().get(pos)); } + id.setPrimaryKey(primaryKey); } //version column? Modified: trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -24,9 +24,11 @@ import java.util.List; +import org.teiid.api.exception.query.ExpressionEvaluationException; import org.teiid.common.buffer.BlockedException; import org.teiid.common.buffer.TupleBatch; import org.teiid.common.buffer.TupleBuffer; +import org.teiid.common.buffer.TupleSource; import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidProcessingException; @@ -51,6 +53,52 @@ List getOutputElements(); } + public static class BatchProducerTupleSource implements TupleSource { + private final BatchProducer sourceNode; + private TupleBatch sourceBatch; // Current batch loaded from the source, if blocked + private int sourceRow = 1; + + public BatchProducerTupleSource(BatchProducer sourceNode) { + this.sourceNode = sourceNode; + } + + @Override + public List<?> nextTuple() throws TeiidComponentException, + TeiidProcessingException { + while (true) { + if(sourceBatch == null) { + // Read next batch + sourceBatch = sourceNode.nextBatch(); + } + + if(sourceBatch.getRowCount() > 0 && sourceRow <= sourceBatch.getEndRow()) { + // Evaluate expressions needed for grouping + List tuple = sourceBatch.getTuple(sourceRow); + tuple = updateTuple(tuple); + sourceRow++; + return tuple; + } + + // Check for termination condition + if(sourceBatch.getTerminationFlag()) { + sourceBatch = null; + return null; + } + sourceBatch = null; + } + } + + @SuppressWarnings("unused") + protected List updateTuple(List tuple) throws ExpressionEvaluationException, BlockedException, TeiidComponentException { + return tuple; + } + + @Override + public void closeSource() { + + } + } + private BatchProducer sourceNode; private boolean done = false; Deleted: trunk/engine/src/main/java/org/teiid/query/processor/TempTableDataManager.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/TempTableDataManager.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/main/java/org/teiid/query/processor/TempTableDataManager.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -1,84 +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 org.teiid.common.buffer.BlockedException; -import org.teiid.common.buffer.TupleSource; -import org.teiid.core.TeiidComponentException; -import org.teiid.core.TeiidProcessingException; -import org.teiid.query.sql.lang.Command; -import org.teiid.query.tempdata.TempTableStore; -import org.teiid.query.util.CommandContext; - - -/** - * This proxy ProcessorDataManager is used to handle temporary tables. - */ -public class TempTableDataManager implements ProcessorDataManager { - - private ProcessorDataManager processorDataManager; - - /** - * Constructor takes the "real" ProcessorDataManager that this object will be a proxy to, - * and will pass most calls through to transparently. Only when a request is registered for - * a temp group will this proxy do it's thing. - * @param processorDataManager the real ProcessorDataManager that this object is a proxy to - */ - public TempTableDataManager(ProcessorDataManager processorDataManager){ - this.processorDataManager = processorDataManager; - } - - public TupleSource registerRequest( - CommandContext context, - Command command, - String modelName, - String connectorBindingId, int nodeID) - throws TeiidComponentException, TeiidProcessingException { - - TempTableStore tempTableStore = context.getTempTableStore(); - if(tempTableStore != null) { - TupleSource result = tempTableStore.registerRequest(context, command); - if (result != null) { - return result; - } - } - return this.processorDataManager.registerRequest(context, command, modelName, connectorBindingId, nodeID); - } - - public Object lookupCodeValue( - CommandContext context, - String codeTableName, - String returnElementName, - String keyElementName, - Object keyValue) - throws BlockedException, TeiidComponentException, TeiidProcessingException { - - return this.processorDataManager.lookupCodeValue(context, codeTableName, returnElementName, keyElementName, keyValue); - } - - @Override - public void clearCodeTables() { - this.processorDataManager.clearCodeTables(); - } - -} Modified: trunk/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -201,7 +201,7 @@ context.setValue(entry.getKey(), value); } } - tempTableStore = new TempTableStore(bufferMgr, getContext().getConnectionID()); + tempTableStore = new TempTableStore(getContext().getConnectionID()); getContext().setTempTableStore(tempTableStore); } this.evaluatedParams = true; Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/GroupingNode.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/relational/GroupingNode.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/main/java/org/teiid/query/processor/relational/GroupingNode.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -31,6 +31,7 @@ import java.util.ListIterator; import java.util.Map; +import org.teiid.api.exception.query.ExpressionEvaluationException; import org.teiid.client.plan.PlanNode; import org.teiid.common.buffer.BlockedException; import org.teiid.common.buffer.BufferManager; @@ -50,6 +51,7 @@ import org.teiid.query.function.aggregate.StatsFunction; import org.teiid.query.function.aggregate.Sum; import org.teiid.query.function.aggregate.XMLAgg; +import org.teiid.query.processor.BatchCollector; import org.teiid.query.processor.ProcessorDataManager; import org.teiid.query.processor.relational.SortUtility.Mode; import org.teiid.query.sql.lang.OrderBy; @@ -267,49 +269,22 @@ final RelationalNode sourceNode = this.getChildren()[0]; - return new TupleSource() { - private TupleBatch sourceBatch; // Current batch loaded from the source, if blocked - private int sourceRow = 1; - - @Override - public List<?> nextTuple() throws TeiidComponentException, - TeiidProcessingException { - while (true) { - if(sourceBatch == null) { - // Read next batch - sourceBatch = sourceNode.nextBatch(); - } - - if(sourceBatch.getRowCount() > 0 && sourceRow <= sourceBatch.getEndRow()) { - // Evaluate expressions needed for grouping - List tuple = sourceBatch.getTuple(sourceRow); - - int columns = collectedExpressions.size(); - List exprTuple = new ArrayList(columns); - for(int col = 0; col<columns; col++) { - // The following call may throw BlockedException, but all state to this point - // is saved in class variables so we can start over on building this tuple - Object value = new Evaluator(elementMap, getDataManager(), getContext()).evaluate((Expression)collectedExpressions.get(col), tuple); - exprTuple.add(value); - } - sourceRow++; - return exprTuple; - } - - // Check for termination condition - if(sourceBatch.getTerminationFlag()) { - sourceBatch = null; - return null; - } - sourceBatch = null; - } - } + return new BatchCollector.BatchProducerTupleSource(sourceNode) { + Evaluator eval = new Evaluator(elementMap, getDataManager(), getContext()); + @Override - public void closeSource() { - + protected List updateTuple(List tuple) throws ExpressionEvaluationException, BlockedException, TeiidComponentException { + int columns = collectedExpressions.size(); + List exprTuple = new ArrayList(columns); + for(int col = 0; col<columns; col++) { + // The following call may throw BlockedException, but all state to this point + // is saved in class variables so we can start over on building this tuple + Object value = eval.evaluate(collectedExpressions.get(col), tuple); + exprTuple.add(value); + } + return exprTuple; } - }; } Modified: trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLPlan.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLPlan.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLPlan.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -57,7 +57,6 @@ import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.processor.ProcessorDataManager; import org.teiid.query.processor.ProcessorPlan; -import org.teiid.query.processor.TempTableDataManager; import org.teiid.query.sql.symbol.ElementSymbol; import org.teiid.query.sql.symbol.GroupSymbol; import org.teiid.query.tempdata.TempTableStore; @@ -112,7 +111,7 @@ public void initialize(CommandContext context, ProcessorDataManager dataMgr, BufferManager bufferMgr) { context = context.clone(); setContext(context); - TempTableStore tempTableStore = new TempTableStore(bufferMgr, context.getConnectionID()); + TempTableStore tempTableStore = new TempTableStore(context.getConnectionID()); tempTableStore.setParentTempTableStore(context.getTempTableStore()); context.setTempTableStore(tempTableStore); this.dataMgr = dataMgr; Modified: trunk/engine/src/main/java/org/teiid/query/resolver/command/SetQueryResolver.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/resolver/command/SetQueryResolver.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/main/java/org/teiid/query/resolver/command/SetQueryResolver.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -141,7 +141,7 @@ public static boolean orderByContainsVariable(OrderBy orderBy, SingleElementSymbol ses, int position) { for (final Iterator iterator = orderBy.getSortKeys().iterator(); iterator.hasNext();) { final ElementSymbol element = (ElementSymbol)iterator.next(); - if (position == ((TempMetadataID)element.getMetadataID()).getPosition()) { + if (position == ((TempMetadataID)element.getMetadataID()).getSelectPosition()) { return true; } } Modified: trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverUtil.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverUtil.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverUtil.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -427,7 +427,7 @@ if (matchedSymbol != null) { TempMetadataID tempMetadataID = new TempMetadataID(symbol.getName(), matchedSymbol.getType()); int position = knownElements.indexOf(matchedSymbol); - tempMetadataID.setPosition(position); + tempMetadataID.setSelectPosition(position); symbol.setMetadataID(tempMetadataID); symbol.setType(matchedSymbol.getType()); return position; Added: trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java (rev 0) +++ trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -0,0 +1,243 @@ +/* + * 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.tempdata; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.teiid.api.exception.query.ExpressionEvaluationException; +import org.teiid.api.exception.query.QueryMetadataException; +import org.teiid.api.exception.query.QueryProcessingException; +import org.teiid.common.buffer.BlockedException; +import org.teiid.common.buffer.BufferManager; +import org.teiid.common.buffer.TupleSource; +import org.teiid.core.TeiidComponentException; +import org.teiid.core.TeiidProcessingException; +import org.teiid.query.eval.Evaluator; +import org.teiid.query.execution.QueryExecPlugin; +import org.teiid.query.metadata.QueryMetadataInterface; +import org.teiid.query.optimizer.relational.RelationalPlanner; +import org.teiid.query.processor.BatchCollector; +import org.teiid.query.processor.CollectionTupleSource; +import org.teiid.query.processor.ProcessorDataManager; +import org.teiid.query.processor.QueryProcessor; +import org.teiid.query.resolver.util.ResolverUtil; +import org.teiid.query.sql.lang.Command; +import org.teiid.query.sql.lang.Create; +import org.teiid.query.sql.lang.Criteria; +import org.teiid.query.sql.lang.Delete; +import org.teiid.query.sql.lang.Drop; +import org.teiid.query.sql.lang.Insert; +import org.teiid.query.sql.lang.ProcedureContainer; +import org.teiid.query.sql.lang.Query; +import org.teiid.query.sql.lang.Update; +import org.teiid.query.sql.navigator.PostOrderNavigator; +import org.teiid.query.sql.symbol.ElementSymbol; +import org.teiid.query.sql.symbol.Expression; +import org.teiid.query.sql.symbol.GroupSymbol; +import org.teiid.query.sql.visitor.ExpressionMappingVisitor; +import org.teiid.query.tempdata.TempTableStore.MatState; +import org.teiid.query.tempdata.TempTableStore.MatTableInfo; +import org.teiid.query.util.CommandContext; + + +/** + * This proxy ProcessorDataManager is used to handle temporary tables. + */ +public class TempTableDataManager implements ProcessorDataManager { + + + + private ProcessorDataManager processorDataManager; + private BufferManager bufferManager; + + /** + * Constructor takes the "real" ProcessorDataManager that this object will be a proxy to, + * and will pass most calls through to transparently. Only when a request is registered for + * a temp group will this proxy do it's thing. + * @param processorDataManager the real ProcessorDataManager that this object is a proxy to + */ + public TempTableDataManager(ProcessorDataManager processorDataManager, BufferManager bufferManager){ + this.processorDataManager = processorDataManager; + this.bufferManager = bufferManager; + } + + public TupleSource registerRequest( + CommandContext context, + Command command, + String modelName, + String connectorBindingId, int nodeID) + throws TeiidComponentException, TeiidProcessingException { + + TempTableStore tempTableStore = context.getTempTableStore(); + if(tempTableStore != null) { + TupleSource result = registerRequest(context, command); + if (result != null) { + return result; + } + } + return this.processorDataManager.registerRequest(context, command, modelName, connectorBindingId, nodeID); + } + + public TupleSource registerRequest(CommandContext context, Command command) throws TeiidComponentException, TeiidProcessingException { + TempTableStore contextStore = context.getTempTableStore(); + if (command instanceof Query) { + Query query = (Query)command; + return registerQuery(context, command, contextStore, query); + } + if (command instanceof ProcedureContainer) { + GroupSymbol group = ((ProcedureContainer)command).getGroup(); + if (!group.isTempGroupSymbol()) { + return null; + } + final String groupKey = group.getNonCorrelationName().toUpperCase(); + final TempTable table = contextStore.getOrCreateTempTable(groupKey, command, bufferManager, false); + if (command instanceof Insert) { + Insert insert = (Insert)command; + TupleSource ts = insert.getTupleSource(); + if (ts == null) { + List<Object> values = new ArrayList<Object>(insert.getValues().size()); + for (Expression expr : (List<Expression>)insert.getValues()) { + values.add(Evaluator.evaluate(expr)); + } + ts = new CollectionTupleSource(Arrays.asList(values).iterator()); + } + return table.insert(ts, insert.getVariables()); + } + if (command instanceof Update) { + final Update update = (Update)command; + final Criteria crit = update.getCriteria(); + return table.update(crit, update.getChangeList()); + } + if (command instanceof Delete) { + final Delete delete = (Delete)command; + final Criteria crit = delete.getCriteria(); + if (crit == null) { + //because we are non-transactional, just use a truncate + int rows = table.truncate(); + return CollectionTupleSource.createUpdateCountTupleSource(rows); + } + return table.delete(crit); + } + } + if (command instanceof Create) { + Create create = (Create)command; + String tempTableName = create.getTable().getCanonicalName(); + if (contextStore.hasTempTable(tempTableName)) { + throw new QueryProcessingException(QueryExecPlugin.Util.getString("TempTableStore.table_exist_error", tempTableName));//$NON-NLS-1$ + } + contextStore.addTempTable(tempTableName, create, bufferManager); + return CollectionTupleSource.createUpdateCountTupleSource(0); + } + if (command instanceof Drop) { + String tempTableName = ((Drop)command).getTable().getCanonicalName(); + contextStore.removeTempTableByName(tempTableName); + return CollectionTupleSource.createUpdateCountTupleSource(0); + } + return null; + } + + private TupleSource registerQuery(CommandContext context, Command command, + TempTableStore contextStore, Query query) + throws TeiidComponentException, QueryMetadataException, + TeiidProcessingException, ExpressionEvaluationException, + QueryProcessingException { + GroupSymbol group = query.getFrom().getGroups().get(0); + if (!group.isTempGroupSymbol()) { + return null; + } + final String tableName = group.getNonCorrelationName().toUpperCase(); + TempTable table = null; + if (group.isGlobalTable()) { + TempTableStore tts = context.getGlobalTableStore(); + MatTableInfo info = tts.getMatTableInfo(tableName); + boolean load = info.shouldLoad(); + if (load) { + QueryMetadataInterface metadata = context.getMetadata(); + Create create = new Create(); + create.setTable(group); + create.setColumns(ResolverUtil.resolveElementsInGroup(group, metadata)); + Object pk = metadata.getPrimaryKey(group.getMetadataID()); + if (pk != null) { + for (Object col : metadata.getElementIDsInKey(pk)) { + create.getPrimaryKey().add(create.getColumns().get(metadata.getPosition(col)-1)); + } + } + table = tts.addTempTable(tableName, create, bufferManager); + boolean success = false; + try { + String actualViewName = tableName.substring(RelationalPlanner.MAT_PREFIX.length()); + Object id = metadata.getGroupID(actualViewName); + String transformation = metadata.getVirtualPlan(id).getQuery(); + QueryProcessor qp = context.getQueryProcessorFactory().createQueryProcessor(transformation, actualViewName, context); + qp.setNonBlocking(true); + TupleSource ts = new BatchCollector.BatchProducerTupleSource(qp); + //TODO: if this insert fails, it's unnecessary to do the undo processing + table.insert(ts, table.getColumns()); + success = true; + } finally { + if (!success) { + table.remove(); + tts.removeTempTableByName(tableName); + } + info.setState(success?MatState.LOADED:MatState.FAILED_LOAD); + } + } else { + table = tts.getOrCreateTempTable(tableName, command, bufferManager, false); + } + } else { + table = contextStore.getOrCreateTempTable(tableName, command, bufferManager, true); + } + //convert to the actual table symbols (this is typically handled by the languagebridgefactory + ExpressionMappingVisitor emv = new ExpressionMappingVisitor(null) { + @Override + public Expression replaceExpression(Expression element) { + if (element instanceof ElementSymbol) { + ElementSymbol es = (ElementSymbol)element; + ((ElementSymbol) element).setName(tableName + ElementSymbol.SEPARATOR + es.getShortName()); + } + return element; + } + }; + PostOrderNavigator.doVisit(query, emv); + return table.createTupleSource(command.getProjectedSymbols(), query.getCriteria(), query.getOrderBy()); + } + + public Object lookupCodeValue( + CommandContext context, + String codeTableName, + String returnElementName, + String keyElementName, + Object keyValue) + throws BlockedException, TeiidComponentException, TeiidProcessingException { + + return this.processorDataManager.lookupCodeValue(context, codeTableName, returnElementName, keyElementName, keyValue); + } + + @Override + public void clearCodeTables() { + this.processorDataManager.clearCodeTables(); + } + +} Property changes on: trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableStore.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableStore.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableStore.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -23,7 +23,6 @@ package org.teiid.query.tempdata; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -32,52 +31,92 @@ import org.teiid.api.exception.query.QueryProcessingException; import org.teiid.common.buffer.BufferManager; -import org.teiid.common.buffer.TupleSource; import org.teiid.core.TeiidComponentException; -import org.teiid.core.TeiidProcessingException; -import org.teiid.query.eval.Evaluator; import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.metadata.TempMetadataID; import org.teiid.query.metadata.TempMetadataStore; -import org.teiid.query.processor.CollectionTupleSource; import org.teiid.query.resolver.command.TempTableResolver; import org.teiid.query.sql.lang.Command; import org.teiid.query.sql.lang.Create; -import org.teiid.query.sql.lang.Criteria; -import org.teiid.query.sql.lang.Delete; -import org.teiid.query.sql.lang.Drop; import org.teiid.query.sql.lang.Insert; -import org.teiid.query.sql.lang.ProcedureContainer; -import org.teiid.query.sql.lang.Query; -import org.teiid.query.sql.lang.Update; -import org.teiid.query.sql.navigator.PostOrderNavigator; import org.teiid.query.sql.symbol.ElementSymbol; -import org.teiid.query.sql.symbol.Expression; import org.teiid.query.sql.symbol.GroupSymbol; -import org.teiid.query.sql.visitor.ExpressionMappingVisitor; -import org.teiid.query.util.CommandContext; -/** - * @since 5.5 - */ public class TempTableStore { - - private BufferManager buffer; + + public enum MatState { + NOT_LOADED, + LOADING, + FAILED_LOAD, + LOADED + } + + public static class MatTableInfo { + private long updateTime = -1; + private MatState state = MatState.NOT_LOADED; + + synchronized boolean shouldLoad() throws TeiidComponentException { + for (;;) { + switch (state) { + case NOT_LOADED: + updateTime = System.currentTimeMillis(); + case FAILED_LOAD: + state = MatState.LOADING; + return true; + case LOADING: + try { + wait(); + } catch (InterruptedException e) { + throw new TeiidComponentException(e); + } + continue; + case LOADED: + return false; + } + } + } + + public synchronized void setState(MatState state) { + this.state = state; + this.updateTime = System.currentTimeMillis(); + notifyAll(); + } + + public long getUpdateTime() { + return updateTime; + } + + } + + private ConcurrentHashMap<String, MatTableInfo> matTables = new ConcurrentHashMap<String, MatTableInfo>(); + private TempMetadataStore tempMetadataStore = new TempMetadataStore(new ConcurrentHashMap<String, TempMetadataID>()); private Map<String, TempTable> groupToTupleSourceID = new ConcurrentHashMap<String, TempTable>(); private String sessionID; private TempTableStore parentTempTableStore; - public TempTableStore(BufferManager buffer, String sessionID) { - this.buffer = buffer; + public TempTableStore(String sessionID) { this.sessionID = sessionID; } + public MatTableInfo getMatTableInfo(final String tableName) { + MatTableInfo newInfo = new MatTableInfo(); + MatTableInfo info = matTables.putIfAbsent(tableName, newInfo); + if (info == null) { + info = newInfo; + } + return info; + } + public void setParentTempTableStore(TempTableStore parentTempTableStore) { this.parentTempTableStore = parentTempTableStore; } + + public boolean hasTempTable(String tempTableName) { + return groupToTupleSourceID.containsKey(tempTableName); + } - void addTempTable(String tempTableName, Create create) { + TempTable addTempTable(String tempTableName, Create create, BufferManager buffer) { List<ElementSymbol> columns = create.getColumns(); //add metadata @@ -92,6 +131,7 @@ } TempTable tempTable = new TempTable(id, buffer, columns, create.getPrimaryKey().size(), sessionID); groupToTupleSourceID.put(tempTableName, tempTable); + return tempTable; } public void removeTempTableByName(String tempTableName) { @@ -105,89 +145,14 @@ public TempMetadataStore getMetadataStore() { return tempMetadataStore; } - - public TupleSource registerRequest(CommandContext context, Command command) throws TeiidComponentException, TeiidProcessingException{ - if (command instanceof Query) { - Query query = (Query)command; - GroupSymbol group = query.getFrom().getGroups().get(0); - if (!group.isTempGroupSymbol()) { - return null; - } - final String tableName = group.getNonCorrelationName().toUpperCase(); - TempTable table = getOrCreateTempTable(tableName, command, true); - //convert to the actual table symbols (this is typically handled by the languagebridgefactory - ExpressionMappingVisitor emv = new ExpressionMappingVisitor(null) { - @Override - public Expression replaceExpression(Expression element) { - if (element instanceof ElementSymbol) { - ElementSymbol es = (ElementSymbol)element; - ((ElementSymbol) element).setName(tableName + ElementSymbol.SEPARATOR + es.getShortName()); - } - return element; - } - }; - PostOrderNavigator.doVisit(query, emv); - return table.createTupleSource(command.getProjectedSymbols(), query.getCriteria(), query.getOrderBy()); - } - if (command instanceof ProcedureContainer) { - GroupSymbol group = ((ProcedureContainer)command).getGroup(); - if (!group.isTempGroupSymbol()) { - return null; - } - final String groupKey = group.getNonCorrelationName().toUpperCase(); - final TempTable table = getOrCreateTempTable(groupKey, command, false); - if (command instanceof Insert) { - Insert insert = (Insert)command; - TupleSource ts = insert.getTupleSource(); - if (ts == null) { - List<Object> values = new ArrayList<Object>(insert.getValues().size()); - for (Expression expr : (List<Expression>)insert.getValues()) { - values.add(Evaluator.evaluate(expr)); - } - ts = new CollectionTupleSource(Arrays.asList(values).iterator()); - } - return table.insert(ts, insert.getVariables()); - } - if (command instanceof Update) { - final Update update = (Update)command; - final Criteria crit = update.getCriteria(); - return table.update(crit, update.getChangeList()); - } - if (command instanceof Delete) { - final Delete delete = (Delete)command; - final Criteria crit = delete.getCriteria(); - if (crit == null) { - //because we are non-transactional, just use a truncate - int rows = table.truncate(); - return CollectionTupleSource.createUpdateCountTupleSource(rows); - } - return table.delete(crit); - } - } - if (command instanceof Create) { - Create create = (Create)command; - String tempTableName = create.getTable().getCanonicalName(); - if(tempMetadataStore.getTempGroupID(tempTableName) != null) { - throw new QueryProcessingException(QueryExecPlugin.Util.getString("TempTableStore.table_exist_error", tempTableName));//$NON-NLS-1$ - } - addTempTable(tempTableName, create); - return CollectionTupleSource.createUpdateCountTupleSource(0); - } - if (command instanceof Drop) { - String tempTableName = ((Drop)command).getTable().getCanonicalName(); - removeTempTableByName(tempTableName); - return CollectionTupleSource.createUpdateCountTupleSource(0); - } - return null; - } - + public void removeTempTables() { for (String name : groupToTupleSourceID.keySet()) { removeTempTableByName(name); } } - private TempTable getOrCreateTempTable(String tempTableID, Command command, boolean delegate) throws QueryProcessingException{ + TempTable getOrCreateTempTable(String tempTableID, Command command, BufferManager buffer, boolean delegate) throws QueryProcessingException{ TempTable tsID = groupToTupleSourceID.get(tempTableID); if(tsID != null) { return tsID; @@ -213,8 +178,7 @@ Create create = new Create(); create.setTable(new GroupSymbol(tempTableID)); create.setColumns(columns); - addTempTable(tempTableID, create); - return groupToTupleSourceID.get(tempTableID); + return addTempTable(tempTableID, create, buffer); } public Set<String> getAllTempTables() { Modified: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -30,7 +30,6 @@ import org.junit.Ignore; import org.junit.Test; import org.teiid.client.plan.Annotation; -import org.teiid.common.buffer.BufferManagerFactory; import org.teiid.query.analysis.AnalysisRecord; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.optimizer.TestOptimizer; @@ -39,7 +38,7 @@ import org.teiid.query.processor.relational.RelationalPlan; import org.teiid.query.sql.lang.Command; import org.teiid.query.tempdata.TempTableStore; -import org.teiid.query.unittest.FakeMetadataFactory; +import org.teiid.query.unittest.RealMetadataFactory; import org.teiid.query.util.CommandContext; @SuppressWarnings("nls") @@ -48,7 +47,7 @@ @Test public void testMaterializedTransformation() throws Exception { String userSql = "SELECT MATVIEW.E1 FROM MATVIEW"; //$NON-NLS-1$ - QueryMetadataInterface metadata = FakeMetadataFactory.exampleMaterializedView(); + QueryMetadataInterface metadata = RealMetadataFactory.exampleMaterializedView(); AnalysisRecord analysis = new AnalysisRecord(true, DEBUG); Command command = helpGetCommand(userSql, metadata, null); @@ -65,7 +64,7 @@ @Test public void testMaterializedTransformationLoading() throws Exception { String userSql = "SELECT MATVIEW.E1 INTO MatTable.MatStage FROM MATVIEW"; //$NON-NLS-1$ - QueryMetadataInterface metadata = FakeMetadataFactory.exampleMaterializedView(); + QueryMetadataInterface metadata = RealMetadataFactory.exampleMaterializedView(); AnalysisRecord analysis = new AnalysisRecord(true, DEBUG); Command command = helpGetCommand(userSql, metadata, null); @@ -81,7 +80,7 @@ @Test public void testMaterializedTransformationNoCache() throws Exception { String userSql = "SELECT MATVIEW.E1 FROM MATVIEW OPTION NOCACHE MatView.MatView"; //$NON-NLS-1$ - QueryMetadataInterface metadata = FakeMetadataFactory.exampleMaterializedView(); + QueryMetadataInterface metadata = RealMetadataFactory.exampleMaterializedView(); AnalysisRecord analysis = new AnalysisRecord(true, DEBUG); Command command = helpGetCommand(userSql, metadata, null); @@ -98,7 +97,7 @@ @Test public void testMaterializedTransformationNoCache2() throws Exception { String userSql = "SELECT MATVIEW.E1 FROM MATVIEW OPTION NOCACHE"; //$NON-NLS-1$ - QueryMetadataInterface metadata = FakeMetadataFactory.exampleMaterializedView(); + QueryMetadataInterface metadata = RealMetadataFactory.exampleMaterializedView(); AnalysisRecord analysis = new AnalysisRecord(true, DEBUG); Command command = helpGetCommand(userSql, metadata, null); @@ -114,7 +113,7 @@ @Test public void testNoCacheInTransformation() throws Exception { String userSql = "SELECT VGROUP.E1 FROM VGROUP"; //$NON-NLS-1$ - QueryMetadataInterface metadata = FakeMetadataFactory.exampleMaterializedView(); + QueryMetadataInterface metadata = RealMetadataFactory.exampleMaterializedView(); AnalysisRecord analysis = new AnalysisRecord(true, DEBUG); Command command = helpGetCommand(userSql, metadata, null); @@ -125,7 +124,7 @@ @Test public void testTableNoCacheDoesntCascade() throws Exception { String userSql = "SELECT MATVIEW1.E1 FROM MATVIEW1 option nocache matview.matview1"; //$NON-NLS-1$ - QueryMetadataInterface metadata = FakeMetadataFactory.exampleMaterializedView(); + QueryMetadataInterface metadata = RealMetadataFactory.exampleMaterializedView(); AnalysisRecord analysis = new AnalysisRecord(true, DEBUG); Command command = helpGetCommand(userSql, metadata, null); @@ -136,7 +135,7 @@ @Test public void testNoCacheCascade() throws Exception { String userSql = "SELECT MATVIEW1.E1 FROM MATVIEW1 option nocache"; //$NON-NLS-1$ - QueryMetadataInterface metadata = FakeMetadataFactory.exampleMaterializedView(); + QueryMetadataInterface metadata = RealMetadataFactory.exampleMaterializedView(); AnalysisRecord analysis = new AnalysisRecord(true, DEBUG); Command command = helpGetCommand(userSql, metadata, null); @@ -147,12 +146,12 @@ @Test public void testCacheHint() throws Exception { String userSql = "SELECT * from vgroup2"; //$NON-NLS-1$ - QueryMetadataInterface metadata = FakeMetadataFactory.exampleMaterializedView(); + QueryMetadataInterface metadata = RealMetadataFactory.exampleMaterializedView(); AnalysisRecord analysis = new AnalysisRecord(true, DEBUG); Command command = helpGetCommand(userSql, metadata, null); CommandContext cc = new CommandContext(); - cc.setGlobalTableStore(new TempTableStore(BufferManagerFactory.getStandaloneBufferManager(), "SYSTEM")); + cc.setGlobalTableStore(new TempTableStore("SYSTEM")); ProcessorPlan plan = TestOptimizer.getPlan(command, metadata, getGenericFinder(), analysis, true, cc); TestOptimizer.checkAtomicQueries(new String[] {"SELECT #MAT_MatView.VGroup2.X FROM #MAT_MatView.VGroup2"}, plan); Collection<Annotation> annotations = analysis.getAnnotations(); @@ -164,12 +163,12 @@ @Test public void testCacheHintWithPk() throws Exception { String userSql = "SELECT * from vgroup3 where x = 'foo'"; //$NON-NLS-1$ - QueryMetadataInterface metadata = FakeMetadataFactory.exampleMaterializedView(); + QueryMetadataInterface metadata = RealMetadataFactory.exampleMaterializedView(); AnalysisRecord analysis = new AnalysisRecord(true, DEBUG); Command command = helpGetCommand(userSql, metadata, null); CommandContext cc = new CommandContext(); - cc.setGlobalTableStore(new TempTableStore(BufferManagerFactory.getStandaloneBufferManager(), "SYSTEM")); + cc.setGlobalTableStore(new TempTableStore("SYSTEM")); RelationalPlan plan = (RelationalPlan)TestOptimizer.getPlan(command, metadata, getGenericFinder(), analysis, true, cc); assertEquals(1f, plan.getRootNode().getEstimateNodeCardinality()); TestOptimizer.checkAtomicQueries(new String[] {"SELECT #MAT_MatView.VGroup3.X, #MAT_MatView.VGroup3.y FROM #MAT_MatView.VGroup3 WHERE #MAT_MatView.VGroup3.X = 'foo'"}, plan); Modified: trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -55,7 +55,7 @@ private boolean blockOnce; // Collect all commands run against this class - private Collection commandHistory = new ArrayList(); // Commands + private List commandHistory = new ArrayList(); // Commands public HardcodedDataManager() { this(true); @@ -92,7 +92,7 @@ * @return * @since 4.2 */ - public Collection getCommandHistory() { + public List getCommandHistory() { return this.commandHistory; } Added: trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java (rev 0) +++ trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -0,0 +1,80 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright (C) 2009 Red Hat, Inc. + * Licensed to Red Hat, Inc. under one or more contributor + * license agreements. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * 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.junit.Assert.*; + +import java.util.Arrays; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.teiid.common.buffer.BufferManagerFactory; +import org.teiid.dqp.internal.process.SimpleQueryProcessorFactory; +import org.teiid.query.metadata.TempMetadataAdapter; +import org.teiid.query.optimizer.capabilities.CapabilitiesFinder; +import org.teiid.query.optimizer.capabilities.DefaultCapabilitiesFinder; +import org.teiid.query.tempdata.TempTableDataManager; +import org.teiid.query.tempdata.TempTableStore; +import org.teiid.query.unittest.RealMetadataFactory; +import org.teiid.query.util.CommandContext; + +@SuppressWarnings("nls") +public class TestMaterialization { + + private TempMetadataAdapter metadata; + private TempTableDataManager dataManager; + private TempTableStore tempStore; + private TempTableStore globalStore; + private ProcessorPlan previousPlan; + private HardcodedDataManager hdm; + + @Before public void setUp() { + tempStore = new TempTableStore("1"); //$NON-NLS-1$ + globalStore = new TempTableStore("SYSTEM"); + metadata = new TempMetadataAdapter(RealMetadataFactory.exampleMaterializedView(), tempStore.getMetadataStore()); + hdm = new HardcodedDataManager(); + hdm.addData("SELECT matsrc.x FROM matsrc", new List[] {Arrays.asList((String)null), Arrays.asList("one"), Arrays.asList("two"), Arrays.asList("three")}); + dataManager = new TempTableDataManager(hdm, BufferManagerFactory.getStandaloneBufferManager()); + } + + private void execute(String sql, List[] expectedResults) throws Exception { + CommandContext cc = TestProcessor.createCommandContext(); + cc.setTempTableStore(tempStore); + cc.setGlobalTableStore(globalStore); + cc.setMetadata(metadata); + CapabilitiesFinder finder = new DefaultCapabilitiesFinder(); + previousPlan = TestProcessor.helpGetPlan(TestProcessor.helpParse(sql), metadata, finder, cc); + cc.setQueryProcessorFactory(new SimpleQueryProcessorFactory(BufferManagerFactory.getStandaloneBufferManager(), dataManager, finder, null, metadata)); + TestProcessor.doProcess(previousPlan, dataManager, expectedResults, cc); + } + + @Test public void testPopulate() throws Exception { + execute("SELECT * from vgroup3 where x = 'one'", new List[] {Arrays.asList("one", "zne")}); + assertEquals(1, hdm.getCommandHistory().size()); + execute("SELECT * from vgroup3 where x is null", new List[] {Arrays.asList(null, null)}); + assertEquals(1, hdm.getCommandHistory().size()); + } + +} Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -85,6 +85,7 @@ import org.teiid.query.sql.symbol.Reference; import org.teiid.query.sql.util.VariableContext; import org.teiid.query.sql.visitor.ReferenceCollectorVisitor; +import org.teiid.query.tempdata.TempTableDataManager; import org.teiid.query.tempdata.TempTableStore; import org.teiid.query.unittest.FakeMetadataFacade; import org.teiid.query.unittest.FakeMetadataFactory; @@ -228,10 +229,10 @@ bufferMgr.setConnectorBatchSize(context.getProcessorBatchSize()); context.getNextRand(0); if (context.getTempTableStore() == null) { - context.setTempTableStore(new TempTableStore(bufferMgr, context.getConnectionID())); + context.setTempTableStore(new TempTableStore(context.getConnectionID())); } if (!(dataManager instanceof TempTableDataManager)) { - dataManager = new TempTableDataManager(dataManager); + dataManager = new TempTableDataManager(dataManager, bufferMgr); } TupleBuffer id = null; try { Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -33,6 +33,7 @@ import org.teiid.common.buffer.BufferManagerFactory; import org.teiid.core.TeiidProcessingException; import org.teiid.query.metadata.TempMetadataAdapter; +import org.teiid.query.tempdata.TempTableDataManager; import org.teiid.query.tempdata.TempTableStore; import org.teiid.query.unittest.FakeMetadataFactory; import org.teiid.query.util.CommandContext; @@ -55,11 +56,11 @@ } @Before public void setUp() { - tempStore = new TempTableStore(BufferManagerFactory.getStandaloneBufferManager(), "1"); //$NON-NLS-1$ + tempStore = new TempTableStore("1"); //$NON-NLS-1$ metadata = new TempMetadataAdapter(FakeMetadataFactory.example1Cached(), tempStore.getMetadataStore()); FakeDataManager fdm = new FakeDataManager(); TestProcessor.sampleData1(fdm); - dataManager = new TempTableDataManager(fdm); + dataManager = new TempTableDataManager(fdm, BufferManagerFactory.getStandaloneBufferManager()); } @Test public void testInsertWithQueryExpression() throws Exception { Modified: trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFacade.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFacade.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFacade.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -776,9 +776,11 @@ } @Override - public boolean isPrimaryKey(Object metadataID) { - ArgCheck.isInstanceOf(FakeMetadataObject.class, metadataID); - FakeMetadataObject object = (FakeMetadataObject) metadataID; - return object.getProperty(FakeMetadataObject.Props.KEY_TYPE) == FakeMetadataObject.TYPE_PRIMARY_KEY; + public Object getPrimaryKey(Object metadataID) { + Collection keys = getTypeOfKeysInGroup(metadataID, FakeMetadataObject.TYPE_PRIMARY_KEY); + if (!keys.isEmpty()) { + return keys.iterator().next(); + } + return null; } } Modified: trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFactory.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFactory.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFactory.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -2066,110 +2066,7 @@ // Create the facade from the store return new FakeMetadataFacade(store); } - - /** - * Metadata for Materialized Views - * @return - * @since 4.2 - */ - public static QueryMetadataInterface exampleMaterializedView() { - FakeMetadataObject virtModel = createVirtualModel("MatView"); //$NON-NLS-1$ - FakeMetadataObject physModel = createPhysicalModel("MatTable"); //$NON-NLS-1$ - FakeMetadataObject physModel_virtSrc = createPhysicalModel("MatSrc"); //$NON-NLS-1$ - - FakeMetadataObject physGroup = createPhysicalGroup("MatTable.MatTable", physModel); //$NON-NLS-1$ - List physElements = createElements(physGroup, - new String[] { "e1" }, //$NON-NLS-1$ - new String[] { DataTypeManager.DefaultDataTypes.STRING}); - - FakeMetadataObject physGroupStage = createPhysicalGroup("MatTable.MatStage", physModel); //$NON-NLS-1$ - List physStageElements = createElements(physGroupStage, - new String[] { "e1" }, //$NON-NLS-1$ - new String[] { DataTypeManager.DefaultDataTypes.STRING}); - - FakeMetadataObject physGroup1 = createPhysicalGroup("MatTable.MatTable1", physModel); //$NON-NLS-1$ - List physElements1 = createElements(physGroup, - new String[] { "e1" }, //$NON-NLS-1$ - new String[] { DataTypeManager.DefaultDataTypes.STRING}); - - FakeMetadataObject physGroupStage1 = createPhysicalGroup("MatTable.MatStage1", physModel); //$NON-NLS-1$ - List physStageElements1 = createElements(physGroupStage, - new String[] { "e1" }, //$NON-NLS-1$ - new String[] { DataTypeManager.DefaultDataTypes.STRING}); - - FakeMetadataObject physGroup_virtSrc = createPhysicalGroup("MatSrc.MatSrc", physModel_virtSrc); //$NON-NLS-1$ - List physElements_virtSrc = createElements(physGroup_virtSrc, - new String[] { "X" }, //$NON-NLS-1$ - new String[] { DataTypeManager.DefaultDataTypes.STRING}); - - QueryNode virtTrans = new QueryNode("MatView.MatView", "SELECT x as e1 FROM MatSrc.MatSrc"); //$NON-NLS-1$ //$NON-NLS-2$ - FakeMetadataObject virtGroup = createVirtualGroup("MatView.MatView", virtModel, virtTrans); //$NON-NLS-1$ - List virtElements = createElements(virtGroup, - new String[] { "e1" }, //$NON-NLS-1$ - new String[] { DataTypeManager.DefaultDataTypes.STRING}); - - virtGroup.putProperty(FakeMetadataObject.Props.MAT_GROUP, physGroup); - virtGroup.putProperty(FakeMetadataObject.Props.MAT_STAGE, physGroupStage); - - //add one virtual group that uses the materialized group in transformation with NOCACHE option - QueryNode vTrans = new QueryNode("MatView.VGroup", "SELECT e1 FROM MatView.MatView option NOCACHE"); //$NON-NLS-1$ //$NON-NLS-2$ - FakeMetadataObject vGroup = createVirtualGroup("MatView.VGroup", virtModel, vTrans); //$NON-NLS-1$ - List vElements = createElements(vGroup, - new String[] { "e1" }, //$NON-NLS-1$ - new String[] { DataTypeManager.DefaultDataTypes.STRING}); - - QueryNode virtTrans1 = new QueryNode("MatView.MatView1", "SELECT e1 FROM MatView.MatView where e1 = 1"); //$NON-NLS-1$ //$NON-NLS-2$ - FakeMetadataObject virtGroup1 = createVirtualGroup("MatView.MatView1", virtModel, virtTrans1); //$NON-NLS-1$ - List virtElements1 = createElements(virtGroup1, - new String[] { "e1" }, //$NON-NLS-1$ - new String[] { DataTypeManager.DefaultDataTypes.STRING}); - - virtGroup1.putProperty(FakeMetadataObject.Props.MAT_GROUP, physGroup1); - virtGroup1.putProperty(FakeMetadataObject.Props.MAT_STAGE, physGroupStage1); - - QueryNode vTrans2 = new QueryNode("MatView.VGroup2", "/* cache */ SELECT x FROM matsrc"); //$NON-NLS-1$ //$NON-NLS-2$ - FakeMetadataObject vGroup2 = createVirtualGroup("MatView.VGroup2", virtModel, vTrans2); //$NON-NLS-1$ - List vElements2 = createElements(vGroup2, - new String[] { "x" }, //$NON-NLS-1$ - new String[] { DataTypeManager.DefaultDataTypes.STRING}); - - QueryNode vTrans3 = new QueryNode("MatView.VGroup3", "/* cache */ SELECT x, 'z' || substring(x, 2) as y FROM matsrc"); //$NON-NLS-1$ //$NON-NLS-2$ - FakeMetadataObject vGroup3 = createVirtualGroup("MatView.VGroup3", virtModel, vTrans3); //$NON-NLS-1$ - List vElements3 = createElements(vGroup3, - new String[] { "x", "y" }, //$NON-NLS-1$ - new String[] { DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING}); - FakeMetadataObject vGroup3pk = createKey("pk", vGroup3, vElements3.subList(0, 1)); - - - FakeMetadataStore store = new FakeMetadataStore(); - store.addObject(virtModel); - store.addObject(physModel); - store.addObject(physModel_virtSrc); - store.addObject(physGroup); - store.addObjects(physElements); - store.addObject(physGroupStage); - store.addObjects(physStageElements); - store.addObject(physGroup1); - store.addObjects(physElements1); - store.addObject(physGroupStage1); - store.addObjects(physStageElements1); - store.addObject(physGroup_virtSrc); - store.addObjects(physElements_virtSrc); - store.addObject(virtGroup); - store.addObjects(virtElements); - store.addObject(vGroup); - store.addObjects(vElements); - store.addObject(virtGroup1); - store.addObjects(virtElements1); - store.addObject(vGroup2); - store.addObjects(vElements2); - store.addObject(vGroup3); - store.addObjects(vElements3); - store.addObject(vGroup3pk); - return new FakeMetadataFacade(store); - } - public static VDBMetaData examplePrivatePhysicalModelVDB() { VDBMetaData vdb = new VDBMetaData(); vdb.setName("example1"); Modified: trunk/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.List; import org.teiid.adminapi.impl.VDBMetaData; @@ -32,6 +31,7 @@ import org.teiid.core.types.DataTypeManager; import org.teiid.metadata.Column; import org.teiid.metadata.ColumnSet; +import org.teiid.metadata.KeyRecord; import org.teiid.metadata.MetadataStore; import org.teiid.metadata.Procedure; import org.teiid.metadata.ProcedureParameter; @@ -42,10 +42,11 @@ import org.teiid.metadata.ProcedureParameter.Type; import org.teiid.query.mapping.relational.QueryNode; import org.teiid.query.metadata.CompositeMetadataStore; +import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.metadata.TransformationMetadata; import org.teiid.query.sql.lang.SPParameter; - +@SuppressWarnings("nls") public class RealMetadataFactory { private static TransformationMetadata CACHED_BQT = exampleBQT(); @@ -157,111 +158,213 @@ List<Column> bqt1SmallAe = createElements(bqt1SmallA, elemNames, elemTypes); bqt1SmallAe.get(1).setNativeType("char"); //$NON-NLS-1$ - List bqt1SmallBe = createElements(bqt1SmallB, elemNames, elemTypes); - List bqt1MediumAe = createElements(bqt1MediumA, elemNames, elemTypes); - List bqt1MediumBe = createElements(bqt1MediumB, elemNames, elemTypes); - List bqt2SmallAe = createElements(bqt2SmallA, elemNames, elemTypes); - List bqt2SmallBe = createElements(bqt2SmallB, elemNames, elemTypes); - List bqt2MediumAe = createElements(bqt2MediumA, elemNames, elemTypes); - List bqt2MediumBe = createElements(bqt2MediumB, elemNames, elemTypes); - List bqt3SmallAe = createElements(bqt3SmallA, elemNames, elemTypes); - List bqt3SmallBe = createElements(bqt3SmallB, elemNames, elemTypes); - List bqt3MediumAe = createElements(bqt3MediumA, elemNames, elemTypes); - List bqt3MediumBe = createElements(bqt3MediumB, elemNames, elemTypes); - List lobTable_elem = createElements(lobTable, new String[] {"ClobValue"}, new String[] {DataTypeManager.DefaultDataTypes.CLOB}); //$NON-NLS-1$ + createElements(bqt1SmallB, elemNames, elemTypes); + createElements(bqt1MediumA, elemNames, elemTypes); + createElements(bqt1MediumB, elemNames, elemTypes); + createElements(bqt2SmallA, elemNames, elemTypes); + createElements(bqt2SmallB, elemNames, elemTypes); + createElements(bqt2MediumA, elemNames, elemTypes); + createElements(bqt2MediumB, elemNames, elemTypes); + createElements(bqt3SmallA, elemNames, elemTypes); + createElements(bqt3SmallB, elemNames, elemTypes); + createElements(bqt3MediumA, elemNames, elemTypes); + createElements(bqt3MediumB, elemNames, elemTypes); + createElements(lobTable, new String[] {"ClobValue"}, new String[] {DataTypeManager.DefaultDataTypes.CLOB}); //$NON-NLS-1$ // Create virtual elements - List vqtg1e = createElements(vqtg1, elemNames, elemTypes); - List vqtg2e = createElements(vqtg2, new String[] {"a12345"}, new String[] {DataTypeManager.DefaultDataTypes.STRING}); //$NON-NLS-1$ - List vqtg15355e = createElements(vqtg15355, new String[] {"StringKey", "BigIntegerValue"}, new String[] {DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.BIG_INTEGER}); //$NON-NLS-1$ //$NON-NLS-2$ - List vqtg15355ae = createElements(vqtg15355a, new String[] {"StringKey", "StringNum", "BigIntegerValue"}, new String[] {DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.BIG_INTEGER}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - List vqtg15355be = createElements(vqtg15355b, new String[] {"IntKey", "BigIntegerValue"}, new String[] {DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.BIG_INTEGER}); //$NON-NLS-1$ //$NON-NLS-2$ - List vqtg2589e = createElements(vqtg2589, elemNames, elemTypes); - List vqtg2589ae = createElements(vqtg2589a, elemNames, elemTypes); - List vqtg2589be = createElements(vqtg2589b, elemNames, elemTypes); - List vqtg2589ce = createElements(vqtg2589c, elemNames, elemTypes); - List vqtg2589de = createElements(vqtg2589d, elemNames, elemTypes); - List vqtg2589fe = createElements(vqtg2589f, elemNames, elemTypes); - List vqtg2589ge = createElements(vqtg2589g, elemNames, elemTypes); - List vqtg2589he = createElements(vqtg2589h, elemNames, elemTypes); - List vqtg2589ie = createElements(vqtg2589i, elemNames, elemTypes); - List bvqtg1e = createElements(bvqtg1, elemNames, elemTypes); - List bvqt2g1e = createElements(bvqt2g1, elemNames, elemTypes); + createElements(vqtg1, elemNames, elemTypes); + createElements(vqtg2, new String[] {"a12345"}, new String[] {DataTypeManager.DefaultDataTypes.STRING}); //$NON-NLS-1$ + createElements(vqtg15355, new String[] {"StringKey", "BigIntegerValue"}, new String[] {DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.BIG_INTEGER}); //$NON-NLS-1$ //$NON-NLS-2$ + createElements(vqtg15355a, new String[] {"StringKey", "StringNum", "BigIntegerValue"}, new String[] {DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.BIG_INTEGER}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + createElements(vqtg15355b, new String[] {"IntKey", "BigIntegerValue"}, new String[] {DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.BIG_INTEGER}); //$NON-NLS-1$ //$NON-NLS-2$ + createElements(vqtg2589, elemNames, elemTypes); + createElements(vqtg2589a, elemNames, elemTypes); + createElements(vqtg2589b, elemNames, elemTypes); + createElements(vqtg2589c, elemNames, elemTypes); + createElements(vqtg2589d, elemNames, elemTypes); + createElements(vqtg2589f, elemNames, elemTypes); + createElements(vqtg2589g, elemNames, elemTypes); + createElements(vqtg2589h, elemNames, elemTypes); + createElements(vqtg2589i, elemNames, elemTypes); + createElements(bvqtg1, elemNames, elemTypes); + createElements(bvqt2g1, elemNames, elemTypes); // Add stored procedure Schema pm1 = createPhysicalModel("pm1", metadataStore); //$NON-NLS-1$ - ProcedureParameter rs1p1 = createParameter("intkey", 2, ParameterInfo.IN, DataTypeManager.DefaultDataTypes.INTEGER, null); //$NON-NLS-1$ - ColumnSet<Procedure> rs1 = createResultSet("rs1", pm1, new String[] { "IntKey", "StringKey" }, new String[] { DataTypeManager.DefaultDataTypes.INTEGER, DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ProcedureParameter rs1p1 = createParameter("intkey", ParameterInfo.IN, DataTypeManager.DefaultDataTypes.INTEGER); //$NON-NLS-1$ + ColumnSet<Procedure> rs1 = createResultSet("rs1", new String[] { "IntKey", "StringKey" }, new String[] { DataTypeManager.DefaultDataTypes.INTEGER, DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ Procedure spTest5 = createStoredProcedure("spTest5", pm1, Arrays.asList(rs1p1), "spTest5"); //$NON-NLS-1$ //$NON-NLS-2$ spTest5.setResultSet(rs1); Schema pm2 = createPhysicalModel("pm2", metadataStore); //$NON-NLS-1$ - ProcedureParameter rs2p1 = createParameter("inkey", 2, ParameterInfo.IN, DataTypeManager.DefaultDataTypes.INTEGER, null); //$NON-NLS-1$ - ProcedureParameter rs2p2 = createParameter("outkey", 3, ParameterInfo.OUT, DataTypeManager.DefaultDataTypes.INTEGER, null); //$NON-NLS-1$ - ColumnSet<Procedure> rs2 = createResultSet("rs2", pm2, new String[] { "IntKey", "StringKey"}, new String[] { DataTypeManager.DefaultDataTypes.INTEGER , DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ProcedureParameter rs2p1 = createParameter("inkey", ParameterInfo.IN, DataTypeManager.DefaultDataTypes.INTEGER); //$NON-NLS-1$ + ProcedureParameter rs2p2 = createParameter("outkey", ParameterInfo.OUT, DataTypeManager.DefaultDataTypes.INTEGER); //$NON-NLS-1$ + ColumnSet<Procedure> rs2 = createResultSet("rs2", new String[] { "IntKey", "StringKey"}, new String[] { DataTypeManager.DefaultDataTypes.INTEGER , DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ Procedure spTest8 = createStoredProcedure("spTest8", pm2, Arrays.asList(rs2p1, rs2p2), "spTest8"); //$NON-NLS-1$ //$NON-NLS-2$ spTest8.setResultSet(rs2); - ProcedureParameter rs2p2a = createParameter("outkey", 3, ParameterInfo.OUT, DataTypeManager.DefaultDataTypes.INTEGER, null); //$NON-NLS-1$ - ColumnSet<Procedure> rs2a = createResultSet("rs2", pm2, new String[] { "IntKey", "StringKey"}, new String[] { DataTypeManager.DefaultDataTypes.INTEGER , DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ProcedureParameter rs2p2a = createParameter("outkey", ParameterInfo.OUT, DataTypeManager.DefaultDataTypes.INTEGER); //$NON-NLS-1$ + ColumnSet<Procedure> rs2a = createResultSet("rs2", new String[] { "IntKey", "StringKey"}, new String[] { DataTypeManager.DefaultDataTypes.INTEGER , DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ Procedure spTest8a = createStoredProcedure("spTest8a", pm2, Arrays.asList(rs2p2a), "spTest8a"); //$NON-NLS-1$ //$NON-NLS-2$ spTest8a.setResultSet(rs2a); Schema pm4 = createPhysicalModel("pm4", metadataStore); //$NON-NLS-1$ - ProcedureParameter rs4p1 = createParameter("inkey", 2, ParameterInfo.IN, DataTypeManager.DefaultDataTypes.INTEGER, null); //$NON-NLS-1$ - ProcedureParameter rs4p2 = createParameter("ret", 1, ParameterInfo.RETURN_VALUE, DataTypeManager.DefaultDataTypes.INTEGER, null); //$NON-NLS-1$ - Procedure spTest9 = createStoredProcedure("spTest9", pm4, Arrays.asList(rs4p1, rs4p2), "spTest9"); //$NON-NLS-1$ //$NON-NLS-2$ + ProcedureParameter rs4p1 = createParameter("inkey", ParameterInfo.IN, DataTypeManager.DefaultDataTypes.INTEGER); //$NON-NLS-1$ + ProcedureParameter rs4p2 = createParameter("ret", ParameterInfo.RETURN_VALUE, DataTypeManager.DefaultDataTypes.INTEGER); //$NON-NLS-1$ + createStoredProcedure("spTest9", pm4, Arrays.asList(rs4p1, rs4p2), "spTest9"); //$NON-NLS-1$ //$NON-NLS-2$ Schema pm3 = createPhysicalModel("pm3", metadataStore); //$NON-NLS-1$ - ProcedureParameter rs3p1 = createParameter("inkey", 2, ParameterInfo.IN, DataTypeManager.DefaultDataTypes.INTEGER, null); //$NON-NLS-1$ - ProcedureParameter rs3p2 = createParameter("outkey", 3, ParameterInfo.INOUT, DataTypeManager.DefaultDataTypes.INTEGER, null); //$NON-NLS-1$ - ColumnSet<Procedure> rs3 = createResultSet("rs3", pm3, new String[] { "IntKey", "StringKey"}, new String[] { DataTypeManager.DefaultDataTypes.INTEGER , DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ProcedureParameter rs3p1 = createParameter("inkey", ParameterInfo.IN, DataTypeManager.DefaultDataTypes.INTEGER); //$NON-NLS-1$ + ProcedureParameter rs3p2 = createParameter("outkey", ParameterInfo.INOUT, DataTypeManager.DefaultDataTypes.INTEGER); //$NON-NLS-1$ + ColumnSet<Procedure> rs3 = createResultSet("rs3", new String[] { "IntKey", "StringKey"}, new String[] { DataTypeManager.DefaultDataTypes.INTEGER , DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ Procedure spTest11 = createStoredProcedure("spTest11", pm3, Arrays.asList(rs3p1, rs3p2), "spTest11"); //$NON-NLS-1$ //$NON-NLS-2$ spTest11.setResultSet(rs3); //add virtual stored procedures Schema mmspTest1 = createVirtualModel("mmspTest1", metadataStore); //$NON-NLS-1$ - ColumnSet<Procedure> vsprs1 = createResultSet("mmspTest1.vsprs1", mmspTest1, new String[] { "StringKey" }, new String[] { DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ + ColumnSet<Procedure> vsprs1 = createResultSet("mmspTest1.vsprs1", new String[] { "StringKey" }, new String[] { DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ QueryNode vspqn1 = new QueryNode("vsp1", "CREATE VIRTUAL PROCEDURE BEGIN DECLARE integer x; LOOP ON (SELECT intkey FROM bqt1.smallA) AS intKeyCursor BEGIN x= intKeyCursor.intkey - 1; END SELECT stringkey FROM bqt1.smalla where intkey=x; END"); //$NON-NLS-1$ //$NON-NLS-2$ Procedure vsp1 = createVirtualProcedure("MMSP1", mmspTest1, null, vspqn1); //$NON-NLS-1$ vsp1.setResultSet(vsprs1); - ColumnSet<Procedure> vsprs2 = createResultSet("mmspTest1.vsprs1", mmspTest1, new String[] { "StringKey" }, new String[] { DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ + ColumnSet<Procedure> vsprs2 = createResultSet("mmspTest1.vsprs1", new String[] { "StringKey" }, new String[] { DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ QueryNode vspqn2 = new QueryNode("vsp2", "CREATE VIRTUAL PROCEDURE BEGIN DECLARE integer x; LOOP ON (SELECT intkey FROM bqt1.smallA) AS intKeyCursor1 BEGIN LOOP ON (SELECT intkey FROM bqt1.smallB) AS intKeyCursor2 BEGIN x= intKeyCursor1.intkey - intKeyCursor2.intkey; END END SELECT stringkey FROM bqt1.smalla where intkey=x; END"); //$NON-NLS-1$ //$NON-NLS-2$ Procedure vsp2 = createVirtualProcedure("MMSP2", mmspTest1, null, vspqn2); //$NON-NLS-1$ vsp2.setResultSet(vsprs2); - ColumnSet<Procedure> vsprs3 = createResultSet("mmspTest1.vsprs1", mmspTest1, new String[] { "StringKey" }, new String[] { DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ + ColumnSet<Procedure> vsprs3 = createResultSet("mmspTest1.vsprs1", new String[] { "StringKey" }, new String[] { DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ QueryNode vspqn3 = new QueryNode("vsp3", "CREATE VIRTUAL PROCEDURE BEGIN DECLARE integer x; LOOP ON (SELECT intkey FROM bqt1.smallA) AS intKeyCursor BEGIN x= intKeyCursor.intkey - 1; if(x = 25) BEGIN BREAK; END ELSE BEGIN CONTINUE; END END SELECT stringkey FROM bqt1.smalla where intkey=x; END"); //$NON-NLS-1$ //$NON-NLS-2$ Procedure vsp3 = createVirtualProcedure("MMSP3", mmspTest1, null, vspqn3); //$NON-NLS-1$ vsp3.setResultSet(vsprs3); - ColumnSet<Procedure> vsprs4 = createResultSet("mmspTest1.vsprs1", mmspTest1, new String[] { "StringKey" }, new String[] { DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ + ColumnSet<Procedure> vsprs4 = createResultSet("mmspTest1.vsprs1", new String[] { "StringKey" }, new String[] { DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ QueryNode vspqn4 = new QueryNode("vsp4", "CREATE VIRTUAL PROCEDURE BEGIN DECLARE integer x; x=0; WHILE(x < 50) BEGIN x= x + 1; if(x = 25) BEGIN BREAK; END ELSE BEGIN CONTINUE; END END SELECT stringkey FROM bqt1.smalla where intkey=x; END"); //$NON-NLS-1$ //$NON-NLS-2$ Procedure vsp4 = createVirtualProcedure("MMSP4", mmspTest1, null, vspqn4); //$NON-NLS-1$ vsp4.setResultSet(vsprs4); - ColumnSet<Procedure> vsprs5 = createResultSet("mmspTest1.vsprs1", mmspTest1, new String[] { "StringKey" }, new String[] { DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ - ProcedureParameter vsp5p1 = createParameter("param1", 2, ParameterInfo.IN, DataTypeManager.DefaultDataTypes.STRING, null); //$NON-NLS-1$ + ColumnSet<Procedure> vsprs5 = createResultSet("mmspTest1.vsprs1", new String[] { "StringKey" }, new String[] { DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ + ProcedureParameter vsp5p1 = createParameter("param1", ParameterInfo.IN, DataTypeManager.DefaultDataTypes.STRING); //$NON-NLS-1$ QueryNode vspqn5 = new QueryNode("vsp5", "CREATE VIRTUAL PROCEDURE BEGIN SELECT 0; END"); //$NON-NLS-1$ //$NON-NLS-2$ Procedure vsp5 = createVirtualProcedure("MMSP5", mmspTest1, Arrays.asList(vsp5p1), vspqn5); //$NON-NLS-1$ vsp5.setResultSet(vsprs5); - ColumnSet<Procedure> vsprs6 = createResultSet("mmspTest1.vsprs1", mmspTest1, new String[] { "StringKey" }, new String[] { DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ - ProcedureParameter vsp6p1 = createParameter("p1", 2, ParameterInfo.IN, DataTypeManager.DefaultDataTypes.STRING, null); //$NON-NLS-1$ + ColumnSet<Procedure> vsprs6 = createResultSet("mmspTest1.vsprs1", new String[] { "StringKey" }, new String[] { DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ + ProcedureParameter vsp6p1 = createParameter("p1", ParameterInfo.IN, DataTypeManager.DefaultDataTypes.STRING); //$NON-NLS-1$ QueryNode vspqn6 = new QueryNode("vsp6", "CREATE VIRTUAL PROCEDURE BEGIN SELECT 1; END"); //$NON-NLS-1$ //$NON-NLS-2$ Procedure vsp6 = createVirtualProcedure("MMSP6", mmspTest1, Arrays.asList(vsp6p1), vspqn6); //$NON-NLS-1$ vsp6.setResultSet(vsprs6); - CompositeMetadataStore store = new CompositeMetadataStore(metadataStore); + return createTransformationMetadata(metadataStore, "bqt"); + } + + private static TransformationMetadata createTransformationMetadata( + MetadataStore metadataStore, String vdbName) { + CompositeMetadataStore store = new CompositeMetadataStore(metadataStore); VDBMetaData vdbMetaData = new VDBMetaData(); - vdbMetaData.setName("bqt"); //$NON-NLS-1$ + vdbMetaData.setName(vdbName); //$NON-NLS-1$ vdbMetaData.setVersion(1); for (Schema schema : metadataStore.getSchemas().values()) { vdbMetaData.addModel(FakeMetadataFactory.createModel(schema.getName(), schema.isPhysical())); } - return new TransformationMetadata(vdbMetaData, store, null, null); + return new TransformationMetadata(vdbMetaData, store, null, null); + } + + /** + * Metadata for Materialized Views + * @return + * @since 4.2 + */ + public static QueryMetadataInterface exampleMaterializedView() { + MetadataStore metadataStore = new MetadataStore(); + Schema virtModel = createVirtualModel("MatView", metadataStore); //$NON-NLS-1$ + Schema physModel = createPhysicalModel("MatTable", metadataStore); //$NON-NLS-1$ + Schema physModel_virtSrc = createPhysicalModel("MatSrc", metadataStore); //$NON-NLS-1$ + + Table physGroup = createPhysicalGroup("MatTable", physModel); //$NON-NLS-1$ + createElements(physGroup, + new String[] { "e1" }, //$NON-NLS-1$ + new String[] { DataTypeManager.DefaultDataTypes.STRING}); + + Table physGroupStage = createPhysicalGroup("MatStage", physModel); //$NON-NLS-1$ + createElements(physGroupStage, + new String[] { "e1" }, //$NON-NLS-1$ + new String[] { DataTypeManager.DefaultDataTypes.STRING}); + + Table physGroup1 = createPhysicalGroup("MatTable1", physModel); //$NON-NLS-1$ + createElements(physGroup1, + new String[] { "e1" }, //$NON-NLS-1$ + new String[] { DataTypeManager.DefaultDataTypes.STRING}); + + Table physGroupStage1 = createPhysicalGroup("MatStage1", physModel); //$NON-NLS-1$ + createElements(physGroupStage, + new String[] { "e1" }, //$NON-NLS-1$ + new String[] { DataTypeManager.DefaultDataTypes.STRING}); + + Table physGroup_virtSrc = createPhysicalGroup("MatSrc", physModel_virtSrc); //$NON-NLS-1$ + createElements(physGroup_virtSrc, + new String[] { "X" }, //$NON-NLS-1$ + new String[] { DataTypeManager.DefaultDataTypes.STRING}); + + QueryNode virtTrans = new QueryNode("MatView", "SELECT x as e1 FROM MatSrc.MatSrc"); //$NON-NLS-1$ //$NON-NLS-2$ + Table virtGroup = createVirtualGroup("MatView", virtModel, virtTrans); //$NON-NLS-1$ + createElements(virtGroup, + new String[] { "e1" }, //$NON-NLS-1$ + new String[] { DataTypeManager.DefaultDataTypes.STRING}); + + virtGroup.setMaterialized(true); + virtGroup.setMaterializedTable(physGroup); + virtGroup.setMaterializedStageTable(physGroupStage); + + //add one virtual group that uses the materialized group in transformation with NOCACHE option + QueryNode vTrans = new QueryNode("VGroup", "SELECT e1 FROM MatView.MatView option NOCACHE"); //$NON-NLS-1$ //$NON-NLS-2$ + Table vGroup = createVirtualGroup("VGroup", virtModel, vTrans); //$NON-NLS-1$ + createElements(vGroup, + new String[] { "e1" }, //$NON-NLS-1$ + new String[] { DataTypeManager.DefaultDataTypes.STRING}); + + QueryNode virtTrans1 = new QueryNode("MatView1", "SELECT e1 FROM MatView.MatView where e1 = 1"); //$NON-NLS-1$ //$NON-NLS-2$ + Table virtGroup1 = createVirtualGroup("MatView1", virtModel, virtTrans1); //$NON-NLS-1$ + createElements(virtGroup1, + new String[] { "e1" }, //$NON-NLS-1$ + new String[] { DataTypeManager.DefaultDataTypes.STRING}); + + virtGroup1.setMaterializedTable(physGroup1); + virtGroup1.setMaterializedStageTable(physGroupStage1); + + QueryNode vTrans2 = new QueryNode("VGroup2", "/* cache */ SELECT x FROM matsrc"); //$NON-NLS-1$ //$NON-NLS-2$ + Table vGroup2 = createVirtualGroup("VGroup2", virtModel, vTrans2); //$NON-NLS-1$ + createElements(vGroup2, + new String[] { "x" }, //$NON-NLS-1$ + new String[] { DataTypeManager.DefaultDataTypes.STRING}); + + QueryNode vTrans3 = new QueryNode("VGroup3", "/* cache */ SELECT x, 'z' || substring(x, 2) as y FROM matsrc"); //$NON-NLS-1$ //$NON-NLS-2$ + Table vGroup3 = createVirtualGroup("VGroup3", virtModel, vTrans3); //$NON-NLS-1$ + List<Column> vElements3 = createElements(vGroup3, + new String[] { "x", "y" }, //$NON-NLS-1$ + new String[] { DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING}); + + createKey("pk", vGroup3, vElements3.subList(0, 1)); + + return createTransformationMetadata(metadataStore, ""); } + + /** + * Create primary key. The name will be used as the Object metadataID. + * @param name String name of key + * @param group the group for the key + * @param elements the elements of the key (will be used as if they were + * metadata IDs) + * @return key metadata object + */ + public static KeyRecord createKey(String name, Table group, List<Column> elements) { + KeyRecord key = new KeyRecord(org.teiid.metadata.KeyRecord.Type.Primary); + key.setName(name); + for (Column column : elements) { + key.addColumn(column); + } + group.setPrimaryKey(key); + return key; + } /** * Create a physical model with default settings. @@ -316,23 +419,6 @@ } /** - * Create a temp group with default settings. - * @param name Name of virtual group, must match model name - * @param model Associated model - * @param plan Appropriate query plan definition object for the temp group - * @return FakeMetadataObject Metadata object for group - */ - public static FakeMetadataObject createTempGroup(String name, FakeMetadataObject model, Object plan) { - FakeMetadataObject obj = new FakeMetadataObject(name, FakeMetadataObject.GROUP); - obj.putProperty(FakeMetadataObject.Props.MODEL, model); - obj.putProperty(FakeMetadataObject.Props.IS_VIRTUAL, Boolean.FALSE); - obj.putProperty(FakeMetadataObject.Props.PLAN, plan); - obj.putProperty(FakeMetadataObject.Props.UPDATE, Boolean.FALSE); - obj.putProperty(FakeMetadataObject.Props.TEMP, Boolean.TRUE); - return obj; - } - - /** * Create a virtual group that allows updates with default settings. */ public static Table createUpdatableVirtualGroup(String name, Schema model, QueryNode plan) { @@ -389,96 +475,9 @@ } /** - * Create index. The name will be used as the Object metadataID. - * @param name String name of index - * @param group the group for the index - * @param elements the elements of the index (will be used as if they were - * metadata IDs) - * @return key metadata object - */ - public static FakeMetadataObject createIndex(String name, FakeMetadataObject group, List elements) { - FakeMetadataObject obj = new FakeMetadataObject(name, FakeMetadataObject.KEY); - obj.putProperty(FakeMetadataObject.Props.KEY_TYPE, FakeMetadataObject.TYPE_INDEX); - obj.putProperty(FakeMetadataObject.Props.KEY_ELEMENTS, elements); - Collection keys = (Collection)group.getProperty(FakeMetadataObject.Props.KEYS); - if (keys == null){ - keys = new ArrayList(); - group.putProperty(FakeMetadataObject.Props.KEYS, keys); - } - keys.add(obj); - return obj; - } - - /** - * Create primary key. The name will be used as the Object metadataID. - * @param name String name of key - * @param group the group for the key - * @param elements the elements of the key (will be used as if they were - * metadata IDs) - * @return key metadata object - */ - public static FakeMetadataObject createKey(String name, FakeMetadataObject group, List elements) { - FakeMetadataObject obj = new FakeMetadataObject(name, FakeMetadataObject.KEY); - obj.putProperty(FakeMetadataObject.Props.KEY_TYPE, FakeMetadataObject.TYPE_PRIMARY_KEY); - obj.putProperty(FakeMetadataObject.Props.KEY_ELEMENTS, elements); - Collection keys = (Collection)group.getProperty(FakeMetadataObject.Props.KEYS); - if (keys == null){ - keys = new ArrayList(); - group.putProperty(FakeMetadataObject.Props.KEYS, keys); - } - keys.add(obj); - return obj; - } - - /** - * Create foreign key. The name will be used as the Object metadataID. - * @param name String name of key - * @param group the group for the key - * @param elements the elements of the key (will be used as if they were - * @param primaryKey referenced by this foreign key - * metadata IDs) - * @return key metadata object - */ - public static FakeMetadataObject createForeignKey(String name, FakeMetadataObject group, List elements, FakeMetadataObject primaryKey) { - FakeMetadataObject obj = new FakeMetadataObject(name, FakeMetadataObject.KEY); - obj.putProperty(FakeMetadataObject.Props.KEY_TYPE, FakeMetadataObject.TYPE_FOREIGN_KEY); - obj.putProperty(FakeMetadataObject.Props.KEY_ELEMENTS, elements); - obj.putProperty(FakeMetadataObject.Props.REFERENCED_KEY, primaryKey); - Collection keys = (Collection)group.getProperty(FakeMetadataObject.Props.KEYS); - if (keys == null){ - keys = new ArrayList(); - group.putProperty(FakeMetadataObject.Props.KEYS, keys); - } - keys.add(obj); - return obj; - } - - /** - * Create access pattern (currently an access pattern is implemented as a type of key). The name will - * be used as the Object metadataID. - * @param name String name of key - * @param group the group for the access pattern - * @param elements the elements of the access pattern (will be used as if they were - * metadata IDs) - * @return Access pattern metadata object - */ - public static FakeMetadataObject createAccessPattern(String name, FakeMetadataObject group, List elements) { - FakeMetadataObject obj = new FakeMetadataObject(name, FakeMetadataObject.KEY); - obj.putProperty(FakeMetadataObject.Props.KEY_TYPE, FakeMetadataObject.TYPE_ACCESS_PATTERN); - obj.putProperty(FakeMetadataObject.Props.KEY_ELEMENTS, elements); - Collection keys = (Collection)group.getProperty(FakeMetadataObject.Props.KEYS); - if (keys == null){ - keys = new ArrayList(); - group.putProperty(FakeMetadataObject.Props.KEYS, keys); - } - keys.add(obj); - return obj; - } - - /** * Create stored procedure parameter. */ - public static ProcedureParameter createParameter(String name, int index, int direction, String type, Object rs) { + public static ProcedureParameter createParameter(String name, int direction, String type) { ProcedureParameter param = new ProcedureParameter(); param.setName(name); switch (direction) { @@ -542,7 +541,7 @@ /** * Create a result set. */ - public static ColumnSet<Procedure> createResultSet(String name, Object model, String[] colNames, String[] colTypes) { + public static ColumnSet<Procedure> createResultSet(String name, String[] colNames, String[] colTypes) { ColumnSet<Procedure> rs = new ColumnSet<Procedure>(); rs.setName(name); for(Column column : createElements(rs, colNames, colTypes)) { Modified: trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java 2010-08-03 02:06:18 UTC (rev 2399) +++ trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java 2010-08-03 04:32:09 UTC (rev 2400) @@ -35,6 +35,7 @@ import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.metadata.TransformationMetadata; import org.teiid.query.metadata.TransformationMetadata.Resource; +import org.teiid.query.tempdata.TempTableStore; import org.teiid.vdb.runtime.VDBKey; @@ -78,7 +79,9 @@ private void update(VDBMetaData vdbMetadata) { TransformationMetadata metadata = buildTransformationMetaData(vdbMetadata, getVisibilityMap(), getMetadataStores(), getUDF()); vdbMetadata.addAttchment(QueryMetadataInterface.class, metadata); - vdbMetadata.addAttchment(TransformationMetadata.class, metadata); + vdbMetadata.addAttchment(TransformationMetadata.class, metadata); + TempTableStore globalTables = new TempTableStore("SYSTEM"); //$NON-NLS-1$ + vdbMetadata.addAttchment(TempTableStore.class, globalTables); } private TransformationMetadata buildTransformationMetaData(VDBMetaData vdb, LinkedHashMap<String, Resource> visibilityMap, MetadataStoreGroup stores, UDFMetaData udf) {

14 years, 5 months

1
0
0 / 0

teiid SVN: r2399 - in trunk/connectors/translator-jdbc/src: main/java/org/teiid/translator/jdbc/sqlserver and 2 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-08-02 22:06:18 -0400 (Mon, 02 Aug 2010) New Revision: 2399 Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ConvertModifier.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sqlserver/SQLServerExecutionFactory.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseExecutionFactory.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseConvertModifier.java Log: TEIID-1181 fix for sybase complaining that bit is not nullable Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ConvertModifier.java =================================================================== --- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ConvertModifier.java 2010-08-02 19:12:20 UTC (rev 2398) +++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ConvertModifier.java 2010-08-03 02:06:18 UTC (rev 2399) @@ -86,6 +86,7 @@ private Map<List<Integer>, FunctionModifier> specificConverts = new HashMap<List<Integer>, FunctionModifier>(); private boolean booleanNumeric; private boolean wideningNumericImplicit; + private boolean booleanNullable = true; public void addTypeConversion(FunctionModifier convert, int ... targetType) { for (int i : targetType) { @@ -188,6 +189,9 @@ booleanValue = nested.getParameters().get(0); } } + if (!booleanNullable) { + return Arrays.asList("CASE WHEN ", booleanValue, " = 0 THEN 'false' ELSE 'true' END"); //$NON-NLS-1$ //$NON-NLS-2$ + } return Arrays.asList("CASE WHEN ", booleanValue, " = 0 THEN 'false' WHEN ", booleanValue, " IS NOT NULL THEN 'true' END"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } }); @@ -199,5 +203,9 @@ } }); } + + public void setBooleanNullable(boolean booleanNullable) { + this.booleanNullable = booleanNullable; + } } Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sqlserver/SQLServerExecutionFactory.java =================================================================== --- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sqlserver/SQLServerExecutionFactory.java 2010-08-02 19:12:20 UTC (rev 2398) +++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sqlserver/SQLServerExecutionFactory.java 2010-08-03 02:06:18 UTC (rev 2399) @@ -193,5 +193,10 @@ public boolean nullPlusNonNullIsNull() { return true; } + + @Override + public boolean booleanNullable() { + return true; + } } Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseExecutionFactory.java =================================================================== --- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseExecutionFactory.java 2010-08-02 19:12:20 UTC (rev 2398) +++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseExecutionFactory.java 2010-08-03 02:06:18 UTC (rev 2399) @@ -94,6 +94,7 @@ //add in type conversion ConvertModifier convertModifier = new ConvertModifier(); + convertModifier.setBooleanNullable(booleanNullable()); //boolean isn't treated as bit, since it doesn't support null //byte is treated as smallint, since tinyint is unsigned convertModifier.addTypeMapping("smallint", FunctionModifier.BYTE, FunctionModifier.SHORT); //$NON-NLS-1$ @@ -327,4 +328,8 @@ public boolean nullPlusNonNullIsNull() { return false; } + + public boolean booleanNullable() { + return false; + } } Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseConvertModifier.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseConvertModifier.java 2010-08-02 19:12:20 UTC (rev 2398) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseConvertModifier.java 2010-08-03 02:06:18 UTC (rev 2399) @@ -174,7 +174,7 @@ LANG_FACTORY.createLiteral("string", String.class)}, //$NON-NLS-1$ String.class); - helpGetString1(func, "CASE WHEN 1 = 0 THEN 'false' WHEN 1 IS NOT NULL THEN 'true' END"); //$NON-NLS-1$ + helpGetString1(func, "CASE WHEN 1 = 0 THEN 'false' ELSE 'true' END"); //$NON-NLS-1$ } @Test public void testTimestampToString() throws Exception { @@ -749,7 +749,7 @@ // Source = BOOLEAN @Test public void testBooleanToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), "string", "CASE WHEN 1 = 0 THEN 'false' WHEN 1 IS NOT NULL THEN 'true' END"); //$NON-NLS-1$ //$NON-NLS-2$ + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), "string", "CASE WHEN 1 = 0 THEN 'false' ELSE 'true' END"); //$NON-NLS-1$ //$NON-NLS-2$ } @Test public void testBooleanToByte() throws Exception {

14 years, 5 months

1
0
0 / 0

teiid SVN: r2398 - in trunk/runtime/src/main: resources/org/teiid/runtime and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2010-08-02 15:12:20 -0400 (Mon, 02 Aug 2010) New Revision: 2398 Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties Log: TEIID-1006: Load the dynamic VDB's metadata asynchronously using a separate thread than the deployer thread. The VDB will be marked inacive untill all the metadata loading is complete. Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-08-02 16:14:26 UTC (rev 2397) +++ trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-08-02 19:12:20 UTC (rev 2398) @@ -23,6 +23,8 @@ import java.io.File; import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.IdentityHashMap; import java.util.LinkedHashMap; import java.util.List; @@ -32,6 +34,7 @@ import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer; import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; +import org.jboss.util.threadpool.ThreadPool; import org.teiid.adminapi.Model; import org.teiid.adminapi.Translator; import org.teiid.adminapi.VDB; @@ -61,6 +64,7 @@ private TranslatorRepository translatorRepository; private ObjectSerializer serializer; private ContainerLifeCycleListener shutdownListener; + private ThreadPool threadPool; public VDBDeployer() { super(VDBMetaData.class); @@ -110,14 +114,8 @@ // if store is null and vdb dynamic vdb then try to get the metadata if (store == null && deployment.isDynamic()) { - MetadataStoreGroup dynamicStore = new MetadataStoreGroup(); - for (Model model:deployment.getModels()) { - if (model.getName().equals(CoreConstants.SYSTEM_MODEL) || model.getName().equals(CoreConstants.ODBC_MODEL)){ - continue; - } - dynamicStore.addStore(buildDynamicMetadataStore((VFSDeploymentUnit)unit, deployment, (ModelMetaData)model)); - } - store = dynamicStore; + store = new MetadataStoreGroup(); + buildDynamicMetadataStore((VFSDeploymentUnit)unit, deployment, store); } // allow empty vdbs for enabling the preview functionality @@ -217,6 +215,11 @@ LogManager.logInfo(LogConstants.CTX_RUNTIME, cm.getStausMessage()); } } + + // in the dynamic case the metadata may be still loading. + if (!model.getErrors().isEmpty()) { + valid = false; + } } return valid; } @@ -281,22 +284,55 @@ } } - private MetadataStore buildDynamicMetadataStore(VFSDeploymentUnit unit, VDBMetaData vdb, ModelMetaData model) throws DeploymentException{ - if (model.getSourceNames().isEmpty()) { - throw new DeploymentException(RuntimePlugin.Util.getString("fail_to_deploy", vdb.getName()+"-"+vdb.getVersion(), model.getName())); //$NON-NLS-1$ //$NON-NLS-2$ - } + private void buildDynamicMetadataStore(final VFSDeploymentUnit unit, final VDBMetaData vdb, final MetadataStoreGroup vdbStore) throws DeploymentException { - boolean cache = "cached".equalsIgnoreCase(vdb.getPropertyValue("UseConnectorMetadata")); //$NON-NLS-1$ //$NON-NLS-2$ - File cacheFile = null; - if (cache) { - cacheFile = buildCachedFileName(unit, vdb,model.getName()); - MetadataStore store = this.serializer.loadSafe(cacheFile, MetadataStore.class); - if (store != null) { - return store; + // make sure we are configured correctly first + for (Model model:vdb.getModels()) { + if (model.getName().equals(CoreConstants.SYSTEM_MODEL) || model.getName().equals(CoreConstants.ODBC_MODEL)){ + continue; } - } + + if (model.getSourceNames().isEmpty()) { + throw new DeploymentException(RuntimePlugin.Util.getString("fail_to_deploy", vdb.getName()+"-"+vdb.getVersion(), model.getName())); //$NON-NLS-1$ //$NON-NLS-2$ + } + } + + // check the cache files first; if not found load the metadata + for (Model m:vdb.getModels()) { + final ModelMetaData model = (ModelMetaData)m; + if (model.getName().equals(CoreConstants.SYSTEM_MODEL) || model.getName().equals(CoreConstants.ODBC_MODEL)){ + continue; + } + + final boolean cache = "cached".equalsIgnoreCase(vdb.getPropertyValue("UseConnectorMetadata")); //$NON-NLS-1$ //$NON-NLS-2$ + final File cacheFile = buildCachedFileName(unit, vdb, model.getName()); + boolean loaded = false; + if (cache) { + MetadataStore store = this.serializer.loadSafe(cacheFile, MetadataStore.class); + if (store != null) { + vdbStore.addStore(store); + loaded = true; + } + } + + if (!loaded) { + String msg = RuntimePlugin.Util.getString("model_metadata_loading", vdb.getName()+"-"+vdb.getVersion(), model.getName(), SimpleDateFormat.getInstance().format(new Date())); //$NON-NLS-1$ //$NON-NLS-2$ + model.addError(ModelMetaData.ValidationError.Severity.ERROR.toString(), msg); + LogManager.logInfo(LogConstants.CTX_RUNTIME, msg); + threadPool.run(new Runnable() { + @Override + public void run() { + loadMetadata(vdb, model, cache, cacheFile, vdbStore); + } + }); + } + } + } + + private void loadMetadata(VDBMetaData vdb, ModelMetaData model, boolean cache, File cacheFile, MetadataStoreGroup vdbStore) { + Exception exception = null; - Exception exception = null; + boolean loaded = false;; for (String sourceName: model.getSourceNames()) { ConnectorManager cm = this.connectorManagerRepository.getConnectorManager(sourceName); if (cm == null) { @@ -307,7 +343,10 @@ if (cache) { this.serializer.saveAttachment(cacheFile, store); } - return store; + vdbStore.addStore(store); + model.clearErrors(); + loaded = true; + break; } catch (TranslatorException e) { if (exception == null) { exception = e; @@ -318,8 +357,25 @@ } } } - throw new DeploymentException(RuntimePlugin.Util.getString("failed_to_retrive_metadata", vdb.getName()+"-"+vdb.getVersion(), model.getName()), exception); //$NON-NLS-1$ //$NON-NLS-2$ - } + + synchronized (this) { + if (!loaded) { + vdb.setStatus(VDB.Status.INCOMPLETE); + String msg = RuntimePlugin.Util.getString("failed_to_retrive_metadata", vdb.getName()+"-"+vdb.getVersion(), model.getName()); //$NON-NLS-1$ //$NON-NLS-2$ + model.addError(ModelMetaData.ValidationError.Severity.ERROR.toString(), msg); + if (exception != null) { + model.addError(ModelMetaData.ValidationError.Severity.ERROR.toString(), exception.getMessage()); + } + LogManager.logWarning(LogConstants.CTX_RUNTIME, msg); + } + else { + if (vdb.isValid()) { + vdb.setStatus(VDB.Status.ACTIVE); + LogManager.logInfo(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.getString("vdb_activated",vdb.getName(), vdb.getVersion())); //$NON-NLS-1$ + } + } + } + } private File buildCachedFileName(VFSDeploymentUnit unit, VDBMetaData vdb, String modelName) { return this.serializer.getAttachmentPath(unit, vdb.getName()+"_"+vdb.getVersion()+"_"+modelName); //$NON-NLS-1$ //$NON-NLS-2$ @@ -332,4 +388,8 @@ public void setContainerLifeCycleListener(ContainerLifeCycleListener listener) { shutdownListener = listener; } + + public void setThreadPool(ThreadPool pool) { + this.threadPool = pool; + } } Modified: trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties =================================================================== --- trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2010-08-02 16:14:26 UTC (rev 2397) +++ trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2010-08-02 19:12:20 UTC (rev 2398) @@ -285,8 +285,8 @@ vdb_deployed=VDB "{0}" deployed in {1} state. vdb_undeployed=VDB "{0}" undeployed. system_vdb_load_error=System.vdb needs to be loaded before any other VDBs. -fail_to_deploy="{0}" Can not be deployed because model "{1}" is not fully configured. -failed_to_retrive_metadata="{0}" Can not be deployed because model "{1}" can not retrieve metadata. +fail_to_deploy="{0}" Can not be active because model "{1}" is not fully configured. +failed_to_retrive_metadata="{0}" is now "incomplete", because model "{1}" can not retrieve metadata. Fix errors and re-deploy the VDB. invalid_metadata_file=Invalid metadata file found at {0}; delete this file and restart server. udf_model_not_found=User Defined Function (UDF) model "{0}" not found in the VDB duplicate_vdb=VDB with given name and version already exists! {0}.{1} @@ -312,4 +312,5 @@ bad_binding=Binding on a statement, that has not been prepared:{0} not_bound=No bound statement found with name {0} no_stmt_found=No prepared statement found with name {0} -error_closing_stmt=Error closing portal statement {0} \ No newline at end of file +error_closing_stmt=Error closing portal statement {0} +model_metadata_loading=VDB "{0}" - "{1}" model metadata is currently being loaded. Start Time: {2} \ No newline at end of file

14 years, 5 months

1
0
0 / 0

teiid SVN: r2397 - in trunk/engine/src: main/java/org/teiid/query/resolver/util and 5 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-08-02 12:14:26 -0400 (Mon, 02 Aug 2010) New Revision: 2397 Modified: trunk/engine/src/main/java/org/teiid/query/resolver/command/InsertResolver.java trunk/engine/src/main/java/org/teiid/query/resolver/command/UpdateResolver.java trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java trunk/engine/src/main/java/org/teiid/query/sql/lang/Insert.java trunk/engine/src/main/java/org/teiid/query/sql/lang/Update.java trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java trunk/engine/src/main/resources/org/teiid/query/i18n.properties trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java Log: TEIID-1180 ensuring that input becomes inputs in an update procedure Modified: trunk/engine/src/main/java/org/teiid/query/resolver/command/InsertResolver.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/resolver/command/InsertResolver.java 2010-08-02 15:33:33 UTC (rev 2396) +++ trunk/engine/src/main/java/org/teiid/query/resolver/command/InsertResolver.java 2010-08-02 16:14:26 UTC (rev 2397) @@ -258,11 +258,9 @@ String varName = varSymbol.getShortCanonicalName(); String changingKey = ProcedureReservedWords.CHANGING + ElementSymbol.SEPARATOR + varName; - String inputKey = ProcedureReservedWords.INPUT + ElementSymbol.SEPARATOR + varName; String inputsKey = ProcedureReservedWords.INPUTS + ElementSymbol.SEPARATOR + varName; result.put(changingKey, new Constant(Boolean.TRUE)); Object value = valIter.next(); - result.put(inputKey, value); result.put(inputsKey, value); } @@ -278,10 +276,8 @@ String varName = varSymbol.getShortCanonicalName(); String changingKey = ProcedureReservedWords.CHANGING + ElementSymbol.SEPARATOR + varName; - String inputKey = ProcedureReservedWords.INPUT + ElementSymbol.SEPARATOR + varName; String inputsKey = ProcedureReservedWords.INPUTS + ElementSymbol.SEPARATOR + varName; result.put(changingKey, new Constant(Boolean.FALSE)); - result.put(inputKey, value); result.put(inputsKey, value); } Modified: trunk/engine/src/main/java/org/teiid/query/resolver/command/UpdateResolver.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/resolver/command/UpdateResolver.java 2010-08-02 15:33:33 UTC (rev 2396) +++ trunk/engine/src/main/java/org/teiid/query/resolver/command/UpdateResolver.java 2010-08-02 16:14:26 UTC (rev 2397) @@ -102,10 +102,8 @@ String varName = leftSymbol.getShortCanonicalName(); String changingKey = ProcedureReservedWords.CHANGING + ElementSymbol.SEPARATOR + varName; - String inputKey = ProcedureReservedWords.INPUT + ElementSymbol.SEPARATOR + varName; String inputsKey = ProcedureReservedWords.INPUTS + ElementSymbol.SEPARATOR + varName; result.put(changingKey, new Constant(Boolean.TRUE)); - result.put(inputKey, entry.getValue()); result.put(inputsKey, entry.getValue()); updateVars.add(leftSymbol); } Modified: trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java 2010-08-02 15:33:33 UTC (rev 2396) +++ trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java 2010-08-02 16:14:26 UTC (rev 2397) @@ -35,6 +35,7 @@ import org.teiid.api.exception.query.QueryResolverException; import org.teiid.api.exception.query.UnresolvedSymbolDescription; import org.teiid.core.TeiidComponentException; +import org.teiid.core.TeiidRuntimeException; import org.teiid.core.types.DataTypeManager; import org.teiid.core.types.DataTypeManager.DefaultDataClasses; import org.teiid.query.QueryPlugin; @@ -208,18 +209,25 @@ //copy the match information ElementSymbol resolvedSymbol = match.element; + GroupSymbol resolvedGroup = match.group; + String oldName = elementSymbol.getOutputName(); if (isExternal //convert input to inputs && metadata.isScalarGroup(resolvedSymbol.getGroupSymbol().getMetadataID()) && ProcedureReservedWords.INPUT.equals(groupContext)) { resolvedSymbol = new ElementSymbol(ProcedureReservedWords.INPUTS + ElementSymbol.SEPARATOR + elementShortName); resolveElementSymbol(resolvedSymbol); - elementSymbol.setOutputName(resolvedSymbol.getOutputName()); + oldName = resolvedSymbol.getOutputName(); + resolvedGroup = new GroupSymbol(ProcedureReservedWords.INPUTS); + try { + ResolverUtil.resolveGroup(resolvedGroup, metadata); + } catch (QueryResolverException e) { + throw new TeiidRuntimeException(e); + } } elementSymbol.setIsExternalReference(isExternal); elementSymbol.setType(resolvedSymbol.getType()); elementSymbol.setMetadataID(resolvedSymbol.getMetadataID()); - elementSymbol.setGroupSymbol(match.group); - String oldName = elementSymbol.getOutputName(); + elementSymbol.setGroupSymbol(resolvedGroup); elementSymbol.setName(resolvedSymbol.getName()); elementSymbol.setOutputName(oldName); } Modified: trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2010-08-02 15:33:33 UTC (rev 2396) +++ trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2010-08-02 16:14:26 UTC (rev 2397) @@ -1895,7 +1895,7 @@ Expression value = (Expression)variables.get(es.getCanonicalName()); if (value == null) { - if ((grpName.equals(ProcedureReservedWords.INPUT) || grpName.equals(ProcedureReservedWords.INPUTS))) { + if (grpName.equals(ProcedureReservedWords.INPUTS)) { return new Constant(null, es.getType()); } if (grpName.equals(ProcedureReservedWords.CHANGING)) { @@ -2460,7 +2460,7 @@ Boolean result = null; for (ElementSymbol var : ElementCollectorVisitor.getElements(expr, false)) { String grpName = var.getGroupSymbol().getName(); - if (var.isExternalReference() && (grpName.equalsIgnoreCase(ProcedureReservedWords.INPUT) || grpName.equalsIgnoreCase(ProcedureReservedWords.INPUTS))) { + if (var.isExternalReference() && grpName.equalsIgnoreCase(ProcedureReservedWords.INPUTS)) { String changingKey = ProcedureReservedWords.CHANGING + ElementSymbol.SEPARATOR + var.getShortCanonicalName(); Modified: trunk/engine/src/main/java/org/teiid/query/sql/lang/Insert.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/sql/lang/Insert.java 2010-08-02 15:33:33 UTC (rev 2396) +++ trunk/engine/src/main/java/org/teiid/query/sql/lang/Insert.java 2010-08-02 16:14:26 UTC (rev 2397) @@ -39,7 +39,6 @@ import org.teiid.query.sql.symbol.Expression; import org.teiid.query.sql.symbol.GroupSymbol; import org.teiid.query.sql.symbol.SingleElementSymbol; -import org.teiid.query.sql.util.ValueIterator; /** @@ -242,8 +241,6 @@ for (int j = 0; j < iSize; j++) { ElementSymbol symbol = (ElementSymbol)((ElementSymbol)variables.get( j )).clone(); - symbol.setName(ProcedureReservedWords.INPUT + SingleElementSymbol.SEPARATOR + symbol.getShortCanonicalName()); - map.put(symbol, values.get( j ) ); symbol = (ElementSymbol)((ElementSymbol)variables.get( j )).clone(); symbol.setName(ProcedureReservedWords.INPUTS + SingleElementSymbol.SEPARATOR + symbol.getShortCanonicalName()); map.put(symbol, values.get( j ) ); Modified: trunk/engine/src/main/java/org/teiid/query/sql/lang/Update.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/sql/lang/Update.java 2010-08-02 15:33:33 UTC (rev 2396) +++ trunk/engine/src/main/java/org/teiid/query/sql/lang/Update.java 2010-08-02 16:14:26 UTC (rev 2397) @@ -266,8 +266,6 @@ for (Iterator iter = getChangeList().getClauses().iterator(); iter.hasNext();) { SetClause setClause = (SetClause)iter.next(); ElementSymbol symbol = (ElementSymbol)(setClause.getSymbol()).clone(); - symbol.setName(ProcedureReservedWords.INPUT + SingleElementSymbol.SEPARATOR + symbol.getShortCanonicalName()); - map.put( symbol, setClause.getValue() ); symbol = (ElementSymbol)(setClause.getSymbol()).clone(); symbol.setName(ProcedureReservedWords.INPUTS + SingleElementSymbol.SEPARATOR + symbol.getShortCanonicalName()); map.put( symbol, setClause.getValue() ); Modified: trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java 2010-08-02 15:33:33 UTC (rev 2396) +++ trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java 2010-08-02 16:14:26 UTC (rev 2397) @@ -365,9 +365,8 @@ String groupName = variable.getGroupSymbol().getCanonicalName(); - if(groupName.equals(ProcedureReservedWords.INPUT) || - groupName.equals(ProcedureReservedWords.CHANGING) || groupName.equals(ProcedureReservedWords.INPUTS)) { - handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VALIDATOR_0012, new Object[] {ProcedureReservedWords.INPUT, ProcedureReservedWords.INPUTS, ProcedureReservedWords.CHANGING}), obj); + if(groupName.equals(ProcedureReservedWords.CHANGING) || groupName.equals(ProcedureReservedWords.INPUTS)) { + handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VALIDATOR_0012, ProcedureReservedWords.INPUTS, ProcedureReservedWords.CHANGING), obj); } if(obj.hasCommand()) { Modified: trunk/engine/src/main/resources/org/teiid/query/i18n.properties =================================================================== --- trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2010-08-02 15:33:33 UTC (rev 2396) +++ trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2010-08-02 16:14:26 UTC (rev 2397) @@ -265,6 +265,7 @@ ERR.015.012.0009 = The query defining an updatable virtual group cannot have more than one group in its FROM clause {0} ERR.015.012.0010 = The query defining an updatable simple virtual group should select all the required elements in its FROM clause {0} ERR.015.012.0011 = There must be exactly one projected symbol in the subcommand of an IN clause. +ERR.015.012.0012 = An AssignmentStatement cannot change the value of a {0} or {1} variable. ERR.015.012.0013 = There must be exactly one projected symbol in the command of an AssignmentStatement. ERR.015.012.0014 = Variable used in the procedure''s AssignmentStatement does not match the type of value returned by the command. ERR.015.012.0016 = Variable {0} not assigned any value in this procedure. Modified: trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java 2010-08-02 15:33:33 UTC (rev 2396) +++ trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java 2010-08-02 16:14:26 UTC (rev 2397) @@ -66,6 +66,7 @@ import org.teiid.query.sql.lang.From; import org.teiid.query.sql.lang.Insert; import org.teiid.query.sql.lang.OrderBy; +import org.teiid.query.sql.lang.ProcedureContainer; import org.teiid.query.sql.lang.Query; import org.teiid.query.sql.lang.SPParameter; import org.teiid.query.sql.lang.Select; @@ -2220,6 +2221,24 @@ assertNotNull("Input parameter does not have group", inElement.getGroupSymbol()); //$NON-NLS-1$ } + @Test public void testInputToInputsConversion() throws Exception { + String procedure = "CREATE PROCEDURE "; //$NON-NLS-1$ + procedure = procedure + "BEGIN\n"; //$NON-NLS-1$ + procedure = procedure + "DECLARE integer var1;\n"; //$NON-NLS-1$ + procedure = procedure + "ROWS_UPDATED = Select pm1.g1.e2 from pm1.g1 where e2=INPUTS.e2;\n"; //$NON-NLS-1$ + procedure = procedure + "END\n"; //$NON-NLS-1$ + + String userUpdateStr = "UPDATE vm1.g1 SET e2=40"; //$NON-NLS-1$ + + FakeMetadataFacade metadata = FakeMetadataFactory.exampleUpdateProc(FakeMetadataObject.Props.UPDATE_PROCEDURE, procedure); + + ProcedureContainer userCommand = (ProcedureContainer)QueryParser.getQueryParser().parseCommand(userUpdateStr); + QueryResolver.resolveCommand(userCommand, metadata); + + Command command = QueryResolver.expandCommand(userCommand, metadata, AnalysisRecord.createNonRecordingRecord()); + assertEquals("CREATE PROCEDURE\nBEGIN\nDECLARE integer var1;\nROWS_UPDATED = SELECT pm1.g1.e2 FROM pm1.g1 WHERE e2 = INPUTS.e2;\nEND", command.toString()); + } + @Test public void testDefect16894_resolverException_1() { helpResolve("SELECT * FROM (SELECT * FROM Pm1.g1 AS Y) AS X"); //$NON-NLS-1$ } @@ -2232,28 +2251,11 @@ String sql = "select e1 as x ORDER BY x"; //$NON-NLS-1$ helpResolveException(sql); } - -// Not support XML query as subquery -// @Test public void testDefect17743() { -// CompareCriteria expected = new CompareCriteria(); -// ElementSymbol es = new ElementSymbol("node1"); //$NON-NLS-1$ -// GroupSymbol gs = new GroupSymbol("doc1"); //$NON-NLS-1$ -// es.setGroupSymbol(gs); -// expected.setLeftExpression(es); -// expected.setOperator(CompareCriteria.EQ); -// ScalarSubquery subquery = new ScalarSubquery(helpResolve("select node1 from xmltest.doc1")); //$NON-NLS-1$ -// expected.setRightExpression(subquery); //$NON-NLS-1$ -// Query query = (Query) helpResolve("select * from xmltest.doc1 where node1 = (select node1 from xmltest.doc1)"); //$NON-NLS-1$ -// Criteria actual = query.getCriteria(); -// assertEquals("Did not match expected criteria", expected, actual); //$NON-NLS-1$ -// } - @Test public void testValidFullElementNotInQueryGroups() { helpResolveException("select pm1.g1.e1 FROM pm1.g1 g"); //$NON-NLS-1$ } - @Test public void testUnionInSubquery() throws Exception { String sql = "SELECT StringKey FROM (SELECT BQT2.SmallB.StringKey FROM BQT2.SmallB union SELECT convert(BQT2.SmallB.FloatNum, string) FROM BQT2.SmallB) x"; //$NON-NLS-1$ Command command = QueryParser.getQueryParser().parseCommand(sql);

14 years, 5 months

1
0
0 / 0

Teiid - Continuous Build - Build # 1236 - Failure!

by jboss-qa-internal＠redhat.com

Teiid - Continuous Build - Build # 1236 - Failure: Check console output at http://hudson.qa.jboss.com/hudson/job/Teiid%20-%20Continuous%20Build/1236/ to view the results.

14 years, 5 months

1
1
0 / 0

teiid SVN: r2396 - in trunk: console/src/main/resources/META-INF and 19 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-08-02 11:33:33 -0400 (Mon, 02 Aug 2010) New Revision: 2396 Added: trunk/api/src/main/java/org/teiid/CommandContext.java Modified: trunk/console/src/main/resources/META-INF/rhq-plugin.xml trunk/documentation/developer-guide/src/main/docbook/en-US/content/udf.xml trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPConfiguration.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/NewCalculateCostUtil.java trunk/engine/src/main/java/org/teiid/query/processor/TempTableDataManager.java trunk/engine/src/main/java/org/teiid/query/processor/proc/ContinueInstruction.java trunk/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java trunk/engine/src/main/java/org/teiid/query/processor/relational/RelationalNode.java trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLPlan.java trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedStatement.java trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestRequest.java trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/TestMultiSourcePlanToProcessConverter.java trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java trunk/engine/src/test/java/org/teiid/query/processor/eval/TestExpressionEvaluator.java trunk/engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java trunk/engine/src/test/java/org/teiid/query/processor/relational/TestRelationalNodeStatistics.java trunk/engine/src/test/java/org/teiid/query/processor/xml/TestXMLProcessor.java trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFacade.java trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFactory.java trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/BaseQueryTest.java Log: TEIID-1179 TEIID-168 adding a command context interface, removing the process debug flag, and cleaning up how the temp table datamanager works. Added: trunk/api/src/main/java/org/teiid/CommandContext.java =================================================================== --- trunk/api/src/main/java/org/teiid/CommandContext.java (rev 0) +++ trunk/api/src/main/java/org/teiid/CommandContext.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -0,0 +1,52 @@ +/* + * 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; + +import java.util.Properties; +import java.util.TimeZone; + +/** + * Context information for the currently executing command. + * Can be used as an argument to UDFs. + */ +public interface CommandContext { + + String getUserName(); + + String getVdbName(); + + int getVdbVersion(); + + String getConnectionID(); + + Properties getEnvironmentProperties(); + + double getNextRand(); + + double getNextRand(long seed); + + int getProcessorBatchSize(); + + TimeZone getServerTimeZone(); + +} Property changes on: trunk/api/src/main/java/org/teiid/CommandContext.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/console/src/main/resources/META-INF/rhq-plugin.xml =================================================================== --- trunk/console/src/main/resources/META-INF/rhq-plugin.xml 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/console/src/main/resources/META-INF/rhq-plugin.xml 2010-08-02 15:33:33 UTC (rev 2396) @@ -285,9 +285,6 @@ displayName="Time Slice In Milliseconds" description="Query processor time slice, in milliseconds. (default 2000)" required="false" readOnly="false" /> - <c:simple-property name="processDebugAllowed" - displayName="Process Debug Allowed" description="True if process debug allowed" - required="false" readOnly="false" /> <c:simple-property name="lobChunkSizeInKB" displayName="Lob Chunk Size In KB" description="The max lob chunk size in KB transferred each time when processing blobs, clobs(100KB default)" Modified: trunk/documentation/developer-guide/src/main/docbook/en-US/content/udf.xml =================================================================== --- trunk/documentation/developer-guide/src/main/docbook/en-US/content/udf.xml 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/documentation/developer-guide/src/main/docbook/en-US/content/udf.xml 2010-08-02 15:33:33 UTC (rev 2396) @@ -46,8 +46,7 @@ <para> <emphasis>Input Parameters</emphasis> - defines a type specific signature list. All arguments are - considered - required. + considered required. </para> </listitem> <listitem> @@ -163,7 +162,7 @@ </listitem> <listitem> <para> - Number of input arguments must match the function metadata defined + Number of input arguments and types must match the function metadata defined in section <link linkend="define_udf">Install user-defined functions</link> </para> @@ -177,6 +176,9 @@ </para> </listitem> </itemizedlist> + <para>You may optionally add an additional <code>org.teiid.CommandContext</code> argument as the first parameter. + The <code>CommandContext</code> interface provides access to information about the current command, such as the executing user, the vdb, the session id, etc. + This <code>CommandContext</code> parameter does not need to be delared in the function metadata.</para> <example> <title>Sample code</title> <programlisting><![CDATA[package org.something; Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPConfiguration.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPConfiguration.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPConfiguration.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -43,7 +43,6 @@ private int maxThreads = DEFAULT_MAX_PROCESS_WORKERS; private int timeSliceInMilli = DEFAULT_PROCESSOR_TIMESLICE; - private boolean processDebugAllowed; private int maxRowsFetchSize = DEFAULT_FETCH_SIZE; private int lobChunkSizeInKB = 100; private int preparedPlanCacheMaxCount = SessionAwareCache.DEFAULT_MAX_SIZE_TOTAL; @@ -85,15 +84,6 @@ this.timeSliceInMilli = timeSliceInMilli; } - @ManagementProperty(description="Process debug allowed") - public boolean isProcessDebugAllowed() { - return processDebugAllowed; - } - - public void setProcessDebugAllowed(boolean processDebugAllowed) { - this.processDebugAllowed = processDebugAllowed; - } - @ManagementProperty(description="Maximum allowed fetch size, set via JDBC. User requested value ignored above this value. (default 20480)") public int getMaxRowsFetchSize() { return maxRowsFetchSize; Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -194,7 +194,6 @@ // Query worker pool for processing plans private int processorTimeslice = DQPConfiguration.DEFAULT_PROCESSOR_TIMESLICE; - private boolean processorDebugAllowed; private int maxSourceRows = DQPConfiguration.DEFAULT_MAX_SOURCE_ROWS; private boolean exceptionOnMaxSourceRows = true; @@ -333,9 +332,9 @@ } ClientState state = this.getClientState(workContext.getSessionId(), true); request.initialize(requestMsg, bufferManager, - dataTierMgr, transactionService, processorDebugAllowed, - state.sessionTables, workContext, - connectorManagerRepository, this.useEntitlements); + dataTierMgr, transactionService, state.sessionTables, + workContext, connectorManagerRepository, + this.useEntitlements); ResultsFuture<ResultsMessage> resultsFuture = new ResultsFuture<ResultsMessage>(); RequestWorkItem workItem = new RequestWorkItem(this, requestMsg, request, resultsFuture.getResultsReceiver(), requestID, workContext); @@ -640,7 +639,6 @@ public void start(DQPConfiguration config) { this.processorTimeslice = config.getTimeSliceInMilli(); this.maxFetchSize = config.getMaxRowsFetchSize(); - this.processorDebugAllowed = config.isProcessDebugAllowed(); this.maxCodeTableRecords = config.getCodeTablesMaxRowsPerTable(); this.maxCodeTables = config.getCodeTablesMaxCount(); this.maxCodeRecords = config.getCodeTablesMaxRows(); @@ -659,9 +657,6 @@ //prepared plan cache prepPlanCache = new SessionAwareCache<PreparedPlan>(config.getPreparedPlanCacheMaxCount(), this.cacheFactory, Cache.Type.PREPAREDPLAN); - // Processor debug flag - LogManager.logInfo(LogConstants.CTX_DQP, DQPPlugin.Util.getString("DQPCore.Processor_debug_allowed_{0}", this.processorDebugAllowed)); //$NON-NLS-1$ - //get buffer manager this.bufferManager = bufferService.getBufferManager(); Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -108,7 +108,6 @@ private TransactionService transactionService; private TempTableStore tempTableStore; protected IDGenerator idGenerator = new IDGenerator(); - private boolean procDebugAllowed = false; DQPWorkContext workContext; RequestID requestId; @@ -137,7 +136,6 @@ BufferManager bufferManager, ProcessorDataManager processorDataManager, TransactionService transactionService, - boolean procDebugAllowed, TempTableStore tempTableStore, DQPWorkContext workContext, ConnectorManagerRepository repo, @@ -149,7 +147,6 @@ this.bufferManager = bufferManager; this.processorDataManager = processorDataManager; this.transactionService = transactionService; - this.procDebugAllowed = procDebugAllowed; this.tempTableStore = tempTableStore; idGenerator.setDefaultFactory(new IntegerIDFactory()); this.workContext = workContext; @@ -243,7 +240,6 @@ workContext.getVdbName(), workContext.getVdbVersion(), props, - useProcDebug(), this.requestMsg.getShowPlan() != ShowPlan.OFF); this.context.setProcessorBatchSize(bufferManager.getProcessorBatchSize()); this.context.setConnectorBatchSize(bufferManager.getConnectorBatchSize()); @@ -366,16 +362,9 @@ } this.transactionContext = tc; - this.processor = new QueryProcessor(processPlan, context, bufferManager, new TempTableDataManager(processorDataManager, tempTableStore)); + this.processor = new QueryProcessor(processPlan, context, bufferManager, new TempTableDataManager(processorDataManager)); } - private boolean useProcDebug() { - if(this.procDebugAllowed) { - return requestMsg.getShowPlan() == ShowPlan.DEBUG; - } - return false; - } - /** * state side effects: * creates the analysis record Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -231,7 +231,7 @@ * @param groups List of groups (Strings) to be made dependent * @param plan The canonical plan */ - private void distributeDependentHints(Collection<String> groups, PlanNode plan, QueryMetadataInterface metadata, NodeConstants.Info hintProperty) + private void distributeDependentHints(Collection<String> groups, PlanNode plan, NodeConstants.Info hintProperty) throws QueryMetadataException, TeiidComponentException { if(groups == null || groups.isEmpty()) { @@ -406,10 +406,10 @@ // Distribute make dependent hints as necessary if (cmd.getOption() != null) { if(cmd.getOption().getDependentGroups() != null) { - distributeDependentHints(cmd.getOption().getDependentGroups(), result, metadata, NodeConstants.Info.MAKE_DEP); + distributeDependentHints(cmd.getOption().getDependentGroups(), result, NodeConstants.Info.MAKE_DEP); } if (cmd.getOption().getNotDependentGroups() != null) { - distributeDependentHints(cmd.getOption().getNotDependentGroups(), result, metadata, NodeConstants.Info.MAKE_NOT_DEP); + distributeDependentHints(cmd.getOption().getNotDependentGroups(), result, NodeConstants.Info.MAKE_NOT_DEP); } } this.option = savedOption; @@ -966,6 +966,7 @@ int pos = metadata.getPosition(coldId) - 1; primaryKey.add(id.getElements().get(pos)); } + id.setPrimaryKey(primaryKey); break; } } @@ -976,15 +977,16 @@ } } if (noCache) { + recordMaterializationTableAnnotation(virtualGroup, analysisRecord, matTableName, "SimpleQueryResolver.materialized_table_not_used"); //$NON-NLS-1$ //TODO: update the table return result; } -/* QueryMetadataInterface qmi = new TempMetadataAdapter(metadata, context.getGlobalTableStore().getMetadataStore()); + QueryMetadataInterface qmi = new TempMetadataAdapter(metadata, context.getGlobalTableStore().getMetadataStore()); QueryNode qn = new QueryNode(virtualGroup.getName(), "select * from " + matTableName); //$NON-NLS-1$ Query query = (Query)getCommand(virtualGroup, qn, "matview", qmi); //$NON-NLS-1$ query.getFrom().getGroups().get(0).setGlobalTable(true); - return query;*/ - return result; + recordMaterializationTableAnnotation(virtualGroup, analysisRecord, matTableName, "SimpleQueryResolver.Query_was_redirected_to_Mat_table"); //$NON-NLS-1$ + return query; } public static boolean isNoCacheGroup(QueryMetadataInterface metadata, Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/NewCalculateCostUtil.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/NewCalculateCostUtil.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/NewCalculateCostUtil.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -782,26 +782,25 @@ } // Sort elements into groups - Map groupMap = new HashMap(); + Map<GroupSymbol, List<Object>> groupMap = new HashMap<GroupSymbol, List<Object>>(); for (SingleElementSymbol ses : allElements) { if (!(ses instanceof ElementSymbol)) { continue; } ElementSymbol element = (ElementSymbol)ses; GroupSymbol group = element.getGroupSymbol(); - List elements = (List) groupMap.get(group); + List<Object> elements = groupMap.get(group); if(elements == null) { - elements = new ArrayList(); + elements = new ArrayList<Object>(); groupMap.put(group, elements); } elements.add(element.getMetadataID()); } // Walk through each group - Iterator groupIter = groupMap.keySet().iterator(); - while(groupIter.hasNext()) { - GroupSymbol group = (GroupSymbol) groupIter.next(); - List elements = (List) groupMap.get(group); + for (Map.Entry<GroupSymbol, List<Object>> entry : groupMap.entrySet()) { + GroupSymbol group = entry.getKey(); + List<Object> elements = entry.getValue(); // Look up keys Collection keys = metadata.getUniqueKeysInGroup(group.getMetadataID()); Modified: trunk/engine/src/main/java/org/teiid/query/processor/TempTableDataManager.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/TempTableDataManager.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/main/java/org/teiid/query/processor/TempTableDataManager.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -37,7 +37,6 @@ public class TempTableDataManager implements ProcessorDataManager { private ProcessorDataManager processorDataManager; - private TempTableStore tempTableStore; /** * Constructor takes the "real" ProcessorDataManager that this object will be a proxy to, @@ -45,9 +44,8 @@ * a temp group will this proxy do it's thing. * @param processorDataManager the real ProcessorDataManager that this object is a proxy to */ - public TempTableDataManager(ProcessorDataManager processorDataManager, TempTableStore tempTableStore){ + public TempTableDataManager(ProcessorDataManager processorDataManager){ this.processorDataManager = processorDataManager; - this.tempTableStore = tempTableStore; } public TupleSource registerRequest( @@ -57,6 +55,7 @@ String connectorBindingId, int nodeID) throws TeiidComponentException, TeiidProcessingException { + TempTableStore tempTableStore = context.getTempTableStore(); if(tempTableStore != null) { TupleSource result = tempTableStore.registerRequest(context, command); if (result != null) { Modified: trunk/engine/src/main/java/org/teiid/query/processor/proc/ContinueInstruction.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/proc/ContinueInstruction.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/main/java/org/teiid/query/processor/proc/ContinueInstruction.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -24,13 +24,9 @@ */ package org.teiid.query.processor.proc; -import java.util.*; - import org.teiid.client.plan.PlanNode; import org.teiid.core.TeiidComponentException; -import org.teiid.query.processor.program.*; - /** * <p>This {@link ProgramInstruction} continue with the next loop when processed</p>. */ Modified: trunk/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -54,7 +54,6 @@ import org.teiid.query.processor.ProcessorDataManager; import org.teiid.query.processor.ProcessorPlan; import org.teiid.query.processor.QueryProcessor; -import org.teiid.query.processor.TempTableDataManager; import org.teiid.query.processor.relational.SubqueryAwareEvaluator; import org.teiid.query.sql.ProcedureReservedWords; import org.teiid.query.sql.lang.Criteria; @@ -140,7 +139,7 @@ public void initialize(CommandContext context, ProcessorDataManager dataMgr, BufferManager bufferMgr) { this.bufferMgr = bufferMgr; this.batchSize = bufferMgr.getProcessorBatchSize(); - setContext(context); + setContext(context.clone()); this.dataMgr = dataMgr; this.parentDataMrg = dataMgr; if (evaluator == null) { @@ -203,7 +202,7 @@ } } tempTableStore = new TempTableStore(bufferMgr, getContext().getConnectionID()); - this.dataMgr = new TempTableDataManager(dataMgr, tempTableStore); + getContext().setTempTableStore(tempTableStore); } this.evaluatedParams = true; } Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/RelationalNode.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/relational/RelationalNode.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/main/java/org/teiid/query/processor/relational/RelationalNode.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -251,7 +251,7 @@ * @since 4.2 */ public final TupleBatch nextBatch() throws BlockedException, TeiidComponentException, TeiidProcessingException { - boolean recordStats = this.context != null && (this.context.getCollectNodeStatistics() || this.context.getProcessDebug()); + boolean recordStats = this.context != null && this.context.getCollectNodeStatistics(); try { while (true) { @@ -392,7 +392,7 @@ * @param batch Batch being sent */ private void recordBatch(TupleBatch batch) { - if (!this.context.getProcessDebug() || !LogManager.isMessageToBeRecorded(org.teiid.logging.LogConstants.CTX_DQP, MessageLevel.DETAIL)) { + if (!LogManager.isMessageToBeRecorded(org.teiid.logging.LogConstants.CTX_DQP, MessageLevel.TRACE)) { return; } // Print summary Modified: trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLPlan.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLPlan.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLPlan.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -110,10 +110,12 @@ * @see ProcessorPlan#initialize(ProcessorDataManager, Object) */ public void initialize(CommandContext context, ProcessorDataManager dataMgr, BufferManager bufferMgr) { - setContext(context); + context = context.clone(); + setContext(context); TempTableStore tempTableStore = new TempTableStore(bufferMgr, context.getConnectionID()); tempTableStore.setParentTempTableStore(context.getTempTableStore()); - this.dataMgr = new TempTableDataManager(dataMgr, tempTableStore); + context.setTempTableStore(tempTableStore); + this.dataMgr = dataMgr; this.bufferMgr = bufferMgr; this.env.initialize(context, this.dataMgr, this.bufferMgr); } Modified: trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -50,7 +50,7 @@ * a means to pass context-specific information between users of the query processor * framework. */ -public class CommandContext implements Cloneable { +public class CommandContext implements Cloneable, org.teiid.CommandContext { private static class GlobalState { /** Uniquely identify the command being processed */ @@ -73,9 +73,6 @@ private Properties environmentProperties; - /** Indicate whether data should be dumped for debugging purposes while processing the query */ - private boolean processDebug; - /** Indicate whether statistics should be collected for relational node processing*/ private boolean collectNodeStatistics; @@ -118,7 +115,7 @@ * Construct a new context. */ public CommandContext(Object processorID, String connectionID, String userName, - Serializable commandPayload, String vdbName, int vdbVersion, Properties envProperties, boolean processDebug, boolean collectNodeStatistics) { + Serializable commandPayload, String vdbName, int vdbVersion, Properties envProperties, boolean collectNodeStatistics) { setProcessorID(processorID); setConnectionID(connectionID); setUserName(userName); @@ -126,7 +123,6 @@ setVdbName(vdbName); setVdbVersion(vdbVersion); setEnvironmentProperties(envProperties); - setProcessDebug(processDebug); setCollectNodeStatistics(collectNodeStatistics); } @@ -137,7 +133,7 @@ String vdbName, int vdbVersion) { this(processorID, connectionID, userName, null, vdbName, - vdbVersion, null, false, false); + vdbVersion, null, false); } @@ -167,14 +163,6 @@ return globalState.processorID; } - public boolean getProcessDebug() { - return globalState.processDebug; - } - - public void setProcessDebug(boolean processDebug) { - globalState.processDebug = processDebug; - } - /** * @param object */ Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedStatement.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedStatement.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedStatement.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -245,7 +245,7 @@ ConnectorManagerRepository repo = Mockito.mock(ConnectorManagerRepository.class); Mockito.stub(repo.getConnectorManager(Mockito.anyString())).toReturn(new AutoGenDataService()); - serverRequest.initialize(request, BufferManagerFactory.getStandaloneBufferManager(), null, new FakeTransactionService(), DEBUG, null, workContext, repo,false); + serverRequest.initialize(request, BufferManagerFactory.getStandaloneBufferManager(), null, new FakeTransactionService(), null, workContext, repo, false); serverRequest.setMetadata(capFinder, metadata, null); serverRequest.processRequest(); Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestRequest.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestRequest.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestRequest.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -84,7 +84,7 @@ RequestMessage message = new RequestMessage(); DQPWorkContext workContext = FakeMetadataFactory.buildWorkContext(metadata, FakeMetadataFactory.example1VDB()); - request.initialize(message, null, null,new FakeTransactionService(),false, null, workContext, repo, false); + request.initialize(message, null, null,new FakeTransactionService(),null, workContext, repo, false); request.initMetadata(); request.validateAccess(command); } @@ -138,8 +138,8 @@ Mockito.stub(repo.getConnectorManager(Mockito.anyString())).toReturn(new AutoGenDataService()); request.initialize(message, Mockito.mock(BufferManager.class), - new FakeDataManager(), new FakeTransactionService(), false, null, workContext, - repo, false); + new FakeDataManager(), new FakeTransactionService(), null, workContext, repo, + false); request.processRequest(); return request; Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/TestMultiSourcePlanToProcessConverter.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/TestMultiSourcePlanToProcessConverter.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/TestMultiSourcePlanToProcessConverter.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -121,7 +121,7 @@ idGenerator.setDefaultFactory(new IntegerIDFactory()); Properties props = new Properties(); - CommandContext context = new CommandContext("0", "test", "user", null, vdb.getName(), vdb.getVersion(), props, false, false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + CommandContext context = new CommandContext("0", "test", "user", null, vdb.getName(), vdb.getVersion(), props, false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ context.setPlanToProcessConverter(new MultiSourcePlanToProcessConverter(metadata, idGenerator, analysis, finder, multiSourceModels, dqpContext, context)); ProcessorPlan plan = QueryOptimizer.optimizePlan(command, wrapper, idGenerator, finder, analysis, context); Modified: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -30,13 +30,19 @@ import org.junit.Ignore; import org.junit.Test; import org.teiid.client.plan.Annotation; +import org.teiid.common.buffer.BufferManagerFactory; import org.teiid.query.analysis.AnalysisRecord; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.optimizer.TestOptimizer; +import org.teiid.query.optimizer.TestOptimizer.ComparisonMode; +import org.teiid.query.processor.ProcessorPlan; +import org.teiid.query.processor.relational.RelationalPlan; import org.teiid.query.sql.lang.Command; +import org.teiid.query.tempdata.TempTableStore; import org.teiid.query.unittest.FakeMetadataFactory; +import org.teiid.query.util.CommandContext; - +@SuppressWarnings("nls") public class TestMaterialization { @Test public void testMaterializedTransformation() throws Exception { @@ -137,5 +143,40 @@ TestOptimizer.helpPlanCommand(command, metadata, getGenericFinder(), analysis, new String[] {"SELECT g_0.x FROM MatSrc.MatSrc AS g_0 WHERE g_0.x = '1'"}, ComparisonMode.EXACT_COMMAND_STRING); //$NON-NLS-1$ } + + @Test public void testCacheHint() throws Exception { + String userSql = "SELECT * from vgroup2"; //$NON-NLS-1$ + + QueryMetadataInterface metadata = FakeMetadataFactory.exampleMaterializedView(); + AnalysisRecord analysis = new AnalysisRecord(true, DEBUG); + + Command command = helpGetCommand(userSql, metadata, null); + CommandContext cc = new CommandContext(); + cc.setGlobalTableStore(new TempTableStore(BufferManagerFactory.getStandaloneBufferManager(), "SYSTEM")); + ProcessorPlan plan = TestOptimizer.getPlan(command, metadata, getGenericFinder(), analysis, true, cc); + TestOptimizer.checkAtomicQueries(new String[] {"SELECT #MAT_MatView.VGroup2.X FROM #MAT_MatView.VGroup2"}, plan); + Collection<Annotation> annotations = analysis.getAnnotations(); + assertNotNull("Expected annotations but got none", annotations); //$NON-NLS-1$ + assertTrue("Expected one annotation", annotations.size() == 1); //$NON-NLS-1$ + assertEquals("Expected catagory mat view", annotations.iterator().next().getCategory(), Annotation.MATERIALIZED_VIEW); //$NON-NLS-1$ + } + + @Test public void testCacheHintWithPk() throws Exception { + String userSql = "SELECT * from vgroup3 where x = 'foo'"; //$NON-NLS-1$ + + QueryMetadataInterface metadata = FakeMetadataFactory.exampleMaterializedView(); + AnalysisRecord analysis = new AnalysisRecord(true, DEBUG); + + Command command = helpGetCommand(userSql, metadata, null); + CommandContext cc = new CommandContext(); + cc.setGlobalTableStore(new TempTableStore(BufferManagerFactory.getStandaloneBufferManager(), "SYSTEM")); + RelationalPlan plan = (RelationalPlan)TestOptimizer.getPlan(command, metadata, getGenericFinder(), analysis, true, cc); + assertEquals(1f, plan.getRootNode().getEstimateNodeCardinality()); + TestOptimizer.checkAtomicQueries(new String[] {"SELECT #MAT_MatView.VGroup3.X, #MAT_MatView.VGroup3.y FROM #MAT_MatView.VGroup3 WHERE #MAT_MatView.VGroup3.X = 'foo'"}, plan); + Collection<Annotation> annotations = analysis.getAnnotations(); + assertNotNull("Expected annotations but got none", annotations); //$NON-NLS-1$ + assertTrue("Expected one annotation", annotations.size() == 1); //$NON-NLS-1$ + assertEquals("Expected catagory mat view", annotations.iterator().next().getCategory(), Annotation.MATERIALIZED_VIEW); //$NON-NLS-1$ + } } Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -39,6 +39,7 @@ import java.util.Map; import java.util.Properties; import java.util.Set; +import java.util.StringTokenizer; import org.junit.Test; import org.teiid.client.metadata.ParameterInfo; @@ -84,6 +85,7 @@ import org.teiid.query.sql.symbol.Reference; import org.teiid.query.sql.util.VariableContext; import org.teiid.query.sql.visitor.ReferenceCollectorVisitor; +import org.teiid.query.tempdata.TempTableStore; import org.teiid.query.unittest.FakeMetadataFacade; import org.teiid.query.unittest.FakeMetadataFactory; import org.teiid.query.unittest.FakeMetadataObject; @@ -225,6 +227,12 @@ bufferMgr.setProcessorBatchSize(context.getProcessorBatchSize()); bufferMgr.setConnectorBatchSize(context.getProcessorBatchSize()); context.getNextRand(0); + if (context.getTempTableStore() == null) { + context.setTempTableStore(new TempTableStore(bufferMgr, context.getConnectionID())); + } + if (!(dataManager instanceof TempTableDataManager)) { + dataManager = new TempTableDataManager(dataManager); + } TupleBuffer id = null; try { QueryProcessor processor = new QueryProcessor(plan, context, bufferMgr, dataManager); @@ -278,29 +286,42 @@ if(cellValue instanceof XMLType){ XMLType id = (XMLType)cellValue; String actualDoc = id.getString(); - record = new ArrayList(record); - record.set(0, actualDoc); + if (expectedResults[i].size() == 1) { + compareDocuments((String)expectedResults[i].get(0), actualDoc); + continue; + } } - if (expectedResults[i].size() == 1) { - assertEquals("Row " + i + " does not match expected: ", expectedResults[i].get(0), record.get(0)); //$NON-NLS-1$ //$NON-NLS-2$ - continue; - } } assertEquals("Row " + i + " does not match expected: ", expectedResults[i], record); //$NON-NLS-1$ //$NON-NLS-2$ } ts.closeSource(); } + + public static void compareDocuments(String expectedDoc, String actualDoc) { + StringTokenizer tokens1 = new StringTokenizer(expectedDoc, "\r\n"); //$NON-NLS-1$ + StringTokenizer tokens2 = new StringTokenizer(actualDoc, "\r\n");//$NON-NLS-1$ + while(tokens1.hasMoreTokens()){ + String token1 = tokens1.nextToken().trim(); + if(!tokens2.hasMoreTokens()){ + fail("XML doc mismatch: expected=" + token1 + "\nactual=none");//$NON-NLS-1$ //$NON-NLS-2$ + } + String token2 = tokens2.nextToken().trim(); + assertEquals("XML doc mismatch: ", token1, token2); //$NON-NLS-1$ + } + if(tokens2.hasMoreTokens()){ + fail("XML doc mismatch: expected=none\nactual=" + tokens2.nextToken().trim());//$NON-NLS-1$ + } + } public static CommandContext createCommandContext() { Properties props = new Properties(); props.setProperty("soap_host", "my.host.com"); //$NON-NLS-1$ //$NON-NLS-2$ props.setProperty("soap_port", "12345"); //$NON-NLS-1$ //$NON-NLS-2$ - CommandContext context = new CommandContext("0", "test", "user", null, "myvdb", 1, props, DEBUG, false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + CommandContext context = new CommandContext("0", "test", "user", null, "myvdb", 1, props, false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ context.setProcessorBatchSize(BufferManager.DEFAULT_PROCESSOR_BATCH_SIZE); context.setConnectorBatchSize(BufferManager.DEFAULT_CONNECTOR_BATCH_SIZE); context.setBufferManager(BufferManagerFactory.getStandaloneBufferManager()); - context.setProcessDebug(DEBUG); return context; } Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -35,27 +35,31 @@ import org.teiid.query.metadata.TempMetadataAdapter; import org.teiid.query.tempdata.TempTableStore; import org.teiid.query.unittest.FakeMetadataFactory; +import org.teiid.query.util.CommandContext; @SuppressWarnings("nls") public class TestTempTables { private TempMetadataAdapter metadata; private TempTableDataManager dataManager; - + private TempTableStore tempStore; + private void execute(String sql, List[] expectedResults) throws Exception { execute(TestProcessor.helpGetPlan(sql, metadata), expectedResults); } private void execute(ProcessorPlan processorPlan, List[] expectedResults) throws Exception { - TestProcessor.doProcess(processorPlan, dataManager, expectedResults, TestProcessor.createCommandContext()); + CommandContext cc = TestProcessor.createCommandContext(); + cc.setTempTableStore(tempStore); + TestProcessor.doProcess(processorPlan, dataManager, expectedResults, cc); } @Before public void setUp() { - TempTableStore tempStore = new TempTableStore(BufferManagerFactory.getStandaloneBufferManager(), "1"); //$NON-NLS-1$ + tempStore = new TempTableStore(BufferManagerFactory.getStandaloneBufferManager(), "1"); //$NON-NLS-1$ metadata = new TempMetadataAdapter(FakeMetadataFactory.example1Cached(), tempStore.getMetadataStore()); FakeDataManager fdm = new FakeDataManager(); TestProcessor.sampleData1(fdm); - dataManager = new TempTableDataManager(fdm, tempStore); + dataManager = new TempTableDataManager(fdm); } @Test public void testInsertWithQueryExpression() throws Exception { Modified: trunk/engine/src/test/java/org/teiid/query/processor/eval/TestExpressionEvaluator.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/eval/TestExpressionEvaluator.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/test/java/org/teiid/query/processor/eval/TestExpressionEvaluator.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -332,7 +332,7 @@ Properties props = new Properties(); props.setProperty("http_host", "testHostName"); //$NON-NLS-1$ //$NON-NLS-2$ props.setProperty("http_port", "8000"); //$NON-NLS-1$ //$NON-NLS-2$ - CommandContext context = new CommandContext(new Long(1), null, null, null, null, 0, props, false, false); + CommandContext context = new CommandContext(new Long(1), null, null, null, null, 0, props, false); func.setArgs(new Expression[] {new Constant("http_host")}); //$NON-NLS-1$ assertEquals("testHostName", new Evaluator(Collections.emptyMap(), dataMgr, context).evaluate(func, Collections.emptyList())); //$NON-NLS-1$ @@ -354,7 +354,7 @@ func.setFunctionDescriptor(desc); FakeDataManager dataMgr = new FakeDataManager(); - CommandContext context = new CommandContext(new Long(-1), null, "user", payload, "vdb", 1, null, false, false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + CommandContext context = new CommandContext(new Long(-1), null, "user", payload, "vdb", 1, null, false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ if(property != null) { func.setArgs(new Expression[] {new Constant(property)}); Modified: trunk/engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -98,7 +98,6 @@ static void helpTestProcess(ProcessorPlan procPlan, int rowsUpdated, List[] expectedResults, boolean shouldFail, ProcessorDataManager dataMgr, QueryMetadataInterface metadata) throws Exception { CommandContext context = new CommandContext("pID", null, null, null, 1); //$NON-NLS-1$ context.getNextRand(0); - context.setProcessDebug(DEBUG); context.setMetadata(metadata); if (expectedResults == null) { Modified: trunk/engine/src/test/java/org/teiid/query/processor/relational/TestRelationalNodeStatistics.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/relational/TestRelationalNodeStatistics.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/test/java/org/teiid/query/processor/relational/TestRelationalNodeStatistics.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -111,7 +111,7 @@ FakeRelationalNode fakeNode = new FakeRelationalNode(1, data, 100); fakeNode.setElements(elements); - CommandContext context = new CommandContext("pid", "group", null, null, null, 1, null, false, true); //$NON-NLS-1$ //$NON-NLS-2$ + CommandContext context = new CommandContext("pid", "group", null, null, null, 1, null, true); //$NON-NLS-1$ //$NON-NLS-2$ fakeNode.initialize(context, BufferManagerFactory.getStandaloneBufferManager(), null); return fakeNode; } Modified: trunk/engine/src/test/java/org/teiid/query/processor/xml/TestXMLProcessor.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/xml/TestXMLProcessor.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/test/java/org/teiid/query/processor/xml/TestXMLProcessor.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -26,25 +26,20 @@ import java.io.ByteArrayOutputStream; import java.io.FileInputStream; -import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.StringTokenizer; import org.junit.Test; import org.teiid.api.exception.query.QueryPlannerException; import org.teiid.client.metadata.ParameterInfo; import org.teiid.common.buffer.BufferManager; import org.teiid.common.buffer.BufferManagerFactory; -import org.teiid.common.buffer.TupleBuffer; -import org.teiid.common.buffer.TupleSource; import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidProcessingException; import org.teiid.core.types.DataTypeManager; -import org.teiid.core.types.XMLType; import org.teiid.core.util.UnitTestUtil; import org.teiid.query.analysis.AnalysisRecord; import org.teiid.query.mapping.relational.QueryNode; @@ -71,8 +66,7 @@ import org.teiid.query.processor.FakeDataManager; import org.teiid.query.processor.ProcessorPlan; import org.teiid.query.processor.QueryProcessor; -import org.teiid.query.processor.xml.ExecStagingTableInstruction; -import org.teiid.query.processor.xml.XMLPlan; +import org.teiid.query.processor.TestProcessor; import org.teiid.query.resolver.QueryResolver; import org.teiid.query.rewriter.QueryRewriter; import org.teiid.query.sql.lang.Command; @@ -90,6 +84,7 @@ * metadata, and then that XMLPlan being processed with metadata, a * ProcessorDataManager and a QueryProcessor. */ +@SuppressWarnings("nls") public class TestXMLProcessor { private static final boolean DEBUG = false; @@ -2934,20 +2929,19 @@ } static ProcessorPlan helpTestProcess(String sql, String expectedDoc, FakeMetadataFacade metadata, FakeDataManager dataMgr) throws Exception{ - return helpTestProcess(sql, expectedDoc, metadata, dataMgr, true, TeiidComponentException.class, null); + return helpTestProcess(sql, expectedDoc, metadata, dataMgr, null); } - static ProcessorPlan helpTestProcess(String sql, String expectedDoc, FakeMetadataFacade metadata, FakeDataManager dataMgr, final boolean shouldSucceed, Class expectedException, final String shouldFailMsg) throws Exception{ + static ProcessorPlan helpTestProcess(String sql, String expectedDoc, FakeMetadataFacade metadata, FakeDataManager dataMgr, Class expectedException) throws Exception{ - return helpTestProcess(sql, expectedDoc, metadata, dataMgr, shouldSucceed, expectedException, shouldFailMsg, new DefaultCapabilitiesFinder()); + return helpTestProcess(sql, metadata, dataMgr, expectedException, new DefaultCapabilitiesFinder(), expectedDoc); } - static ProcessorPlan helpTestProcess(String sql, String expectedDoc, FakeMetadataFacade metadata, FakeDataManager dataMgr, final boolean shouldSucceed, Class expectedException, final String shouldFailMsg, CapabilitiesFinder capFinder) throws Exception{ + static ProcessorPlan helpTestProcess(String sql, FakeMetadataFacade metadata, FakeDataManager dataMgr, Class expectedException, CapabilitiesFinder capFinder, String... expectedDoc) throws Exception{ Command command = helpGetCommand(sql, metadata); + AnalysisRecord analysisRecord = new AnalysisRecord(false, DEBUG); - if (shouldSucceed){ - - AnalysisRecord analysisRecord = new AnalysisRecord(false, DEBUG); + try { CommandContext planningContext = new CommandContext(); //this should be the same as the processing context, but that's not easy to do ProcessorPlan plan = QueryOptimizer.optimizePlan(command, metadata, null, capFinder, analysisRecord, planningContext); @@ -2955,124 +2949,26 @@ if(DEBUG) { System.out.println(analysisRecord.getDebugLog()); } - - // Process twice, to test reset and clone methods - for (int i=1; i<=2; i++) { - BufferManager bufferMgr = BufferManagerFactory.getStandaloneBufferManager(); - CommandContext context = new CommandContext("pID", "TestConn", "testUser", null, 1); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - context.setProcessDebug(DEBUG); - QueryProcessor processor = new QueryProcessor(plan, context, bufferMgr, dataMgr); - processor.setNonBlocking(true); - BatchCollector collector = processor.createBatchCollector(); - TupleBuffer id = collector.collectTuples(); - - TupleSource ts = id.createIndexedTupleSource(); - List row = ts.nextTuple(); - assertEquals("Incorrect number of columns: ", 1, row.size()); //$NON-NLS-1$ - - - XMLType result = (XMLType)row.get(0); - String actualDoc = result.getString(); - - id.remove(); - - if(DEBUG) { - System.out.println("expectedDoc = \n" + expectedDoc); //$NON-NLS-1$ - System.out.println("actualDoc = \n" + actualDoc); //$NON-NLS-1$ - } - //assertEquals("XML doc mismatch: ", expectedDoc, actualDoc); //$NON-NLS-1$ - compareDocuments(expectedDoc, actualDoc); - //Test reset, clone methods - if (i==1) { - plan.reset(); - plan = plan.clone(); - } - } + List[] expected = new List[expectedDoc.length]; + for (int i = 0; i < expectedDoc.length; i++) { + expected[i] = Arrays.asList(expectedDoc[i]); + } + TestProcessor.helpProcess(plan, planningContext, dataMgr, expected); + assertNull("Expected failure", expectedException); return plan; - } - Exception expected = null; - AnalysisRecord analysisRecord = new AnalysisRecord(false, DEBUG); - try{ - ProcessorPlan plan = QueryOptimizer.optimizePlan(command, metadata, null, new DefaultCapabilitiesFinder(), analysisRecord, null); - - BufferManager bufferMgr = BufferManagerFactory.getStandaloneBufferManager(); - CommandContext context = new CommandContext("pID", null, null, null, 1); //$NON-NLS-1$ - QueryProcessor processor = new QueryProcessor(plan, context, bufferMgr, dataMgr); - processor.setNonBlocking(true); - BatchCollector collector = processor.createBatchCollector(); - collector.collectTuples(); - } catch (Exception e){ - if (expectedException.isInstance(e)){ - expected = e; - } else { - throw e; - } + } catch (Exception e) { + if (expectedException == null) { + throw e; + } + assertTrue(expectedException.isInstance(e)); } finally { if(DEBUG) { System.out.println(analysisRecord.getDebugLog()); } } - - assertNotNull(shouldFailMsg, expected); return null; } - public static void compareDocuments(String expectedDoc, String actualDoc) { - StringTokenizer tokens1 = new StringTokenizer(expectedDoc, "\r\n"); //$NON-NLS-1$ - StringTokenizer tokens2 = new StringTokenizer(actualDoc, "\n");//$NON-NLS-1$ - while(tokens1.hasMoreTokens()){ - String token1 = tokens1.nextToken().trim(); - if(!tokens2.hasMoreTokens()){ - fail("XML doc mismatch: expected=" + token1 + "\nactual=none");//$NON-NLS-1$ //$NON-NLS-2$ - } - String token2 = tokens2.nextToken().trim(); - assertEquals("XML doc mismatch: ", token1, token2); //$NON-NLS-1$ - } - if(tokens2.hasMoreTokens()){ - fail("XML doc mismatch: expected=none\nactual=" + tokens2.nextToken().trim());//$NON-NLS-1$ - } - } - - private void helpTestProcess(String sql, String[] expectedDocs, FakeMetadataFacade metadata, FakeDataManager dataMgr) throws Exception{ - Command command = helpGetCommand(sql, metadata); - AnalysisRecord analysisRecord = new AnalysisRecord(false, DEBUG); - XMLPlan plan = (XMLPlan)QueryOptimizer.optimizePlan(command, metadata, null, new DefaultCapabilitiesFinder(), analysisRecord, null); - if(DEBUG) { - System.out.println(analysisRecord.getDebugLog()); - } - - helpTestProcess(expectedDocs, dataMgr, plan); - } - - private void helpTestProcess(String[] expectedDocs, FakeDataManager dataMgr, - ProcessorPlan plan) throws TeiidComponentException, - TeiidProcessingException, SQLException { - BufferManager bufferMgr = BufferManagerFactory.getStandaloneBufferManager(); - CommandContext context = new CommandContext("pID", null, null, null, 1); //$NON-NLS-1$ - context.setProcessDebug(DEBUG); - QueryProcessor processor = new QueryProcessor(plan, context, bufferMgr, dataMgr); - processor.setNonBlocking(true); - BatchCollector collector = processor.createBatchCollector(); - TupleBuffer tupleBuffer = collector.collectTuples(); - int count = tupleBuffer.getRowCount(); - assertEquals("Incorrect number of records: ", expectedDocs.length, count); //$NON-NLS-1$ - - TupleSource ts = tupleBuffer.createIndexedTupleSource(); - for (int i=0; i<expectedDocs.length; i++){ - List row = ts.nextTuple(); - if(row.isEmpty()){ - continue; - } - assertEquals("Incorrect number of columns: ", 1, row.size()); //$NON-NLS-1$ - XMLType result = (XMLType)row.get(0); - String actualDoc = result.getString(); - - //assertEquals("XML doc result # " + i +" mismatch: ", expectedDocs[i], actualDoc); //$NON-NLS-1$ //$NON-NLS-2$ - compareDocuments(expectedDocs[i], actualDoc); - } - tupleBuffer.remove(); - } - // ============================================================================================= // T E S T S // ============================================================================================= @@ -3946,7 +3842,7 @@ FakeMetadataFacade metadata = exampleMetadataCached(); FakeDataManager dataMgr = exampleDataManager(metadata); - helpTestProcess("SELECT * FROM xmltest.doc1 WHERE Catalog = 'something'", null, metadata, dataMgr, false, QueryPlannerException.class, null); //$NON-NLS-1$ + helpTestProcess("SELECT * FROM xmltest.doc1 WHERE Catalog = 'something'", null, metadata, dataMgr, QueryPlannerException.class); //$NON-NLS-1$ } //defect 8130 @@ -3954,7 +3850,7 @@ FakeMetadataFacade metadata = exampleMetadataCached(); FakeDataManager dataMgr = exampleDataManager(metadata); - helpTestProcess("SELECT * FROM xmltest.doc1 WHERE Item = 'something'", null, metadata, dataMgr, false, QueryPlannerException.class, null); //$NON-NLS-1$ + helpTestProcess("SELECT * FROM xmltest.doc1 WHERE Item = 'something'", null, metadata, dataMgr, QueryPlannerException.class); //$NON-NLS-1$ } @Test public void testNested() throws Exception { @@ -5141,7 +5037,7 @@ Class expectedException = QueryPlannerException.class; String shouldFailMsg = "expected failure since two different contexts were specified in conjunct"; //$NON-NLS-1$ - helpTestProcess("SELECT * FROM xmltest.doc9 WHERE context(Item, OrderID)='5' OR context(SupplierID, OrderID)='2'", expectedDoc, metadata, dataMgr, shouldSucceed, expectedException, shouldFailMsg); //$NON-NLS-1$ + helpTestProcess("SELECT * FROM xmltest.doc9 WHERE context(Item, OrderID)='5' OR context(SupplierID, OrderID)='2'", expectedDoc, metadata, dataMgr, expectedException); //$NON-NLS-1$ } @Test public void testNested2WithContextCriteria6() throws Exception { @@ -5843,7 +5739,7 @@ @Test public void test2b() throws Exception { FakeMetadataFacade metadata = exampleMetadataCached(); FakeDataManager dataMgr = exampleDataManager(metadata); - helpTestProcess("SELECT * FROM xmltest.doc2b", null, metadata, dataMgr, false, TeiidComponentException.class, "Should have failed on default"); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestProcess("SELECT * FROM xmltest.doc2b", null, metadata, dataMgr, TeiidComponentException.class); //$NON-NLS-1$ //$NON-NLS-2$ } @Test public void test2c() throws Exception { @@ -6159,9 +6055,7 @@ "</Item>\r\n\r\n"; //$NON-NLS-1$ - String[] expectedDocs = new String[]{expectedDoc1, expectedDoc2, expectedDoc3}; - - helpTestProcess("SELECT * FROM xmltest.doc11", expectedDocs, metadata, dataMgr); //$NON-NLS-1$ + helpTestProcess("SELECT * FROM xmltest.doc11", metadata, dataMgr, null, new DefaultCapabilitiesFinder(), expectedDoc1, expectedDoc2, expectedDoc3); //$NON-NLS-1$ } @Test public void testRecursive() throws Exception { @@ -6474,7 +6368,7 @@ @Test public void testRecursive4Exception() throws Exception { FakeMetadataFacade metadata = exampleMetadataCached(); FakeDataManager dataMgr = exampleDataManagerNested(metadata); - helpTestProcess("SELECT * FROM xmltest.doc15", null, metadata, dataMgr, false, TeiidComponentException.class, "Query processing should have failed on recursion limit."); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestProcess("SELECT * FROM xmltest.doc15", null, metadata, dataMgr, TeiidComponentException.class); //$NON-NLS-1$ //$NON-NLS-2$ } /** @@ -9896,7 +9790,7 @@ final boolean SHOULD_SUCCEED = true; helpTestProcess("SELECT Item FROM xmltest.doc9c", //$NON-NLS-1$ - expectedDoc, metadata, dataMgr, SHOULD_SUCCEED, null, null); + expectedDoc, metadata, dataMgr, null); } @Test public void testNestedWithStoredQueryInMappingClass() throws Exception { @@ -10061,7 +9955,7 @@ caps.setFunctionSupport("convert", true); //$NON-NLS-1$ CapabilitiesFinder capFinder = new DefaultCapabilitiesFinder(caps); - helpTestProcess("SELECT * FROM xmltest.doc12260", expectedDoc, metadata, dataMgr, true, TeiidComponentException.class, null, capFinder); //$NON-NLS-1$ + helpTestProcess("SELECT * FROM xmltest.doc12260", metadata, dataMgr, null, capFinder, expectedDoc); //$NON-NLS-1$ } @Test public void testDefect8373() throws Exception{ @@ -10617,7 +10511,7 @@ FakeMetadataFacade metadata = exampleMetadataCached(); FakeDataManager dataMgr = exampleDataManagerNested(metadata); - helpTestProcess("SELECT * FROM xmltest.doc8 WHERE rowlimitexception(supplier) = 2", null, metadata, dataMgr, false, TeiidProcessingException.class, ""); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestProcess("SELECT * FROM xmltest.doc8 WHERE rowlimitexception(supplier) = 2", null, metadata, dataMgr, TeiidProcessingException.class); //$NON-NLS-1$ //$NON-NLS-2$ } /** Two row limits on the same mapping class should be harmless as long as the row limits are identical. */ @@ -10681,7 +10575,7 @@ FakeMetadataFacade metadata = exampleMetadataCached(); FakeDataManager dataMgr = exampleDataManagerNested(metadata); - helpTestProcess("SELECT * FROM xmltest.doc8 WHERE rowlimitexception(supplier) = 2 AND rowlimitexception(supplierid) = 2", null, metadata, dataMgr, false, TeiidProcessingException.class, ""); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestProcess("SELECT * FROM xmltest.doc8 WHERE rowlimitexception(supplier) = 2 AND rowlimitexception(supplierid) = 2", null, metadata, dataMgr, TeiidProcessingException.class); //$NON-NLS-1$ //$NON-NLS-2$ } /** compound criteria */ @@ -10721,7 +10615,7 @@ FakeMetadataFacade metadata = exampleMetadataCached(); FakeDataManager dataMgr = exampleDataManagerNested(metadata); - helpTestProcess("SELECT * FROM xmltest.doc8 WHERE ItemID='002' AND rowlimitexception(supplier) = 2", null, metadata, dataMgr, false, TeiidProcessingException.class, ""); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestProcess("SELECT * FROM xmltest.doc8 WHERE ItemID='002' AND rowlimitexception(supplier) = 2", null, metadata, dataMgr, TeiidProcessingException.class); //$NON-NLS-1$ //$NON-NLS-2$ } @Test public void testCase2951MaxRows4() throws Exception { @@ -10828,7 +10722,7 @@ FakeMetadataFacade metadata = exampleMetadataCached(); FakeDataManager dataMgr = exampleDataManagerNested(metadata); - helpTestProcess("SELECT * FROM xmltest.doc8 WHERE rowlimit(catalogs) = 2", null, metadata, dataMgr, false, QueryPlannerException.class, ""); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestProcess("SELECT * FROM xmltest.doc8 WHERE rowlimit(catalogs) = 2", null, metadata, dataMgr, QueryPlannerException.class); //$NON-NLS-1$ //$NON-NLS-2$ } /** two conflicting row limits on the same mapping class */ @@ -10837,7 +10731,7 @@ FakeMetadataFacade metadata = exampleMetadataCached(); FakeDataManager dataMgr = exampleDataManagerNested(metadata); - helpTestProcess("SELECT * FROM xmltest.doc8 WHERE rowlimit(supplier) = 2 AND rowlimit(supplierID) = 3", null, metadata, dataMgr, false, QueryPlannerException.class, ""); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestProcess("SELECT * FROM xmltest.doc8 WHERE rowlimit(supplier) = 2 AND rowlimit(supplierID) = 3", null, metadata, dataMgr, QueryPlannerException.class); //$NON-NLS-1$ //$NON-NLS-2$ } /** arg to rowlimitexception function isn't in the scope of any mapping class */ @@ -10846,7 +10740,7 @@ FakeMetadataFacade metadata = exampleMetadataCached(); FakeDataManager dataMgr = exampleDataManagerNested(metadata); - helpTestProcess("SELECT * FROM xmltest.doc8 WHERE rowlimitexception(catalogs) = 2", null, metadata, dataMgr, false, QueryPlannerException.class, ""); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestProcess("SELECT * FROM xmltest.doc8 WHERE rowlimitexception(catalogs) = 2", null, metadata, dataMgr, QueryPlannerException.class); //$NON-NLS-1$ //$NON-NLS-2$ } /** two conflicting rowlimitexceptions on the same mapping class */ @@ -10855,7 +10749,7 @@ FakeMetadataFacade metadata = exampleMetadataCached(); FakeDataManager dataMgr = exampleDataManagerNested(metadata); - helpTestProcess("SELECT * FROM xmltest.doc8 WHERE rowlimitexception(supplier) = 2 AND rowlimitexception(supplierID) = 3", null, metadata, dataMgr, false, QueryPlannerException.class, ""); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestProcess("SELECT * FROM xmltest.doc8 WHERE rowlimitexception(supplier) = 2 AND rowlimitexception(supplierID) = 3", null, metadata, dataMgr, QueryPlannerException.class); //$NON-NLS-1$ //$NON-NLS-2$ } /** two conflicting rowlimit and rowlimitexceptions on the same mapping class fails planning */ @@ -10864,7 +10758,7 @@ FakeMetadataFacade metadata = exampleMetadataCached(); FakeDataManager dataMgr = exampleDataManagerNested(metadata); - helpTestProcess("SELECT * FROM xmltest.doc8 WHERE rowlimit(supplier) = 2 AND rowlimitexception(supplierID) = 3", null, metadata, dataMgr, false, QueryPlannerException.class, ""); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestProcess("SELECT * FROM xmltest.doc8 WHERE rowlimit(supplier) = 2 AND rowlimitexception(supplierID) = 3", null, metadata, dataMgr, QueryPlannerException.class); //$NON-NLS-1$ //$NON-NLS-2$ } /** try rowlimit criteria written the reverse way */ Modified: trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFacade.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFacade.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFacade.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -774,4 +774,11 @@ public FunctionLibrary getFunctionLibrary() { return this.functionLibrary; } + + @Override + public boolean isPrimaryKey(Object metadataID) { + ArgCheck.isInstanceOf(FakeMetadataObject.class, metadataID); + FakeMetadataObject object = (FakeMetadataObject) metadataID; + return object.getProperty(FakeMetadataObject.Props.KEY_TYPE) == FakeMetadataObject.TYPE_PRIMARY_KEY; + } } Modified: trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFactory.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFactory.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFactory.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -2127,12 +2127,18 @@ virtGroup1.putProperty(FakeMetadataObject.Props.MAT_GROUP, physGroup1); virtGroup1.putProperty(FakeMetadataObject.Props.MAT_STAGE, physGroupStage1); - //add one virtual group that uses the materialized group in transformation with NOCACHE option QueryNode vTrans2 = new QueryNode("MatView.VGroup2", "/* cache */ SELECT x FROM matsrc"); //$NON-NLS-1$ //$NON-NLS-2$ FakeMetadataObject vGroup2 = createVirtualGroup("MatView.VGroup2", virtModel, vTrans2); //$NON-NLS-1$ List vElements2 = createElements(vGroup2, new String[] { "x" }, //$NON-NLS-1$ new String[] { DataTypeManager.DefaultDataTypes.STRING}); + + QueryNode vTrans3 = new QueryNode("MatView.VGroup3", "/* cache */ SELECT x, 'z' || substring(x, 2) as y FROM matsrc"); //$NON-NLS-1$ //$NON-NLS-2$ + FakeMetadataObject vGroup3 = createVirtualGroup("MatView.VGroup3", virtModel, vTrans3); //$NON-NLS-1$ + List vElements3 = createElements(vGroup3, + new String[] { "x", "y" }, //$NON-NLS-1$ + new String[] { DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING}); + FakeMetadataObject vGroup3pk = createKey("pk", vGroup3, vElements3.subList(0, 1)); FakeMetadataStore store = new FakeMetadataStore(); @@ -2157,6 +2163,9 @@ store.addObjects(virtElements1); store.addObject(vGroup2); store.addObjects(vElements2); + store.addObject(vGroup3); + store.addObjects(vElements3); + store.addObject(vGroup3pk); return new FakeMetadataFacade(store); } Modified: trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/BaseQueryTest.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/BaseQueryTest.java 2010-07-31 22:31:31 UTC (rev 2395) +++ trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/BaseQueryTest.java 2010-08-02 15:33:33 UTC (rev 2396) @@ -56,7 +56,6 @@ protected void doProcess(QueryMetadataInterface metadata, String sql, CapabilitiesFinder capFinder, ProcessorDataManager dataManager, List[] expectedResults, boolean debug) throws Exception { CommandContext context = createCommandContext(); - context.setProcessDebug(debug); Command command = TestOptimizer.helpGetCommand(sql, metadata, null); // plan

14 years, 5 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

teiid-commits August 2010