May 2011 - teiid-commits - Jboss List Archives

teiid SVN: r3170 - in tags: teiid-parent-7.4.0.Final and 39 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-05-12 11:48:44 -0400 (Thu, 12 May 2011) New Revision: 3170 Added: tags/teiid-parent-7.4.0.Final/ tags/teiid-parent-7.4.0.Final/adminshell/pom.xml tags/teiid-parent-7.4.0.Final/api/pom.xml tags/teiid-parent-7.4.0.Final/build/kits/jboss-container/teiid-releasenotes.html tags/teiid-parent-7.4.0.Final/build/pom.xml tags/teiid-parent-7.4.0.Final/cache-jbosscache/pom.xml tags/teiid-parent-7.4.0.Final/client-jdk15/pom.xml tags/teiid-parent-7.4.0.Final/client/pom.xml tags/teiid-parent-7.4.0.Final/common-core/pom.xml tags/teiid-parent-7.4.0.Final/connectors/connector-file/pom.xml tags/teiid-parent-7.4.0.Final/connectors/connector-ldap/pom.xml tags/teiid-parent-7.4.0.Final/connectors/connector-salesforce/pom.xml tags/teiid-parent-7.4.0.Final/connectors/connector-ws/pom.xml tags/teiid-parent-7.4.0.Final/connectors/pom.xml tags/teiid-parent-7.4.0.Final/connectors/salesforce-api/pom.xml tags/teiid-parent-7.4.0.Final/connectors/sandbox/pom.xml tags/teiid-parent-7.4.0.Final/connectors/sandbox/translator-yahoo/pom.xml tags/teiid-parent-7.4.0.Final/connectors/translator-file/pom.xml tags/teiid-parent-7.4.0.Final/connectors/translator-jdbc/pom.xml tags/teiid-parent-7.4.0.Final/connectors/translator-ldap/pom.xml tags/teiid-parent-7.4.0.Final/connectors/translator-loopback/pom.xml tags/teiid-parent-7.4.0.Final/connectors/translator-olap/pom.xml tags/teiid-parent-7.4.0.Final/connectors/translator-salesforce/pom.xml tags/teiid-parent-7.4.0.Final/connectors/translator-ws/pom.xml tags/teiid-parent-7.4.0.Final/console/pom.xml tags/teiid-parent-7.4.0.Final/documentation/admin-guide/pom.xml tags/teiid-parent-7.4.0.Final/documentation/caching-guide/pom.xml tags/teiid-parent-7.4.0.Final/documentation/client-developers-guide/pom.xml tags/teiid-parent-7.4.0.Final/documentation/developer-guide/pom.xml tags/teiid-parent-7.4.0.Final/documentation/pom.xml tags/teiid-parent-7.4.0.Final/documentation/quick-start-example/pom.xml tags/teiid-parent-7.4.0.Final/documentation/reference/pom.xml tags/teiid-parent-7.4.0.Final/engine/pom.xml tags/teiid-parent-7.4.0.Final/hibernate-dialect/pom.xml tags/teiid-parent-7.4.0.Final/jboss-integration/pom.xml tags/teiid-parent-7.4.0.Final/metadata/pom.xml tags/teiid-parent-7.4.0.Final/pom.xml tags/teiid-parent-7.4.0.Final/runtime/pom.xml tags/teiid-parent-7.4.0.Final/test-integration/common/pom.xml tags/teiid-parent-7.4.0.Final/test-integration/db/pom.xml tags/teiid-parent-7.4.0.Final/test-integration/pom.xml Removed: tags/teiid-parent-7.4.0.Final/adminshell/pom.xml tags/teiid-parent-7.4.0.Final/api/pom.xml tags/teiid-parent-7.4.0.Final/build/kits/jboss-container/teiid-releasenotes.html tags/teiid-parent-7.4.0.Final/build/pom.xml tags/teiid-parent-7.4.0.Final/cache-jbosscache/pom.xml tags/teiid-parent-7.4.0.Final/client-jdk15/pom.xml tags/teiid-parent-7.4.0.Final/client/pom.xml tags/teiid-parent-7.4.0.Final/common-core/pom.xml tags/teiid-parent-7.4.0.Final/connectors/connector-file/pom.xml tags/teiid-parent-7.4.0.Final/connectors/connector-ldap/pom.xml tags/teiid-parent-7.4.0.Final/connectors/connector-salesforce/pom.xml tags/teiid-parent-7.4.0.Final/connectors/connector-ws/pom.xml tags/teiid-parent-7.4.0.Final/connectors/pom.xml tags/teiid-parent-7.4.0.Final/connectors/salesforce-api/pom.xml tags/teiid-parent-7.4.0.Final/connectors/sandbox/pom.xml tags/teiid-parent-7.4.0.Final/connectors/sandbox/translator-yahoo/pom.xml tags/teiid-parent-7.4.0.Final/connectors/translator-file/pom.xml tags/teiid-parent-7.4.0.Final/connectors/translator-jdbc/pom.xml tags/teiid-parent-7.4.0.Final/connectors/translator-ldap/pom.xml tags/teiid-parent-7.4.0.Final/connectors/translator-loopback/pom.xml tags/teiid-parent-7.4.0.Final/connectors/translator-olap/pom.xml tags/teiid-parent-7.4.0.Final/connectors/translator-salesforce/pom.xml tags/teiid-parent-7.4.0.Final/connectors/translator-ws/pom.xml tags/teiid-parent-7.4.0.Final/console/pom.xml tags/teiid-parent-7.4.0.Final/documentation/admin-guide/pom.xml tags/teiid-parent-7.4.0.Final/documentation/caching-guide/pom.xml tags/teiid-parent-7.4.0.Final/documentation/client-developers-guide/pom.xml tags/teiid-parent-7.4.0.Final/documentation/developer-guide/pom.xml tags/teiid-parent-7.4.0.Final/documentation/pom.xml tags/teiid-parent-7.4.0.Final/documentation/quick-start-example/pom.xml tags/teiid-parent-7.4.0.Final/documentation/reference/pom.xml tags/teiid-parent-7.4.0.Final/engine/pom.xml tags/teiid-parent-7.4.0.Final/hibernate-dialect/pom.xml tags/teiid-parent-7.4.0.Final/jboss-integration/pom.xml tags/teiid-parent-7.4.0.Final/metadata/pom.xml tags/teiid-parent-7.4.0.Final/pom.xml tags/teiid-parent-7.4.0.Final/runtime/pom.xml tags/teiid-parent-7.4.0.Final/test-integration/common/pom.xml tags/teiid-parent-7.4.0.Final/test-integration/db/pom.xml tags/teiid-parent-7.4.0.Final/test-integration/pom.xml Log: [maven-release-plugin] copy for tag teiid-parent-7.4.0.Final Deleted: tags/teiid-parent-7.4.0.Final/adminshell/pom.xml =================================================================== --- branches/7.4.x/adminshell/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/adminshell/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-adminshell</artifactId> - <name>Adminshell</name> - <description>Adminshell for Teiid</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>1.7.2</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jline</groupId> - <artifactId>jline</artifactId> - <version>0.9.94</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.fusesource.jansi</groupId> - <artifactId>jansi</artifactId> - <version>1.2.1</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.2</version> - <scope>compile</scope> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/adminshell/pom.xml (from rev 3169, branches/7.4.x/adminshell/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/adminshell/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/adminshell/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-adminshell</artifactId> + <name>Adminshell</name> + <description>Adminshell for Teiid</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>1.7.2</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jline</groupId> + <artifactId>jline</artifactId> + <version>0.9.94</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.fusesource.jansi</groupId> + <artifactId>jansi</artifactId> + <version>1.2.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>1.2</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/api/pom.xml =================================================================== --- branches/7.4.x/api/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/api/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-api</artifactId> - <name>Teiid Translator API</name> - <description>API for creating Translators and other common extenders in Teiid</description> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - - </dependencies> -</project> Copied: tags/teiid-parent-7.4.0.Final/api/pom.xml (from rev 3169, branches/7.4.x/api/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/api/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/api/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-api</artifactId> + <name>Teiid Translator API</name> + <description>API for creating Translators and other common extenders in Teiid</description> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + + </dependencies> +</project> Deleted: tags/teiid-parent-7.4.0.Final/build/kits/jboss-container/teiid-releasenotes.html =================================================================== --- branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/build/kits/jboss-container/teiid-releasenotes.html 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,260 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<HTML> -<HEAD> - <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8"> - <TITLE>Teiid ${project.version} Release Notes</TITLE> - <META NAME="CHANGEDBY" CONTENT="Steve Hawkins"> - </STYLE> -</HEAD> -<BODY LANG="en-US" DIR="LTR"> -<P><A HREF="http://www.teiid.org/"><IMG SRC="https://www.jboss.org/dms/teiid/images/teiid-banner.png" NAME="graphics1" ALT="Teiid" ALIGN=BOTTOM WIDTH=800></A> - -<H1>Teiid ${project.version} Release Notes</H1> -<P>Teiid ${project.version} adds performance, integration, and runtime metadata update features. - -<H2>Overview</H2> -<UL> - <LI><A HREF="#Highlights">Highlights</A> - <LI><A HREF="#Compatibility">Compatibility Issues</A> - <LI><A HREF="#Configuration">Configuration Issues</A> - <LI><A HREF="#Other">Other Issues</A> - <LI><A HREF="#LibraryUpdates">Thirdparty Library Updates</A> - <LI><A HREF="#Details">Detailed Release Notes</A> - <LI><A HREF="#Documentation">Additional Docs and Help</A> - <LI><A HREF="#Licenses">Licenses</A> - <LI><A HREF="#About">About JBoss</A> -</UL> -<H2><A NAME="Highlights"></A>Highlights</H2> -<UL> - <LI><B>Virtual procedure out params</B> - virtual procedures can now have RETURN/OUT/INOUT parameters to return values. - <LI><B>OLAP</B> - OLAP translator is now part of Teiid kit using OLAP4J - <LI><B>Multi-source procedures</B> - multi-source handling was expanded to cover stored procedure execution. See the Reference for more. - <LI><B>Function Support</B> - additional system functions were made available. - <UL> - <LI><B>uuid</B> was added to generate type 4 UUIDs and the Hibernate dialect was updated to support the GUIDGenerator. - <LI><B>array_get</B> was added to extract values from java.sql.Array or java array values. - <LI><B>array_length</B> was added to get the length of java.sql.Array or java array values. - </UL> - <LI><B>ARRAYTABLE</B> - the ARRAYTABLE table function was added to simplify array value extraction into a tabular format. - <LI><B>Ingres</B> - Ingres database translator is now available to use as supported source under Teiid. - <LI><B>Optional Join Enhancements</B> - the optional join hint no longer requires the use of ANSI joins and can will not remove optional bridging tables that are used by two other tables that are required. - <LI><B>InterSystems Cache</B> - InterSystems Cache database translator is now available to use as supported source under Teiid. - <LI><B>userRequestSourceConcurrency</B> - was added to control the number of concurrent source queries allowed for each user request. - <LI><B>Memory Management Improvements</B> - maxReserveBatchColumns and maxProcessingBatchesColumns will be default be determined automatically and will more reliably prevent memory issues. See the admin guide for more. - <LI><B>Subquery optimization control</B> - added the MJ and NO_UNNEST hints and the org.teiid.subqueryUnnestDefault system property to control the optimization of subqueries to traditional joins or to a merge join implementation of a semijoin or antijoin. - <LI><B>Local connection threads</B> - local connection calling threads will be used to process work rather than using an engine thread. This helps decouple the configuration of maxThreads. - <LI><B>Dependent Join Improvements</B> - several major improvements were made to increase performance and develop better plans. - <UL> - <LI><B>Improved Planning</B> - the decision to create a dependent join is now considered earlier in planning and is much more effective for dependent joins involving multiple unrelated independent tables. - <LI><B>IN predicate splitting</B> - the planner can now split large dependent IN predicates into multiple IN predicates, which is controlled by the translator property MaxDepdendentInPredicates. This allows for much larger dependent joins to be performed as a single query. - <LI><B>Dependent query parallelization</B> - when multiple dependent queries are still required, then they will be run in parallel (up to MaxUserSourceRequestConcurrency), rather than sequentially. - <LI><B>Cost based back-off</B> - for cost based dependent joins if the number of independent values is too large, then the join will be performed as normal. - </UL> - <LI><B>Enhanced Sort Join</B> - the partitioned merge join was replaced with an enhanced sort join. The enhanced sort join will use the actual row counts from each side of the relation to perform a index based join if one side is small enough, a partial sort of the larger side and a repeated merge join if the tuples are unbalanced but one side is not small enough to form an index, or a standard sort merge join if the tuples are balanced. - <LI><B>JDK1.5 JDBC Client JAR</B> - A retro-translated Teiid client JDBC jar now available to use with JDK 1.5 VM. Note only the JDBC API is supported, not the Admin API, or retrieving query plans as XML. - <LI><B>Security Improvements</B> - UDF and pushdown functions can now be protected with data roles. Also the CommandContext can provide the Subject for custom security checks in UDFs. - <LI><B>Cache Invalidation</B> - Prepared plan and result set caches have will invalidate entries based upon metadata and data changes respectively. See the cache configuration maxStaleness setting and the Admin and Developer Guides for more. - <LI><B>Runtime-updates of Metadata</B> - ALTER statements have been added to change view/procedure/INSTEAD OF trigger (update procedure) definitions. A CREATE TRIGGER statement is also available to add an INSTEAD OF trigger (update procedures) to views. - System procedures were added to set extension metadata and stat values. By default all effects of metadata updates happen only on running vdbs across the cluster. To make the changes persistent see the Developers Guide Runtime Updates section. -</UL> - -<h2><a name="Compatibility">Compatibility Issues</a></h2> -<ul> - <li>TRANSLATE/HAS CRITERIA has been deprecated. An alternative approach to update procedures will be introduced in a subsequent version. - <li>Support for named parameter syntax using param=value has been deprecated, since it is ambiguous with a comparison predicate boolean value expression. param<b>=></b>value should be used instead. -</ul> - -<h4>from 7.3</h4> -<ul> - <li>SYS.PROPERTIES has a new column, ClobValue, to get values exceeding the max string length - <li>SYS.COLUMNS has two new columns to get statistical information: DistinctCount and NullCount - <li>ARRAY_AGG is now a reserved word</li> - <li>The use of an IN procedure parameter with the name "source_name" in a multi-source model, will now be treated the parameter that controls which source - the procedure will execute against. - <li>Dynamic VDB functions injected via ExecutionFactory.getPushdownFunctions are now scoped to the SYS schema and have a fully qualified name that includes their source type. For example, instead of oracle_model.relate - which was only valid against the oracle_model source, there is now the SYS.oracle_sdo.relate function that is valid for all Oracle sources. Any fully-qualified reference to these functions will need updated. -</ul> - -<h4>from 7.2</h4> -<ul> - <li>The default JDBC credentials are user/user - not admin/teiid - <li>Unordered limits are no longer pushed through conditions, dup removal, or UNION not all. This prevents the possibility of getting less results than the logical intent of the limit. -</ul> - -<h4>from 7.1</h4> -<ul> - <li>Subqueries are no longer allowed to be SELECT INTO. - <li>INSERT/UPDATE/DELETE cannot be used to create implicit return cursors in non-update virtual procedures. You can instead use "UPDATE ...; SELECT VARIABLES.ROWCOUNT;". - <li>The SYSADMIN schema was created to hold procedures and tables that should not be generally accessible. SYS and pg_catalog are now always accessible - permissions do not apply to these schemas. The SYS.getBinaryVDBResource, SYS.getCharacterVDBResource, and SYS.getVDBResourcePaths have been replaced with the - SYSADMIN.VDBResources table. The Matviews table and the refreshMatView/refreshMatViewRow procedures were also moved into SYSADMIN. - <li>Overwriting an existing VDB will cause old connections to be terminated. Production systems should rely on VDB versioning. - <li>The jdbc:metamatrix JDBC URL prefix is no longer accepted. Use jdbc:teiid instead. - <li>Model visibility no longer restricts access to tables and procedures. Setting visible to false will only hide entries from system tables. Data roles should be used to restrict data access. - <li>Admin API "getWorkManagerStats" methods renamed to "getWorkerPoolStats". Also, "setRuntimeProperty" and "getProcesses" methods were removed. - <li>By default the "ENV" system function is now turned off. To enable it, edit the teiid-jboss-beans.xml configuration file. - <li>The use of VARIABLES.ROWCOUNT is now reserved. - <li>Exec statements of the form "var = EXEC foo()" are only valid if the procedure foo has a return parameter. - <li>Cache hint now supports "scope" definition. For ex: /* cache(scope:user) */ select * from T1; This hint will override the computed scope based on the query. -</ul> -<h4>from 7.0</h4> -<ul> - <li>The term data policy was replaced with data role. The AdminAPI methods for adding role mappings have changed from addRoleToDataPolicy and removeRoleFromDataPolicy to addDataRoleMapping and removeDataRoleMapping respectively. -</ul> -<h4>from 6.2</h4> -<ul> - <li>The connector API has changed substantially. Custom connectors need to be retargeted to the new Translator API. See <a href="https://jira.jboss.org/browse/TEIID-1003">TEIID-1003</a> and the <a href="teiid-docs/teiid_developers_guide.pdf">Developer's Guide</a> for more information. - <li>Connector bindings are no longer valid. Use the Designer Tooling or see the AdminShell download for a migration utility. - <li>Calling out to web services and xml processing has been dramatically simplified and improved, but is a breaking change from prior releases. - XML/Relational processing has been replaced by XMLTABLE, retrieving XML from file has been replaced by the File Translator/Resource Adapter, and - web service calls have been replaced by the WS Translator/Resource Adapter. See <a href="https://jira.jboss.org/browse/TEIID-1118">TEIID-1118</a>, <a href="https://jira.jboss.org/browse/TEIID-1114">TEIID-1114</a>, and the <a href="teiid-docs/teiid_reference.pdf">Reference</a> guide for more information. - <li>The direct usage of XQuery has been replaced with the XMLQuery function. - <li>The text connector file processing has been replaced with the TEXTTABLE function. See <a href="https://jira.jboss.org/browse/TEIID-1102">TEIID-1102</a> and the <a href="teiid-docs/teiid_reference.pdf">Reference</a> guide for more information - <li>Double quoted values are now parsed as identifiers by default. See <a href="https://jira.jboss.org/browse/TEIID-145">TEIID-145</a> and the <a href="teiid-docs/teiid_reference.pdf">Reference</a> guide for more information. - <li>The system information schema has changed from System to SYS. The tables and table structures have also changed. See <a href="https://jira.jboss.org/browse/TEIID-871">TEIID-871</a> and the <a href="teiid-docs/teiid_reference.pdf">Reference</a> guide for more information. - <li>Client control over query plans has changed. OPTION PLANONLY, DEBUG, and SHOWPLAN are no longer allowed. This behavior should not be controlled by the SET statement, SET SHOWPLAN (ON|OFF|DEBUG) and SET NOEXEC (ON|OFF). Usage of the client PlanNode class will also need to be updated. - <li>Teiid specific JDBC client interfaces and methods have changed. In general these custom features have mostly been moved to other more standard locations or been removed. See <a href="https://jira.jboss.org/browse/TEIID-1020">TEIID-1020</a> and the <a href="teiid-docs/teiid_client_developers_guide.pdf">Client Developers</a> guide for more information. - <li>Teiid's reserved words have changed. Many of the Teiid specific reserved words have become non-reserved words. All of SQL Foundation and SQL/MED 2003, and SQL/XML from SQL 2006 reserved words have been added as reserved words. It is generally required to double quote all reserved words. It is advisable to double quote all non-reserved words as well. The use of the INPUT qualifier for procedure inputs has been deprecated in favor of INPUTS. The use of the USING qualifier for dynamic SQL inputs has been deprecated in favor of DVARS. - <li>The AdminApi has been redesigned for use with the new Translator/JCA split and for deployment in JBoss AS. - <li>The AdminShell is based on Groovy. Most BeanShell syntax is also valid in Groovy, but there are extensive changes in the AdminAPI that may necessitate rewriting scripts. - <li>OPTION NO CACHE <table list> will now only by-pass cache for the given tables at their immediate view layer. Previously all caches would have transitively been skipped. See <a href="https://jira.jboss.org/browse/TEIID-900">TEIID-900</a> for more information. - <li>Nan and +-Infinity are no longer allowed as numerical results by default. This may be changed via the system property org.teiid.allowNanInfinity. - <li>The scale of BigDecimal values is now adjusted to allow for more intuitive results. Conversion from floating numeric types will preserve the approximate scale and division results will allow for additional scale. See <a href="https://jira.jboss.org/browse/TEIID-159">TEIID-159</a> for more information. - <li>The 7.0 client is not compatible with 6.x or vice versa. It is expected that 7.0 clients will be compatible with 7.x releases for standard JDBC operations. -</ul> - -<h2><a name="Configuration">Configuration Issues</a></h2> - -See the <a href="teiid-docs/teiid_admin_guide.pdf">Admin Guide</a> for more on configuration and installation. - -<h4>from 7.3</h4> -<ul> - <LI>The default value for the JDBC dynamic vdb importer setting importer.useFullSchemaName is now true, which matches the expected behavior from the documentation. - <LI>The prepared plan cache is now configured via the PreparedPlanCacheConfig bean, rather than through properties on the RuntimeEngineDeployer - <LI>SocketConfiguration.maxSocketThreads will interpret a setting of 0 to mean use the system default of max available processors. Both the ODBC and JDBC transports now default to the 0 setting. - <LI>maxReserveBatchColumns and maxProcessingBatchesColumns will interpret a setting of -1 to mean auto-calculate acceptable values given the max heap and other information. See the admin guide for more. - <LI>The default for org.teiid.useValueCache has changed to false, since typical installations will not greatly benefit from the additional lookup cost. - <LI>The property RuntimeEngineDeployer.allowFunctionCallsByDefault was added so that Teiid 7.4 behavior is compatible with Teiid 7.3. Set this property to false to require permissions for function calls when data roles are enabled. -</ul> - -<h4>from 7.2</h4> -<ul> - <LI>Temporary tables can now be restricted by data roles. Use the data-role attribute allow-create-temporary-tables to explicitly enable or disable the usage of temporary tables. -There is also a allowCreateTemporaryTablesByDefault property in the teiid-jboss-beans.xml to control whether usage is allowed by default. For compatibility with prior 7.x releases, the default is to allow -temporary table access. -</ul> - -<h4>from 7.1</h4> -<ul> - <li>Teiid clients now allow the usage of anonymous SSL by default. - This changes allows the admin port (default 31443) to use anonymous SSL by default, rather than just securing login traffic. - Admin clients should therefore use the mms protocol instead of mm. This will encrypt all admin traffic and ensure that any passwords in configuration files will - be encrypted in transit. See the Admin Guide to upgrade from anonymous SSL to 1-way or 2-way authentication. - The config properties sslEnabled and clientEncryptionEnabled for SSLConfiguration beans have been combined to a single property mode, that can have the values disabled|login|enabled. - <li>Apache CXF is now expected to be used as the web services stack provider through JBossWS-CXF. See the Admin Guide for instructions on - installing CXF for use with Teiid's Salesforce and web service connectors. The WS Resource Adapter's -ds.xml files should no longer use - WSSecurityConfigURL and WSSecurityConfigName, rather they should be ConfigFile and ConfigName respectively. The property values should no longer - refer to jboss-wsse-client.xml, but instead they should reference a CXF Spring configuration file and particular port configuration. See the Admin Guide - for more on using CXF configuration files. - <li>The default for data role checking is now "true". However only VDBs with data roles will have roles enforced. - <li>The default prepared plan cache size was increased to 512, since it is targeted by internal plans as well. -</ul> - -<h4>from 7.0</h4> -<ul> - <li>The property to enable data roles in teiid-jboss-beans.xml has changed from useEntitlements to useDataRoles. - <li>Rar file names no longer contain version numbers. -ds.xml files should be updated from connector-XXX-version.rar to teiid-connector-XXX.rar - <li>Code table relate configuration properties have been removed. Code tables are now implemented as materialized views. -</ul> - -<h4>from 6.2</h4> -<ul> - <li>A JBoss AS instance is now required. Embedded mode is also currently not supported.</li> - <li>Engine configuration is now handled through the admin console or deploy/teiid/teiid-jboss-beans.xml - <li>Logging is now done through the container's log4j instance. Any Teiid specific logging changes, see the conf/jboss-teiid-log4j.xml, need to be incorporated into the master jboss-log4j.xml. -</ul> - -<h2><a name="Other">Other Issues</a></h2> -<ul> - <li>TEIID-1170 - correlated subqueries are not allowed in UPDATEs or DELETEs against internal Teiid tables (internal materialized views or temporary tables). - <li>TEIID-1281 - Negative start indexing is not supported by DB2 and Derby databases. Usage of the Teiid SUBSTRING against these sources should not use negative start values. - <li>TEIID-1008 - Most versions of Oracle and MySQL do not support deeply nested correlated references. There is currently no workaround for this issue. - <li>For compatibility with the 7.0 release if a stored procedure parameter list begins with identifier=, then it will be parsed as a named parameter invocation even if the intent was to use a comparison predicate - as the first parameter value. The workaround is to use nesting parens, e.g. call proc((identifier=value), ...), which clarifies that this is positional value. This workaround will not be needed in later releases. - <li><a url="https://issues.jboss.org/browse/TEIID-1511">TEIID-1511<a/> - When a VDB is deployed and undeployed a socket is left open, which may lead to "too manay open files". Check the defect comments for details. -</ul> -<h4>from 7.0</h4> -<ul> - <li>Fixed xsd type handling for SQL/XML and XML document models. xsd:date, xsd:dateTime, and xsd:time types will now all be displayed using the GMT timezone (Z). SQL types, such as timestamp, used for an XMLTABLE column will now expect their values to be in the form of the corresponding xsd type. -</ul> -<h4>From 6.2</h4> -<ul> - <li>Start time is now significantly longer due to the container deployment. However many operations can be performed on configruation files that will trigger a redeployment without the need for a restart. - <li>Inversion of parse, format, and convert system functions is not used if it can be narrowing. In situations where a predicate has the form: parseTime(column, 'format') = {t 'time value'} may lead to reduced performance, since - the parseTime function cannot be pushed down. This should be addressed in future releases. -</ul> - -<h2><a name="LibraryUpdates">Thirdparty Library Updates</a></h2> - -The following components have been updated: -<h4>From 7.1</h4> -<ul> - <li>json-simple 1.1 was added. - <li>Netty was upgraded to 3.2.1 -</ul> -<h4>From 7.0</h4> -<ul> - <li>Direct integration of JBossCache jars was removed. - <li>Netty was upgraded to 3.2.0 - <li>JDOM was removed. -</ul> -<h4>From 6.2</h4> -<ul> - <li>Netty was upgraded to 3.1.5 - <li>Saxon was upgraded to 9.1.0.8 - <li>A 5.1 container's version of Arjuna is newer than what was previously included in Teiid 6.x. - <li>Various other dependencies have been removed as they are no longer needed or now provided by the container. -</ul> - -<h2><a name="Details">Detailed Release Notes</a></h2> - Detailed Release Notes - Teiid - Version ${project.version} - -<h2><a name="Documentation">Documentation and Help</a></h2> - -The <a href="http://www.jboss.org/teiid/">Teiid community project</a> is hosted on jboss.org. -Documentation and help may be obtained from the local distribution under <a href="teiid-docs">teiid-docs</a> or the following locations. -<ul> - -<li><a href="http://www.jboss.org/teiid/docs">Online Documentation</a></li> -<li><a href="https://community.jboss.org/wiki/TheTeiidProject">Wiki</a></li> -<li><a href="http://jira.jboss.org/jira/browse/TEIID">JIRA</a></li> -<li><a href="http://community.jboss.org/en/teiid?view=discussions">Forums</a></li> -</ul> - - -<h2><a name="Licenses">Licenses</a></h2> - -<p>Teiid is licensed under the <a href="LICENSE-lgpl-2.1.txt">LGPL</a>. The -license texts for Teiid and the thirdparty components it uses may be found in the <a href="teiid-docs/licenses">teiid-docs/licenses</a> -directory of the distribution. - -</p> - -<h2><a name="About">About JBoss, a -division of Red Hat</a></h2> - -<p>JBoss, a division of <a href="http://www.redhat.com/jboss/">Red -Hat</a>, is in the business of -providing -superior technical support to our customers. Our goal is to make -Professional Open Source™ the <b>SAFE -CHOICE</b> -for you. We accomplish this by backing up our open source Java products -with technical support services that are delivered by the core -developers themselves. We can help you to train your staff and provide -you with support at every stage of the application lifecycle - from -development and integration through deployment and maintenance. Visit -the <a href="http://www.jboss.com/services/index">JBoss -Services</a> page for more -information.</p> - -</BODY> -</HTML> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/build/kits/jboss-container/teiid-releasenotes.html (from rev 3168, branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html) =================================================================== --- tags/teiid-parent-7.4.0.Final/build/kits/jboss-container/teiid-releasenotes.html (rev 0) +++ tags/teiid-parent-7.4.0.Final/build/kits/jboss-container/teiid-releasenotes.html 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,520 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<HTML> +<HEAD> + <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8"> + <TITLE>Teiid ${project.version} Release Notes</TITLE> + <META NAME="CHANGEDBY" CONTENT="Steve Hawkins"> + </STYLE> +</HEAD> +<BODY LANG="en-US" DIR="LTR"> +<P><A HREF="http://www.teiid.org/"><IMG SRC="https://www.jboss.org/dms/teiid/images/teiid-banner.png" NAME="graphics1" ALT="Teiid" ALIGN=BOTTOM WIDTH=800></A> + +<H1>Teiid ${project.version} Release Notes</H1> +<P>Teiid ${project.version} adds performance, integration, and runtime metadata update features. + +<H2>Overview</H2> +<UL> + <LI><A HREF="#Highlights">Highlights</A> + <LI><A HREF="#Compatibility">Compatibility Issues</A> + <LI><A HREF="#Configuration">Configuration Issues</A> + <LI><A HREF="#Other">Other Issues</A> + <LI><A HREF="#LibraryUpdates">Thirdparty Library Updates</A> + <LI><A HREF="#Details">Detailed Release Notes</A> + <LI><A HREF="#Documentation">Additional Docs and Help</A> + <LI><A HREF="#Licenses">Licenses</A> + <LI><A HREF="#About">About JBoss</A> +</UL> +<H2><A NAME="Highlights"></A>Highlights</H2> +<UL> + <LI><B>Virtual procedure out params</B> - virtual procedures can now have RETURN/OUT/INOUT parameters to return values. + <LI><B>OLAP</B> - OLAP translator is now part of Teiid kit using OLAP4J + <LI><B>Multi-source procedures</B> - multi-source handling was expanded to cover stored procedure execution. See the Reference for more. + <LI><B>Function Support</B> - additional system functions were made available. + <UL> + <LI><B>uuid</B> was added to generate type 4 UUIDs and the Hibernate dialect was updated to support the GUIDGenerator. + <LI><B>array_get</B> was added to extract values from java.sql.Array or java array values. + <LI><B>array_length</B> was added to get the length of java.sql.Array or java array values. + </UL> + <LI><B>ARRAYTABLE</B> - the ARRAYTABLE table function was added to simplify array value extraction into a tabular format. + <LI><B>Ingres</B> - Ingres database translator is now available to use as supported source under Teiid. + <LI><B>Optional Join Enhancements</B> - the optional join hint no longer requires the use of ANSI joins and can will not remove optional bridging tables that are used by two other tables that are required. + <LI><B>InterSystems Cache</B> - InterSystems Cache database translator is now available to use as supported source under Teiid. + <LI><B>userRequestSourceConcurrency</B> - was added to control the number of concurrent source queries allowed for each user request. + <LI><B>Memory Management Improvements</B> - maxReserveBatchColumns and maxProcessingBatchesColumns will be default be determined automatically and will more reliably prevent memory issues. See the admin guide for more. + <LI><B>Subquery optimization control</B> - added the MJ and NO_UNNEST hints and the org.teiid.subqueryUnnestDefault system property to control the optimization of subqueries to traditional joins or to a merge join implementation of a semijoin or antijoin. + <LI><B>Local connection threads</B> - local connection calling threads will be used to process work rather than using an engine thread. This helps decouple the configuration of maxThreads. + <LI><B>Dependent Join Improvements</B> - several major improvements were made to increase performance and develop better plans. + <UL> + <LI><B>Improved Planning</B> - the decision to create a dependent join is now considered earlier in planning and is much more effective for dependent joins involving multiple unrelated independent tables. + <LI><B>IN predicate splitting</B> - the planner can now split large dependent IN predicates into multiple IN predicates, which is controlled by the translator property MaxDepdendentInPredicates. This allows for much larger dependent joins to be performed as a single query. + <LI><B>Dependent query parallelization</B> - when multiple dependent queries are still required, then they will be run in parallel (up to MaxUserSourceRequestConcurrency), rather than sequentially. + <LI><B>Cost based back-off</B> - for cost based dependent joins if the number of independent values is too large, then the join will be performed as normal. + </UL> + <LI><B>Enhanced Sort Join</B> - the partitioned merge join was replaced with an enhanced sort join. The enhanced sort join will use the actual row counts from each side of the relation to perform a index based join if one side is small enough, a partial sort of the larger side and a repeated merge join if the tuples are unbalanced but one side is not small enough to form an index, or a standard sort merge join if the tuples are balanced. + <LI><B>JDK1.5 JDBC Client JAR</B> - A retro-translated Teiid client JDBC jar now available to use with JDK 1.5 VM. Note only the JDBC API is supported, not the Admin API, or retrieving query plans as XML. + <LI><B>Security Improvements</B> - UDF and pushdown functions can now be protected with data roles. Also the CommandContext can provide the Subject for custom security checks in UDFs. + <LI><B>Cache Invalidation</B> - Prepared plan and result set caches have will invalidate entries based upon metadata and data changes respectively. See the cache configuration maxStaleness setting and the Admin and Developer Guides for more. + <LI><B>Runtime Updates of Metadata</B> - ALTER statements have been added to change view/procedure/INSTEAD OF trigger (update procedure) definitions. A CREATE TRIGGER statement is also available to add an INSTEAD OF trigger (update procedures) to views. + System procedures were added to set extension metadata and stat values. By default all effects of metadata updates happen only on running vdbs across the cluster. To make the changes persistent see the Developers Guide Runtime Updates section. +</UL> + +<h2><a name="Compatibility">Compatibility Issues</a></h2> +<ul> + <li>TRANSLATE/HAS CRITERIA has been deprecated. An alternative approach to update procedures will be introduced in a subsequent version. + <li>Support for named parameter syntax using param=value has been deprecated, since it is ambiguous with a comparison predicate boolean value expression. param<b>=></b>value should be used instead. +</ul> + +<h4>from 7.3</h4> +<ul> + <li>SYS.PROPERTIES has a new column, ClobValue, to get values exceeding the max string length + <li>SYS.COLUMNS has two new columns to get statistical information: DistinctCount and NullCount + <li>ARRAY_AGG is now a reserved word</li> + <li>The use of an IN procedure parameter with the name "source_name" in a multi-source model, will now be treated the parameter that controls which source + the procedure will execute against. + <li>Dynamic VDB functions injected via ExecutionFactory.getPushdownFunctions are now scoped to the SYS schema and have a fully qualified name that includes their source type. For example, instead of oracle_model.relate - which was only valid against the oracle_model source, there is now the SYS.oracle_sdo.relate function that is valid for all Oracle sources. Any fully-qualified reference to these functions will need updated. +</ul> + +<h4>from 7.2</h4> +<ul> + <li>The default JDBC credentials are user/user - not admin/teiid + <li>Unordered limits are no longer pushed through conditions, dup removal, or UNION not all. This prevents the possibility of getting less results than the logical intent of the limit. +</ul> + +<h4>from 7.1</h4> +<ul> + <li>Subqueries are no longer allowed to be SELECT INTO. + <li>INSERT/UPDATE/DELETE cannot be used to create implicit return cursors in non-update virtual procedures. You can instead use "UPDATE ...; SELECT VARIABLES.ROWCOUNT;". + <li>The SYSADMIN schema was created to hold procedures and tables that should not be generally accessible. SYS and pg_catalog are now always accessible - permissions do not apply to these schemas. The SYS.getBinaryVDBResource, SYS.getCharacterVDBResource, and SYS.getVDBResourcePaths have been replaced with the + SYSADMIN.VDBResources table. The Matviews table and the refreshMatView/refreshMatViewRow procedures were also moved into SYSADMIN. + <li>Overwriting an existing VDB will cause old connections to be terminated. Production systems should rely on VDB versioning. + <li>The jdbc:metamatrix JDBC URL prefix is no longer accepted. Use jdbc:teiid instead. + <li>Model visibility no longer restricts access to tables and procedures. Setting visible to false will only hide entries from system tables. Data roles should be used to restrict data access. + <li>Admin API "getWorkManagerStats" methods renamed to "getWorkerPoolStats". Also, "setRuntimeProperty" and "getProcesses" methods were removed. + <li>By default the "ENV" system function is now turned off. To enable it, edit the teiid-jboss-beans.xml configuration file. + <li>The use of VARIABLES.ROWCOUNT is now reserved. + <li>Exec statements of the form "var = EXEC foo()" are only valid if the procedure foo has a return parameter. + <li>Cache hint now supports "scope" definition. For ex: /* cache(scope:user) */ select * from T1; This hint will override the computed scope based on the query. +</ul> +<h4>from 7.0</h4> +<ul> + <li>The term data policy was replaced with data role. The AdminAPI methods for adding role mappings have changed from addRoleToDataPolicy and removeRoleFromDataPolicy to addDataRoleMapping and removeDataRoleMapping respectively. +</ul> +<h4>from 6.2</h4> +<ul> + <li>The connector API has changed substantially. Custom connectors need to be retargeted to the new Translator API. See <a href="https://jira.jboss.org/browse/TEIID-1003">TEIID-1003</a> and the <a href="teiid-docs/teiid_developers_guide.pdf">Developer's Guide</a> for more information. + <li>Connector bindings are no longer valid. Use the Designer Tooling or see the AdminShell download for a migration utility. + <li>Calling out to web services and xml processing has been dramatically simplified and improved, but is a breaking change from prior releases. + XML/Relational processing has been replaced by XMLTABLE, retrieving XML from file has been replaced by the File Translator/Resource Adapter, and + web service calls have been replaced by the WS Translator/Resource Adapter. See <a href="https://jira.jboss.org/browse/TEIID-1118">TEIID-1118</a>, <a href="https://jira.jboss.org/browse/TEIID-1114">TEIID-1114</a>, and the <a href="teiid-docs/teiid_reference.pdf">Reference</a> guide for more information. + <li>The direct usage of XQuery has been replaced with the XMLQuery function. + <li>The text connector file processing has been replaced with the TEXTTABLE function. See <a href="https://jira.jboss.org/browse/TEIID-1102">TEIID-1102</a> and the <a href="teiid-docs/teiid_reference.pdf">Reference</a> guide for more information + <li>Double quoted values are now parsed as identifiers by default. See <a href="https://jira.jboss.org/browse/TEIID-145">TEIID-145</a> and the <a href="teiid-docs/teiid_reference.pdf">Reference</a> guide for more information. + <li>The system information schema has changed from System to SYS. The tables and table structures have also changed. See <a href="https://jira.jboss.org/browse/TEIID-871">TEIID-871</a> and the <a href="teiid-docs/teiid_reference.pdf">Reference</a> guide for more information. + <li>Client control over query plans has changed. OPTION PLANONLY, DEBUG, and SHOWPLAN are no longer allowed. This behavior should not be controlled by the SET statement, SET SHOWPLAN (ON|OFF|DEBUG) and SET NOEXEC (ON|OFF). Usage of the client PlanNode class will also need to be updated. + <li>Teiid specific JDBC client interfaces and methods have changed. In general these custom features have mostly been moved to other more standard locations or been removed. See <a href="https://jira.jboss.org/browse/TEIID-1020">TEIID-1020</a> and the <a href="teiid-docs/teiid_client_developers_guide.pdf">Client Developers</a> guide for more information. + <li>Teiid's reserved words have changed. Many of the Teiid specific reserved words have become non-reserved words. All of SQL Foundation and SQL/MED 2003, and SQL/XML from SQL 2006 reserved words have been added as reserved words. It is generally required to double quote all reserved words. It is advisable to double quote all non-reserved words as well. The use of the INPUT qualifier for procedure inputs has been deprecated in favor of INPUTS. The use of the USING qualifier for dynamic SQL inputs has been deprecated in favor of DVARS. + <li>The AdminApi has been redesigned for use with the new Translator/JCA split and for deployment in JBoss AS. + <li>The AdminShell is based on Groovy. Most BeanShell syntax is also valid in Groovy, but there are extensive changes in the AdminAPI that may necessitate rewriting scripts. + <li>OPTION NO CACHE <table list> will now only by-pass cache for the given tables at their immediate view layer. Previously all caches would have transitively been skipped. See <a href="https://jira.jboss.org/browse/TEIID-900">TEIID-900</a> for more information. + <li>Nan and +-Infinity are no longer allowed as numerical results by default. This may be changed via the system property org.teiid.allowNanInfinity. + <li>The scale of BigDecimal values is now adjusted to allow for more intuitive results. Conversion from floating numeric types will preserve the approximate scale and division results will allow for additional scale. See <a href="https://jira.jboss.org/browse/TEIID-159">TEIID-159</a> for more information. + <li>The 7.0 client is not compatible with 6.x or vice versa. It is expected that 7.0 clients will be compatible with 7.x releases for standard JDBC operations. +</ul> + +<h2><a name="Configuration">Configuration Issues</a></h2> + +See the <a href="teiid-docs/teiid_admin_guide.pdf">Admin Guide</a> for more on configuration and installation. + +<h4>from 7.3</h4> +<ul> + <LI>The default value for the JDBC dynamic vdb importer setting importer.useFullSchemaName is now true, which matches the expected behavior from the documentation. + <LI>The prepared plan cache is now configured via the PreparedPlanCacheConfig bean, rather than through properties on the RuntimeEngineDeployer + <LI>SocketConfiguration.maxSocketThreads will interpret a setting of 0 to mean use the system default of max available processors. Both the ODBC and JDBC transports now default to the 0 setting. + <LI>maxReserveBatchColumns and maxProcessingBatchesColumns will interpret a setting of -1 to mean auto-calculate acceptable values given the max heap and other information. See the admin guide for more. + <LI>The default for org.teiid.useValueCache has changed to false, since typical installations will not greatly benefit from the additional lookup cost. + <LI>The property RuntimeEngineDeployer.allowFunctionCallsByDefault was added so that Teiid 7.4 behavior is compatible with Teiid 7.3. Set this property to false to require permissions for function calls when data roles are enabled. +</ul> + +<h4>from 7.2</h4> +<ul> + <LI>Temporary tables can now be restricted by data roles. Use the data-role attribute allow-create-temporary-tables to explicitly enable or disable the usage of temporary tables. +There is also a allowCreateTemporaryTablesByDefault property in the teiid-jboss-beans.xml to control whether usage is allowed by default. For compatibility with prior 7.x releases, the default is to allow +temporary table access. +</ul> + +<h4>from 7.1</h4> +<ul> + <li>Teiid clients now allow the usage of anonymous SSL by default. + This changes allows the admin port (default 31443) to use anonymous SSL by default, rather than just securing login traffic. + Admin clients should therefore use the mms protocol instead of mm. This will encrypt all admin traffic and ensure that any passwords in configuration files will + be encrypted in transit. See the Admin Guide to upgrade from anonymous SSL to 1-way or 2-way authentication. + The config properties sslEnabled and clientEncryptionEnabled for SSLConfiguration beans have been combined to a single property mode, that can have the values disabled|login|enabled. + <li>Apache CXF is now expected to be used as the web services stack provider through JBossWS-CXF. See the Admin Guide for instructions on + installing CXF for use with Teiid's Salesforce and web service connectors. The WS Resource Adapter's -ds.xml files should no longer use + WSSecurityConfigURL and WSSecurityConfigName, rather they should be ConfigFile and ConfigName respectively. The property values should no longer + refer to jboss-wsse-client.xml, but instead they should reference a CXF Spring configuration file and particular port configuration. See the Admin Guide + for more on using CXF configuration files. + <li>The default for data role checking is now "true". However only VDBs with data roles will have roles enforced. + <li>The default prepared plan cache size was increased to 512, since it is targeted by internal plans as well. +</ul> + +<h4>from 7.0</h4> +<ul> + <li>The property to enable data roles in teiid-jboss-beans.xml has changed from useEntitlements to useDataRoles. + <li>Rar file names no longer contain version numbers. -ds.xml files should be updated from connector-XXX-version.rar to teiid-connector-XXX.rar + <li>Code table relate configuration properties have been removed. Code tables are now implemented as materialized views. +</ul> + +<h4>from 6.2</h4> +<ul> + <li>A JBoss AS instance is now required. Embedded mode is also currently not supported.</li> + <li>Engine configuration is now handled through the admin console or deploy/teiid/teiid-jboss-beans.xml + <li>Logging is now done through the container's log4j instance. Any Teiid specific logging changes, see the conf/jboss-teiid-log4j.xml, need to be incorporated into the master jboss-log4j.xml. +</ul> + +<h2><a name="Other">Other Issues</a></h2> +<ul> + <li>TEIID-1170 - correlated subqueries are not allowed in UPDATEs or DELETEs against internal Teiid tables (internal materialized views or temporary tables). + <li>TEIID-1281 - Negative start indexing is not supported by DB2 and Derby databases. Usage of the Teiid SUBSTRING against these sources should not use negative start values. + <li>TEIID-1008 - Most versions of Oracle and MySQL do not support deeply nested correlated references. There is currently no workaround for this issue. + <li>For compatibility with the 7.0 release if a stored procedure parameter list begins with identifier=, then it will be parsed as a named parameter invocation even if the intent was to use a comparison predicate + as the first parameter value. The workaround is to use nesting parens, e.g. call proc((identifier=value), ...), which clarifies that this is positional value. This workaround will not be needed in later releases. + <li><a url="https://issues.jboss.org/browse/TEIID-1511">TEIID-1511<a/> - When a VDB is deployed and undeployed a socket is left open, which may lead to "too manay open files". Check the defect comments for details. +</ul> +<h4>from 7.0</h4> +<ul> + <li>Fixed xsd type handling for SQL/XML and XML document models. xsd:date, xsd:dateTime, and xsd:time types will now all be displayed using the GMT timezone (Z). SQL types, such as timestamp, used for an XMLTABLE column will now expect their values to be in the form of the corresponding xsd type. +</ul> +<h4>From 6.2</h4> +<ul> + <li>Start time is now significantly longer due to the container deployment. However many operations can be performed on configruation files that will trigger a redeployment without the need for a restart. + <li>Inversion of parse, format, and convert system functions is not used if it can be narrowing. In situations where a predicate has the form: parseTime(column, 'format') = {t 'time value'} may lead to reduced performance, since + the parseTime function cannot be pushed down. This should be addressed in future releases. +</ul> + +<h2><a name="LibraryUpdates">Thirdparty Library Updates</a></h2> + +The following components have been updated: +<h4>From 7.1</h4> +<ul> + <li>json-simple 1.1 was added. + <li>Netty was upgraded to 3.2.1 +</ul> +<h4>From 7.0</h4> +<ul> + <li>Direct integration of JBossCache jars was removed. + <li>Netty was upgraded to 3.2.0 + <li>JDOM was removed. +</ul> +<h4>From 6.2</h4> +<ul> + <li>Netty was upgraded to 3.1.5 + <li>Saxon was upgraded to 9.1.0.8 + <li>A 5.1 container's version of Arjuna is newer than what was previously included in Teiid 6.x. + <li>Various other dependencies have been removed as they are no longer needed or now provided by the container. +</ul> + +<h2><a name="Details">Detailed Release Notes</a></h2> + Detailed Release Notes - Teiid - Version ${project.version} + +<h2> Bug +</h2> +<ul> +<li>[<a href='https://issues.jboss.org/browse/TEIID-99'>TEIID-99</a>] - Stored procedures should work in multisource connector binding scenarios +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1163'>TEIID-1163</a>] - Provide LOB support in ODBC +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1164'>TEIID-1164</a>] - Getting the Procedure Parameter metadata is not supported in ODBC +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1432'>TEIID-1432</a>] - Getting SocketTimeout Exceptions on long running queries with CXF +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1458'>TEIID-1458</a>] - Wrong count(*) result when joining data from two models +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1466'>TEIID-1466</a>] - MySQL syntax error in cast from date to timestamp +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1467'>TEIID-1467</a>] - Procedures in Teiid are not Resolvable if Their Models are Marked as Not Visible +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1469'>TEIID-1469</a>] - EDS Teiid Plugin uses Invalid Datatype Mask for SessionID Parameter to Terminate Session Operation +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1470'>TEIID-1470</a>] - Deploying VDB XML file before data sources leads to failed deployment +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1476'>TEIID-1476</a>] - correct preventable exceptions +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1478'>TEIID-1478</a>] - various jdbc import issues +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1479'>TEIID-1479</a>] - Teiid Documentation does not include MS SQL Server as an available translator in section 10.2.2. JDBC Translator of the Reference Guide +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1480'>TEIID-1480</a>] - Teiid's ODBC interaction with PostgreSQL-ODBC fails when column lengths exceed 64K as PostgreSQL stores these values as a short +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1488'>TEIID-1488</a>] - EDS adminshell fails to connect to server with IBM JDK +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1489'>TEIID-1489</a>] - Teiid assumes fqns in transformations, but they are no longer required to be there +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1492'>TEIID-1492</a>] - StackOverflowError in DefaultCache +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1498'>TEIID-1498</a>] - Incorrect rewrite of not disjunctive criteria +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1502'>TEIID-1502</a>] - ODBC (and admin) scalability limited by maxWorker cap +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1503'>TEIID-1503</a>] - Exception during Optimization +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1504'>TEIID-1504</a>] - Internal Materialization does not honor the cache hint +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1505'>TEIID-1505</a>] - MaxActivePlans is not being read from the configuration +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1506'>TEIID-1506</a>] - ODBC Driver reporting BigInteger, BigDecimal columns as Strings +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1511'>TEIID-1511</a>] - VDB deployment leaves with too many open files +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1512'>TEIID-1512</a>] - show plan statement clob isn't readable +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1515'>TEIID-1515</a>] - ODBC does not report primarykeys on the tables +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1516'>TEIID-1516</a>] - IS_NULLABLE is reported incorrectly for columns +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1521'>TEIID-1521</a>] - Dynamic vdb import logic error with procedures +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1523'>TEIID-1523</a>] - Dynamic sql failure with null procedure parameters +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1528'>TEIID-1528</a>] - ruleimplementjoin strategy may generate an order by that does not use a relevant index +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1529'>TEIID-1529</a>] - LIMIT not pushed down for queries with subselects and ORDER BY +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1530'>TEIID-1530</a>] - ODBC identifer matching issues +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1531'>TEIID-1531</a>] - ODBC charset issues +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1532'>TEIID-1532</a>] - ODBC prepared statement handling can hang +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1534'>TEIID-1534</a>] - The driver incorrectly reports column labels as column names +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1537'>TEIID-1537</a>] - Error loading older cached metadata +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1538'>TEIID-1538</a>] - Invalid conversion from type class java.lang.Object with value 'oracle.sql.ROWID@1379cbd' to type class java.lang.String +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1545'>TEIID-1545</a>] - Order By not pushed down +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1548'>TEIID-1548</a>] - Creating XA data sources from AdminShell: prop name "addtional-ds-properties" has misspelling - could cause confusion +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1549'>TEIID-1549</a>] - aggregate unrelated order by error +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1553'>TEIID-1553</a>] - UDF Function model fails to load when it located inside a folder in the VDB +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1554'>TEIID-1554</a>] - NullPointerException in NodeEditor +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1555'>TEIID-1555</a>] - NPE on server when admin-console requests for the "vdb requests" +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1558'>TEIID-1558</a>] - Salesforce Connector gives NPE when the resultset is empty +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1561'>TEIID-1561</a>] - Database Calender is not correctly being set in JDBC Translator +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1562'>TEIID-1562</a>] - ArrayIndexOutOfBounds and ASSERTION FAILED in models with UNION +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1564'>TEIID-1564</a>] - Clustered Caching Not Working +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1566'>TEIID-1566</a>] - More complex join: ORDER BY and LIMIT not pushed down +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1567'>TEIID-1567</a>] - Sybase translator needs to handle CROSS JOIN syntax. +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1570'>TEIID-1570</a>] - pg catalog transformation issues +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1571'>TEIID-1571</a>] - Error due to merge virtual with join and group by +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1572'>TEIID-1572</a>] - Teiid ODBC does not handle SET and Show operations correctly +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1576'>TEIID-1576</a>] - unexpected query result when joining with a virtual procedure +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1577'>TEIID-1577</a>] - ArrayIndexOutOfBoundsException in queries with ORDER BY +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1578'>TEIID-1578</a>] - Set query to string should account for branch limits/order bys +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1579'>TEIID-1579</a>] - LocalServer Connection is not working +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1580'>TEIID-1580</a>] - CME on VDB deploy +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1583'>TEIID-1583</a>] - importer.useFullSchemaName property default value is incorrectly documented +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1584'>TEIID-1584</a>] - Querying a virtual table backed by a SELECT x,y,z FROM EXECT ... TEXTTABLE() call fails to return data +</li> +</ul> + +<h2> Enhancement +</h2> +<ul> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1473'>TEIID-1473</a>] - Don't batch more rows than is needed when query contains limit but translator does not support limit +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1482'>TEIID-1482</a>] - Prevent unnecessary rebuffering of sorted results +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1490'>TEIID-1490</a>] - In the process of loading the schema metadata and duplicate table is found, add a suggestion to the error message to use FQN option +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1519'>TEIID-1519</a>] - Changing dynamicportfolio example in the JBoss as kit to use HSQL instead of Derby +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1539'>TEIID-1539</a>] - Improve warning message when maximum thread count is encountered +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1556'>TEIID-1556</a>] - Improve xmlagg performance +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1569'>TEIID-1569</a>] - Documentation on creating UDF, extending ExecutionFactory and defining @Translator name should indicate what to do with the translator name +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1581'>TEIID-1581</a>] - Adding a JCA example for creating a Teiid Data Source to the kits +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1582'>TEIID-1582</a>] - Avoid buffering in enhanced sort merge join +</li> +</ul> + +<h2> Feature Request +</h2> +<ul> +<li>[<a href='https://issues.jboss.org/browse/TEIID-217'>TEIID-217</a>] - LDAP Connector should provide a way to retrieve all values of an attribute that appears multiple times within a search result +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-231'>TEIID-231</a>] - Ability to support Connector Level UDF functions in the System +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-239'>TEIID-239</a>] - ENHANCEMENT: Costing beyond cardinality sould be propogated +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-796'>TEIID-796</a>] - Allow for the import of overloaded procedures +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-946'>TEIID-946</a>] - add support for in/out out return params +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1011'>TEIID-1011</a>] - Add support for connecting to Mondrian +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1059'>TEIID-1059</a>] - Add a specific translator for Ingres +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1060'>TEIID-1060</a>] - Add a specific translator for Intersystems Cache +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1061'>TEIID-1061</a>] - Add a specific translator for SAP Business Warehouse +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1176'>TEIID-1176</a>] - Provide a non-blocking JDBC api for ODBC support +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1217'>TEIID-1217</a>] - Derive VDB Name Using Version During Deployment in Jopr +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1326'>TEIID-1326</a>] - API request: rewrite query/command before it reaches the teiid planner +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1327'>TEIID-1327</a>] - API request: Fine grained security +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1329'>TEIID-1329</a>] - API to force metadata read +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1437'>TEIID-1437</a>] - It's not possible to deploy single file (*.xml) virtual database through web admin console +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1463'>TEIID-1463</a>] - limit buffering for large results +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1464'>TEIID-1464</a>] - Add uuid function +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1471'>TEIID-1471</a>] - Projection should be minimized prior to view removal +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1474'>TEIID-1474</a>] - Add a limit to the number of concurrent source queries issued. +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1487'>TEIID-1487</a>] - CLONE - Add implicit conversion of NULL to correct datatype in transformation validator +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1491'>TEIID-1491</a>] - Provide JDBC 3.0 JRE 1.5 backwards compatibility +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1494'>TEIID-1494</a>] - Allow the optional join hint to work with non-ansi joins +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1496'>TEIID-1496</a>] - disjunctive rewrite +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1497'>TEIID-1497</a>] - misc subquery enhancements +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1507'>TEIID-1507</a>] - Cache invalidation +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1510'>TEIID-1510</a>] - RulePushAggregates should consider cost in addition to key information +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1533'>TEIID-1533</a>] - additional controls for dependent joins +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1536'>TEIID-1536</a>] - Local connections should use calling thread +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1546'>TEIID-1546</a>] - Be more selective as to what are created as bind variables +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1550'>TEIID-1550</a>] - Row level security enhancements +</li> +</ul> + +<h2> Quality Risk +</h2> +<ul> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1008'>TEIID-1008</a>] - Correlated subquery handling for Oracle/MySQL +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1281'>TEIID-1281</a>] - DB2 substring index bounds are different than teiid +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1493'>TEIID-1493</a>] - In a cluster the distributed cache is cleared by a node rejoining +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1508'>TEIID-1508</a>] - Dependent join planning problem +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1509'>TEIID-1509</a>] - Change the default for value caching +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1513'>TEIID-1513</a>] - Setting of translator properties should not be case sensitive +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1520'>TEIID-1520</a>] - Reduce the memory footprint of metadata +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1525'>TEIID-1525</a>] - update the hibernate usage with a note about id generation +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1527'>TEIID-1527</a>] - local connection doc provides an invalid example +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1535'>TEIID-1535</a>] - pg/odbc support should report rel oid with column metadata +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1574'>TEIID-1574</a>] - Add new permission types for alter/execute +</li> +</ul> + +<h2> Task +</h2> +<ul> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1431'>TEIID-1431</a>] - provide a working example of data roles +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1481'>TEIID-1481</a>] - client url cleanups +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1483'>TEIID-1483</a>] - Resolving changes to consolidate teiid/teiid designer handling +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1495'>TEIID-1495</a>] - Validate the TeraData Translator +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1514'>TEIID-1514</a>] - testZipFile.zip contains absolute path which impacted the MEAD sign +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1551'>TEIID-1551</a>] - ODBC logging context is not documented +</li> +</ul> + +<h2> Sub-task +</h2> +<ul> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1524'>TEIID-1524</a>] - Index metadata strings container their entire record line. +</li> +</ul> + +<h2><a name="Documentation">Documentation and Help</a></h2> + +The <a href="http://www.jboss.org/teiid/">Teiid community project</a> is hosted on jboss.org. +Documentation and help may be obtained from the local distribution under <a href="teiid-docs">teiid-docs</a> or the following locations. +<ul> + +<li><a href="http://www.jboss.org/teiid/docs">Online Documentation</a></li> +<li><a href="https://community.jboss.org/wiki/TheTeiidProject">Wiki</a></li> +<li><a href="http://jira.jboss.org/jira/browse/TEIID">JIRA</a></li> +<li><a href="http://community.jboss.org/en/teiid?view=discussions">Forums</a></li> +</ul> + + +<h2><a name="Licenses">Licenses</a></h2> + +<p>Teiid is licensed under the <a href="LICENSE-lgpl-2.1.txt">LGPL</a>. The +license texts for Teiid and the thirdparty components it uses may be found in the <a href="teiid-docs/licenses">teiid-docs/licenses</a> +directory of the distribution. + +</p> + +<h2><a name="About">About JBoss, a +division of Red Hat</a></h2> + +<p>JBoss, a division of <a href="http://www.redhat.com/jboss/">Red +Hat</a>, is in the business of +providing +superior technical support to our customers. Our goal is to make +Professional Open Source™ the <b>SAFE +CHOICE</b> +for you. We accomplish this by backing up our open source Java products +with technical support services that are delivered by the core +developers themselves. We can help you to train your staff and provide +you with support at every stage of the application lifecycle - from +development and integration through deployment and maintenance. Visit +the <a href="http://www.jboss.com/services/index">JBoss +Services</a> page for more +information.</p> + +</BODY> +</HTML> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/build/pom.xml =================================================================== --- branches/7.4.x/build/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/build/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,136 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid</artifactId> - <name>Build</name> - <description>Teiid Build</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client-jdk15</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>net.sf.retrotranslator</groupId> - <artifactId>retrotranslator-runtime</artifactId> - <version>1.2.9</version> - </dependency> - - <dependency> - <groupId>net.sf.retrotranslator</groupId> - <artifactId>retrotranslator-transformer</artifactId> - <version>1.2.9</version> - </dependency> - </dependencies> - <build> - <outputDirectory>target/kits</outputDirectory> - <resources> - <resource> - <directory>kits</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - <include>**/*.sh</include> - <include>**/*.bat</include> - <include>**/*.html</include> - </includes> - </resource> - <resource> - <directory>kits</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - <exclude>**/*.sh</exclude> - <exclude>**/*.bat</exclude> - <exclude>**/*.html</exclude> - </excludes> - </resource> - </resources> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - - <configuration> - <descriptors> - <descriptor>assembly/client-jar.xml</descriptor> - <descriptor>assembly/jboss-container/dist.xml</descriptor> - <descriptor>assembly/adminshell/adminshell-dist.xml</descriptor> - </descriptors> - </configuration> - - <executions> - <execution> - <id>create-assemblies</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> - <profile> -  - <id>release</id> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>assembly/src.xml</descriptor> - <descriptor>assembly/docs.xml</descriptor> - <descriptor>assembly/client-jar.xml</descriptor> - <descriptor>assembly/jboss-container/dist.xml</descriptor> - <descriptor>assembly/adminshell/adminshell-dist.xml</descriptor> - </descriptors> - </configuration> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.1.1</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>java</goal> - </goals> - <configuration> - <mainClass>net.sf.retrotranslator.transformer.Retrotranslator</mainClass> - <arguments> - <argument>-srcjar</argument> - <argument>${pom.basedir}/target/teiid-${pom.version}-client.jar</argument> - <argument>-destjar</argument> - <argument>${pom.basedir}/target/teiid-${pom.version}-client-jdk15.jar</argument> - <argument>-embed</argument> - <argument>org.teiid.retroruntime</argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/build/pom.xml (from rev 3169, branches/7.4.x/build/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/build/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/build/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,136 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid</artifactId> + <name>Build</name> + <description>Teiid Build</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client-jdk15</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>net.sf.retrotranslator</groupId> + <artifactId>retrotranslator-runtime</artifactId> + <version>1.2.9</version> + </dependency> + + <dependency> + <groupId>net.sf.retrotranslator</groupId> + <artifactId>retrotranslator-transformer</artifactId> + <version>1.2.9</version> + </dependency> + </dependencies> + <build> + <outputDirectory>target/kits</outputDirectory> + <resources> + <resource> + <directory>kits</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + <include>**/*.sh</include> + <include>**/*.bat</include> + <include>**/*.html</include> + </includes> + </resource> + <resource> + <directory>kits</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + <exclude>**/*.sh</exclude> + <exclude>**/*.bat</exclude> + <exclude>**/*.html</exclude> + </excludes> + </resource> + </resources> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + + <configuration> + <descriptors> + <descriptor>assembly/client-jar.xml</descriptor> + <descriptor>assembly/jboss-container/dist.xml</descriptor> + <descriptor>assembly/adminshell/adminshell-dist.xml</descriptor> + </descriptors> + </configuration> + + <executions> + <execution> + <id>create-assemblies</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + <profile> +  + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>assembly/src.xml</descriptor> + <descriptor>assembly/docs.xml</descriptor> + <descriptor>assembly/client-jar.xml</descriptor> + <descriptor>assembly/jboss-container/dist.xml</descriptor> + <descriptor>assembly/adminshell/adminshell-dist.xml</descriptor> + </descriptors> + </configuration> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.1.1</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>java</goal> + </goals> + <configuration> + <mainClass>net.sf.retrotranslator.transformer.Retrotranslator</mainClass> + <arguments> + <argument>-srcjar</argument> + <argument>${pom.basedir}/target/teiid-${pom.version}-client.jar</argument> + <argument>-destjar</argument> + <argument>${pom.basedir}/target/teiid-${pom.version}-client-jdk15.jar</argument> + <argument>-embed</argument> + <argument>org.teiid.retroruntime</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/cache-jbosscache/pom.xml =================================================================== --- branches/7.4.x/cache-jbosscache/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/cache-jbosscache/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-cache-jbosscache</artifactId> - <name>JBoss Cache</name> - <description>JBossCache provider.</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.man</groupId> - <artifactId>jboss-managed</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/cache-jbosscache/pom.xml (from rev 3169, branches/7.4.x/cache-jbosscache/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/cache-jbosscache/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/cache-jbosscache/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-cache-jbosscache</artifactId> + <name>JBoss Cache</name> + <description>JBossCache provider.</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-managed</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/client/pom.xml =================================================================== --- branches/7.4.x/client/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/client/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-client</artifactId> - <name>Client</name> - <description>Contains the packages related to communication, administrative api, - sessioning and transport level messaging.</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.man</groupId> - <artifactId>jboss-managed</artifactId> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/client/pom.xml (from rev 3169, branches/7.4.x/client/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/client/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/client/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-client</artifactId> + <name>Client</name> + <description>Contains the packages related to communication, administrative api, + sessioning and transport level messaging.</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-managed</artifactId> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/client-jdk15/pom.xml =================================================================== --- branches/7.4.x/client-jdk15/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/client-jdk15/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-client-jdk15</artifactId> - <name>Client JDK15</name> - <description>Contains the packages related retrotranslator that will convert 1.6 to 1.5</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - </dependency> - </dependencies> -</project> Copied: tags/teiid-parent-7.4.0.Final/client-jdk15/pom.xml (from rev 3169, branches/7.4.x/client-jdk15/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/client-jdk15/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/client-jdk15/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-client-jdk15</artifactId> + <name>Client JDK15</name> + <description>Contains the packages related retrotranslator that will convert 1.6 to 1.5</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + </dependency> + </dependencies> +</project> Deleted: tags/teiid-parent-7.4.0.Final/common-core/pom.xml =================================================================== --- branches/7.4.x/common-core/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/common-core/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-common-core</artifactId> - <name>Common Core</name> - <description>Core shared library</description> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>process-resources</phase> - <configuration> - <tasks> - <tstamp /> - <replace dir="${project.build.outputDirectory}" token="@build-date@" value="${DSTAMP}"> - <include name="**/*.properties" /> - </replace> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/common-core/pom.xml (from rev 3169, branches/7.4.x/common-core/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/common-core/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/common-core/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-common-core</artifactId> + <name>Common Core</name> + <description>Core shared library</description> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>process-resources</phase> + <configuration> + <tasks> + <tstamp /> + <replace dir="${project.build.outputDirectory}" token="@build-date@" value="${DSTAMP}"> + <include name="**/*.properties" /> + </replace> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/connectors/connector-file/pom.xml =================================================================== --- branches/7.4.x/connectors/connector-file/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/connectors/connector-file/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>connector-file</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>File Connector</name> - <packaging>rar</packaging> - <description>This connector reads data from files.</description> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>build_jar</id> - <phase>process-classes</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - <execution> - <id>deploy_jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classifier>lib</classifier> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/connectors/connector-file/pom.xml (from rev 3169, branches/7.4.x/connectors/connector-file/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/connectors/connector-file/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/connectors/connector-file/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>connector-file</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>File Connector</name> + <packaging>rar</packaging> + <description>This connector reads data from files.</description> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>build_jar</id> + <phase>process-classes</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + <execution> + <id>deploy_jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>lib</classifier> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/connectors/connector-ldap/pom.xml =================================================================== --- branches/7.4.x/connectors/connector-ldap/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/connectors/connector-ldap/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,57 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>connector-ldap</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>LDAP Connector</name> - <description>LDAP Connector</description> - <packaging>rar</packaging> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>build_jar</id> - <phase>process-classes</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - <execution> - <id>deploy_jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classifier>lib</classifier> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/connectors/connector-ldap/pom.xml (from rev 3169, branches/7.4.x/connectors/connector-ldap/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/connectors/connector-ldap/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/connectors/connector-ldap/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,57 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>connector-ldap</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>LDAP Connector</name> + <description>LDAP Connector</description> + <packaging>rar</packaging> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>build_jar</id> + <phase>process-classes</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + <execution> + <id>deploy_jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>lib</classifier> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/connectors/connector-salesforce/pom.xml =================================================================== --- branches/7.4.x/connectors/connector-salesforce/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/connectors/connector-salesforce/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>connector-salesforce</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>Salesforce Connector</name> - <packaging>rar</packaging> - <description>Integrates the query engine with Salesforce.com.</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>salesforce-api</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>translator-salesforce</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxws</artifactId> - <version>2.2.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http</artifactId> - <version>2.2.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-security</artifactId> - <version>2.2.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-policy</artifactId> - <version>2.2.2</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>build_jar</id> - <phase>process-classes</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - <execution> - <id>deploy_jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classifier>lib</classifier> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/connectors/connector-salesforce/pom.xml (from rev 3169, branches/7.4.x/connectors/connector-salesforce/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/connectors/connector-salesforce/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/connectors/connector-salesforce/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>connector-salesforce</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>Salesforce Connector</name> + <packaging>rar</packaging> + <description>Integrates the query engine with Salesforce.com.</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>salesforce-api</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>translator-salesforce</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxws</artifactId> + <version>2.2.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http</artifactId> + <version>2.2.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-security</artifactId> + <version>2.2.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-policy</artifactId> + <version>2.2.2</version> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>build_jar</id> + <phase>process-classes</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + <execution> + <id>deploy_jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>lib</classifier> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/connectors/connector-ws/pom.xml =================================================================== --- branches/7.4.x/connectors/connector-ws/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/connectors/connector-ws/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>connector-ws</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>Web Service Connector</name> - <packaging>rar</packaging> - <description>This connector reads data from Web Services</description> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxws</artifactId> - <version>2.2.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http</artifactId> - <version>2.2.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-security</artifactId> - <version>2.2.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-policy</artifactId> - <version>2.2.2</version> - <scope>provided</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>build_jar</id> - <phase>process-classes</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - <execution> - <id>deploy_jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classifier>lib</classifier> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> Copied: tags/teiid-parent-7.4.0.Final/connectors/connector-ws/pom.xml (from rev 3169, branches/7.4.x/connectors/connector-ws/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/connectors/connector-ws/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/connectors/connector-ws/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>connector-ws</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>Web Service Connector</name> + <packaging>rar</packaging> + <description>This connector reads data from Web Services</description> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxws</artifactId> + <version>2.2.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http</artifactId> + <version>2.2.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-security</artifactId> + <version>2.2.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-policy</artifactId> + <version>2.2.2</version> + <scope>provided</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>build_jar</id> + <phase>process-classes</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + <execution> + <id>deploy_jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>lib</classifier> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Deleted: tags/teiid-parent-7.4.0.Final/connectors/pom.xml =================================================================== --- branches/7.4.x/connectors/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/connectors/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,91 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-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> - <module>translator-olap</module> - </modules> -</project> Copied: tags/teiid-parent-7.4.0.Final/connectors/pom.xml (from rev 3169, branches/7.4.x/connectors/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/connectors/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/connectors/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</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> + <module>translator-olap</module> + </modules> +</project> Deleted: tags/teiid-parent-7.4.0.Final/connectors/salesforce-api/pom.xml =================================================================== --- branches/7.4.x/connectors/salesforce-api/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/connectors/salesforce-api/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,14 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>salesforce-api</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>Salesforce API</name> - <description>The java API for the Salesforce.com partner web service API</description> - <dependencies> - </dependencies> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/connectors/salesforce-api/pom.xml (from rev 3169, branches/7.4.x/connectors/salesforce-api/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/connectors/salesforce-api/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/connectors/salesforce-api/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,14 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>salesforce-api</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>Salesforce API</name> + <description>The java API for the Salesforce.com partner web service API</description> + <dependencies> + </dependencies> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/connectors/sandbox/pom.xml =================================================================== --- branches/7.4.x/connectors/sandbox/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/connectors/sandbox/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>sandbox</artifactId> - <packaging>pom</packaging> - <name>Sandbox</name> - <description>Experimental connectors in progress</description> - <modules> - <module>translator-yahoo</module> - </modules> -</project> Copied: tags/teiid-parent-7.4.0.Final/connectors/sandbox/pom.xml (from rev 3169, branches/7.4.x/connectors/sandbox/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/connectors/sandbox/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/connectors/sandbox/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>sandbox</artifactId> + <packaging>pom</packaging> + <name>Sandbox</name> + <description>Experimental connectors in progress</description> + <modules> + <module>translator-yahoo</module> + </modules> +</project> Deleted: tags/teiid-parent-7.4.0.Final/connectors/sandbox/translator-yahoo/pom.xml =================================================================== --- branches/7.4.x/connectors/sandbox/translator-yahoo/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/connectors/sandbox/translator-yahoo/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>sandbox</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-yahoo</artifactId> - <groupId>org.jboss.teiid.connectors.sandbox</groupId> - <name>Yahoo Translator</name> - <description>Test translator used to query ticker symbols from Yahoo website</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> -</project> Copied: tags/teiid-parent-7.4.0.Final/connectors/sandbox/translator-yahoo/pom.xml (from rev 3169, branches/7.4.x/connectors/sandbox/translator-yahoo/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/connectors/sandbox/translator-yahoo/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/connectors/sandbox/translator-yahoo/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>sandbox</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-yahoo</artifactId> + <groupId>org.jboss.teiid.connectors.sandbox</groupId> + <name>Yahoo Translator</name> + <description>Test translator used to query ticker symbols from Yahoo website</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> +</project> Deleted: tags/teiid-parent-7.4.0.Final/connectors/translator-file/pom.xml =================================================================== --- branches/7.4.x/connectors/translator-file/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/connectors/translator-file/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-file</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>File Translator</name> - <description>This translator provides access to the file system.</description> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> -</project> Copied: tags/teiid-parent-7.4.0.Final/connectors/translator-file/pom.xml (from rev 3169, branches/7.4.x/connectors/translator-file/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/connectors/translator-file/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/connectors/translator-file/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-file</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>File Translator</name> + <description>This translator provides access to the file system.</description> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> +</project> Deleted: tags/teiid-parent-7.4.0.Final/connectors/translator-jdbc/pom.xml =================================================================== --- branches/7.4.x/connectors/translator-jdbc/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/connectors/translator-jdbc/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-jdbc</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>JDBC Translator</name> - - <description>This project contains translators for a JDBC source. Currently this is an aggregator for all the JDBC translators relational databases.</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> - -</project> Copied: tags/teiid-parent-7.4.0.Final/connectors/translator-jdbc/pom.xml (from rev 3169, branches/7.4.x/connectors/translator-jdbc/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/connectors/translator-jdbc/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/connectors/translator-jdbc/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-jdbc</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>JDBC Translator</name> + + <description>This project contains translators for a JDBC source. Currently this is an aggregator for all the JDBC translators relational databases.</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> + +</project> Deleted: tags/teiid-parent-7.4.0.Final/connectors/translator-ldap/pom.xml =================================================================== --- branches/7.4.x/connectors/translator-ldap/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/connectors/translator-ldap/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,52 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-ldap</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>LDAP Translator</name> - <description>LDAP Translator</description> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> -</project> Copied: tags/teiid-parent-7.4.0.Final/connectors/translator-ldap/pom.xml (from rev 3169, branches/7.4.x/connectors/translator-ldap/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/connectors/translator-ldap/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/connectors/translator-ldap/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,52 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-ldap</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>LDAP Translator</name> + <description>LDAP Translator</description> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> +</project> Deleted: tags/teiid-parent-7.4.0.Final/connectors/translator-loopback/pom.xml =================================================================== --- branches/7.4.x/connectors/translator-loopback/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/connectors/translator-loopback/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-loopback</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>Loopback Translator</name> - <description>Loopback Translator</description> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> -</project> Copied: tags/teiid-parent-7.4.0.Final/connectors/translator-loopback/pom.xml (from rev 3169, branches/7.4.x/connectors/translator-loopback/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/connectors/translator-loopback/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/connectors/translator-loopback/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-loopback</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>Loopback Translator</name> + <description>Loopback Translator</description> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> +</project> Deleted: tags/teiid-parent-7.4.0.Final/connectors/translator-olap/pom.xml =================================================================== --- branches/7.4.x/connectors/translator-olap/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/connectors/translator-olap/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-olap</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>OLAP Translator</name> - <description>This translator provides access to Query Analysis Cubes</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.olap4j</groupId> - <artifactId>olap4j</artifactId> - <version>0.9.8.343</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> - -</project> Copied: tags/teiid-parent-7.4.0.Final/connectors/translator-olap/pom.xml (from rev 3169, branches/7.4.x/connectors/translator-olap/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/connectors/translator-olap/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/connectors/translator-olap/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-olap</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>OLAP Translator</name> + <description>This translator provides access to Query Analysis Cubes</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.olap4j</groupId> + <artifactId>olap4j</artifactId> + <version>0.9.8.343</version> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> + +</project> Deleted: tags/teiid-parent-7.4.0.Final/connectors/translator-salesforce/pom.xml =================================================================== --- branches/7.4.x/connectors/translator-salesforce/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/connectors/translator-salesforce/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-salesforce</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>Salesforce Translator</name> - <description>Integrates the query engine with Salesforce.com.</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>salesforce-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> -</project> Copied: tags/teiid-parent-7.4.0.Final/connectors/translator-salesforce/pom.xml (from rev 3169, branches/7.4.x/connectors/translator-salesforce/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/connectors/translator-salesforce/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/connectors/translator-salesforce/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-salesforce</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>Salesforce Translator</name> + <description>Integrates the query engine with Salesforce.com.</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>salesforce-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> +</project> Deleted: tags/teiid-parent-7.4.0.Final/connectors/translator-ws/pom.xml =================================================================== --- branches/7.4.x/connectors/translator-ws/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/connectors/translator-ws/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-ws</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>Web service Translator</name> - <description>This translator provides access to Web Services.</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> - -</project> Copied: tags/teiid-parent-7.4.0.Final/connectors/translator-ws/pom.xml (from rev 3169, branches/7.4.x/connectors/translator-ws/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/connectors/translator-ws/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/connectors/translator-ws/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-ws</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>Web service Translator</name> + <description>This translator provides access to Web Services.</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> + +</project> Deleted: tags/teiid-parent-7.4.0.Final/console/pom.xml =================================================================== --- branches/7.4.x/console/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/console/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,175 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-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> - <teiid.version>${project.version}</teiid.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> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.jopr</groupId> - <artifactId>jopr-embedded-jbas5</artifactId> - <type>war</type> - <version>${org.jboss.jopr.as5.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.integration</groupId> - <artifactId>jboss-profileservice-spi</artifactId> - <version>5.1.0.CR2</version> - </dependency> - - <dependency> - <groupId>org.jboss.on</groupId> - <artifactId>jopr-jboss-as-5-plugin</artifactId> - <version>${jopr.jboss.as5.plugin.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-io</artifactId> - <version>1.3.2</version> - </dependency> - - - </dependencies> - - - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - </resources> - </build> - - -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/console/pom.xml (from rev 3169, branches/7.4.x/console/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/console/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/console/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,175 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</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> + <teiid.version>${project.version}</teiid.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> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <type>test-jar</type> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.jopr</groupId> + <artifactId>jopr-embedded-jbas5</artifactId> + <type>war</type> + <version>${org.jboss.jopr.as5.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-profileservice-spi</artifactId> + <version>5.1.0.CR2</version> + </dependency> + + <dependency> + <groupId>org.jboss.on</groupId> + <artifactId>jopr-jboss-as-5-plugin</artifactId> + <version>${jopr.jboss.as5.plugin.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-io</artifactId> + <version>1.3.2</version> + </dependency> + + + </dependencies> + + + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + </resources> + </build> + + +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/documentation/admin-guide/pom.xml =================================================================== --- branches/7.4.x/documentation/admin-guide/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/documentation/admin-guide/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,77 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <groupId>org.jboss.teiid</groupId> - <artifactId>documentation</artifactId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>admin-guide</artifactId> - <groupId>org.jboss.teiid.documentation</groupId> - <packaging>jdocbook</packaging> - <name>Admin Guide</name> - <description>The Teiid Admin manual</description> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.2</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook</artifactId> - <version>1.74.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>admin_guide.xml</sourceDocumentName> - <imageResource> - <directory>${basedir}/src/main/docbook/en-US</directory> - <excludes> - <exclude>*.xml</exclude> - <exclude>**/*.xml</exclude> - <exclude>*.zargo</exclude> - <exclude>**/*.zargo</exclude> - </excludes> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> - <finalName>teiid_admin_guide.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <xmlTransformerType>saxon</xmlTransformerType> - <docbookVersion>1.72.0</docbookVersion> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>false</useRelativeImageUris> - </options> - </configuration> - </plugin> - </plugins> - </build> -</project> Copied: tags/teiid-parent-7.4.0.Final/documentation/admin-guide/pom.xml (from rev 3169, branches/7.4.x/documentation/admin-guide/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/documentation/admin-guide/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/documentation/admin-guide/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,77 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> + <groupId>org.jboss.teiid</groupId> + <artifactId>documentation</artifactId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>admin-guide</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> + <packaging>jdocbook</packaging> + <name>Admin Guide</name> + <description>The Teiid Admin manual</description> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.2</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>net.sf.docbook</groupId> + <artifactId>docbook</artifactId> + <version>1.74.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>admin_guide.xml</sourceDocumentName> + <imageResource> + <directory>${basedir}/src/main/docbook/en-US</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>**/*.xml</exclude> + <exclude>*.zargo</exclude> + <exclude>**/*.zargo</exclude> + </excludes> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <finalName>teiid_admin_guide.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> + <docbookVersion>1.72.0</docbookVersion> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>false</useRelativeImageUris> + </options> + </configuration> + </plugin> + </plugins> + </build> +</project> Deleted: tags/teiid-parent-7.4.0.Final/documentation/caching-guide/pom.xml =================================================================== --- branches/7.4.x/documentation/caching-guide/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/documentation/caching-guide/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,77 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <groupId>org.jboss.teiid</groupId> - <artifactId>documentation</artifactId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>caching-guide</artifactId> - <groupId>org.jboss.teiid.documentation</groupId> - <packaging>jdocbook</packaging> - <name>Teiid Caching Guide</name> - <description>The Teiid Caching Guide</description> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.2</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook</artifactId> - <version>1.74.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>main.xml</sourceDocumentName> - <imageResource> - <directory>${basedir}/src/main/docbook/en-US</directory> - <excludes> - <exclude>*.xml</exclude> - <exclude>**/*.xml</exclude> - <exclude>*.zargo</exclude> - <exclude>**/*.zargo</exclude> - </excludes> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> - <finalName>teiid_caching_guide.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <xmlTransformerType>saxon</xmlTransformerType> - <docbookVersion>1.72.0</docbookVersion> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>false</useRelativeImageUris> - </options> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/documentation/caching-guide/pom.xml (from rev 3169, branches/7.4.x/documentation/caching-guide/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/documentation/caching-guide/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/documentation/caching-guide/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,77 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> + <groupId>org.jboss.teiid</groupId> + <artifactId>documentation</artifactId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>caching-guide</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> + <packaging>jdocbook</packaging> + <name>Teiid Caching Guide</name> + <description>The Teiid Caching Guide</description> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.2</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>net.sf.docbook</groupId> + <artifactId>docbook</artifactId> + <version>1.74.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>main.xml</sourceDocumentName> + <imageResource> + <directory>${basedir}/src/main/docbook/en-US</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>**/*.xml</exclude> + <exclude>*.zargo</exclude> + <exclude>**/*.zargo</exclude> + </excludes> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <finalName>teiid_caching_guide.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> + <docbookVersion>1.72.0</docbookVersion> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>false</useRelativeImageUris> + </options> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/documentation/client-developers-guide/pom.xml =================================================================== --- branches/7.4.x/documentation/client-developers-guide/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/documentation/client-developers-guide/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,77 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <groupId>org.jboss.teiid</groupId> - <artifactId>documentation</artifactId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>client-developers-guide</artifactId> - <groupId>org.jboss.teiid.documentation</groupId> - <packaging>jdocbook</packaging> - <name>Teiid Client Developers Guide</name> - <description>The Client Developers Guide</description> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.2</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook</artifactId> - <version>1.74.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>main.xml</sourceDocumentName> - <imageResource> - <directory>${basedir}/src/main/docbook/en-US</directory> - <excludes> - <exclude>*.xml</exclude> - <exclude>**/*.xml</exclude> - <exclude>*.zargo</exclude> - <exclude>**/*.zargo</exclude> - </excludes> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> - <finalName>teiid_client_developers_guide.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <xmlTransformerType>saxon</xmlTransformerType> - <docbookVersion>1.72.0</docbookVersion> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>false</useRelativeImageUris> - </options> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/documentation/client-developers-guide/pom.xml (from rev 3169, branches/7.4.x/documentation/client-developers-guide/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/documentation/client-developers-guide/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/documentation/client-developers-guide/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,77 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> + <groupId>org.jboss.teiid</groupId> + <artifactId>documentation</artifactId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>client-developers-guide</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> + <packaging>jdocbook</packaging> + <name>Teiid Client Developers Guide</name> + <description>The Client Developers Guide</description> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.2</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>net.sf.docbook</groupId> + <artifactId>docbook</artifactId> + <version>1.74.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>main.xml</sourceDocumentName> + <imageResource> + <directory>${basedir}/src/main/docbook/en-US</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>**/*.xml</exclude> + <exclude>*.zargo</exclude> + <exclude>**/*.zargo</exclude> + </excludes> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <finalName>teiid_client_developers_guide.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> + <docbookVersion>1.72.0</docbookVersion> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>false</useRelativeImageUris> + </options> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/documentation/developer-guide/pom.xml =================================================================== --- branches/7.4.x/documentation/developer-guide/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/documentation/developer-guide/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,77 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <groupId>org.jboss.teiid</groupId> - <artifactId>documentation</artifactId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>developer-guide</artifactId> - <groupId>org.jboss.teiid.documentation</groupId> - <packaging>jdocbook</packaging> - <name>Developer's Guide</name> - <description>The Teiid Developer's Guide</description> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.2</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook</artifactId> - <version>1.74.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>Developer_Guide.xml</sourceDocumentName> - <imageResource> - <directory>${basedir}/src/main/docbook/en-US</directory> - <excludes> - <exclude>*.xml</exclude> - <exclude>**/*.xml</exclude> - <exclude>*.zargo</exclude> - <exclude>**/*.zargo</exclude> - </excludes> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> - <finalName>teiid_developer_guide.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <xmlTransformerType>saxon</xmlTransformerType> - <docbookVersion>1.72.0</docbookVersion> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>false</useRelativeImageUris> - </options> - </configuration> - </plugin> - </plugins> - </build> -</project> Copied: tags/teiid-parent-7.4.0.Final/documentation/developer-guide/pom.xml (from rev 3169, branches/7.4.x/documentation/developer-guide/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/documentation/developer-guide/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/documentation/developer-guide/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,77 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> + <groupId>org.jboss.teiid</groupId> + <artifactId>documentation</artifactId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>developer-guide</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> + <packaging>jdocbook</packaging> + <name>Developer's Guide</name> + <description>The Teiid Developer's Guide</description> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.2</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>net.sf.docbook</groupId> + <artifactId>docbook</artifactId> + <version>1.74.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>Developer_Guide.xml</sourceDocumentName> + <imageResource> + <directory>${basedir}/src/main/docbook/en-US</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>**/*.xml</exclude> + <exclude>*.zargo</exclude> + <exclude>**/*.zargo</exclude> + </excludes> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <finalName>teiid_developer_guide.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> + <docbookVersion>1.72.0</docbookVersion> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>false</useRelativeImageUris> + </options> + </configuration> + </plugin> + </plugins> + </build> +</project> Deleted: tags/teiid-parent-7.4.0.Final/documentation/pom.xml =================================================================== --- branches/7.4.x/documentation/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/documentation/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,21 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid</groupId> - <artifactId>documentation</artifactId> - <packaging>pom</packaging> - <name>Documents</name> - <description>Teiid Documentation Aggregator</description> - <modules> - <module>admin-guide</module> - <module>reference</module> - <module>developer-guide</module> - <module>quick-start-example</module> - <module>client-developers-guide</module> - <module>caching-guide</module> - </modules> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/documentation/pom.xml (from rev 3169, branches/7.4.x/documentation/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/documentation/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/documentation/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,21 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.teiid</groupId> + <artifactId>documentation</artifactId> + <packaging>pom</packaging> + <name>Documents</name> + <description>Teiid Documentation Aggregator</description> + <modules> + <module>admin-guide</module> + <module>reference</module> + <module>developer-guide</module> + <module>quick-start-example</module> + <module>client-developers-guide</module> + <module>caching-guide</module> + </modules> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/documentation/quick-start-example/pom.xml =================================================================== --- branches/7.4.x/documentation/quick-start-example/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/documentation/quick-start-example/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,77 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <groupId>org.jboss.teiid</groupId> - <artifactId>documentation</artifactId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>quick-start-example</artifactId> - <groupId>org.jboss.teiid.documentation</groupId> - <packaging>jdocbook</packaging> - <name>Quick Start Guide</name> - <description>The Teiid Quick Start guide</description> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.2</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook</artifactId> - <version>1.74.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>quick_start_example.xml</sourceDocumentName> - <imageResource> - <directory>${basedir}/src/main/docbook/en-US</directory> - <excludes> - <exclude>*.xml</exclude> - <exclude>**/*.xml</exclude> - <exclude>*.zargo</exclude> - <exclude>**/*.zargo</exclude> - </excludes> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> - <finalName>teiid_quick_start_example.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <xmlTransformerType>saxon</xmlTransformerType> - <docbookVersion>1.72.0</docbookVersion> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>false</useRelativeImageUris> - </options> - </configuration> - </plugin> - </plugins> - </build> -</project> Copied: tags/teiid-parent-7.4.0.Final/documentation/quick-start-example/pom.xml (from rev 3169, branches/7.4.x/documentation/quick-start-example/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/documentation/quick-start-example/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/documentation/quick-start-example/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,77 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> + <groupId>org.jboss.teiid</groupId> + <artifactId>documentation</artifactId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>quick-start-example</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> + <packaging>jdocbook</packaging> + <name>Quick Start Guide</name> + <description>The Teiid Quick Start guide</description> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.2</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>net.sf.docbook</groupId> + <artifactId>docbook</artifactId> + <version>1.74.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>quick_start_example.xml</sourceDocumentName> + <imageResource> + <directory>${basedir}/src/main/docbook/en-US</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>**/*.xml</exclude> + <exclude>*.zargo</exclude> + <exclude>**/*.zargo</exclude> + </excludes> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <finalName>teiid_quick_start_example.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> + <docbookVersion>1.72.0</docbookVersion> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>false</useRelativeImageUris> + </options> + </configuration> + </plugin> + </plugins> + </build> +</project> Deleted: tags/teiid-parent-7.4.0.Final/documentation/reference/pom.xml =================================================================== --- branches/7.4.x/documentation/reference/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/documentation/reference/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,77 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <groupId>org.jboss.teiid</groupId> - <artifactId>documentation</artifactId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>reference</artifactId> - <groupId>org.jboss.teiid.documentation</groupId> - <packaging>jdocbook</packaging> - <name>Teiid Reference</name> - <description>The Teiid reference manual</description> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.2</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook</artifactId> - <version>1.74.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>Reference.xml</sourceDocumentName> - <imageResource> - <directory>${basedir}/src/main/docbook/en-US</directory> - <excludes> - <exclude>*.xml</exclude> - <exclude>**/*.xml</exclude> - <exclude>*.zargo</exclude> - <exclude>**/*.zargo</exclude> - </excludes> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> - <finalName>teiid_reference.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xmlTransformerType>saxon</xmlTransformerType> - <docbookVersion>1.72.0</docbookVersion> - <xincludeSupported>true</xincludeSupported> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>false</useRelativeImageUris> - </options> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/documentation/reference/pom.xml (from rev 3169, branches/7.4.x/documentation/reference/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/documentation/reference/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/documentation/reference/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,77 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> + <groupId>org.jboss.teiid</groupId> + <artifactId>documentation</artifactId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>reference</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> + <packaging>jdocbook</packaging> + <name>Teiid Reference</name> + <description>The Teiid reference manual</description> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.2</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>net.sf.docbook</groupId> + <artifactId>docbook</artifactId> + <version>1.74.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>Reference.xml</sourceDocumentName> + <imageResource> + <directory>${basedir}/src/main/docbook/en-US</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>**/*.xml</exclude> + <exclude>*.zargo</exclude> + <exclude>**/*.zargo</exclude> + </excludes> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <finalName>teiid_reference.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xmlTransformerType>saxon</xmlTransformerType> + <docbookVersion>1.72.0</docbookVersion> + <xincludeSupported>true</xincludeSupported> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>false</useRelativeImageUris> + </options> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/engine/pom.xml =================================================================== --- branches/7.4.x/engine/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/engine/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-engine</artifactId> - <name>Engine</name> - <description>Relational, procedural, and xml core engine.</description> - - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> - <version>2.4</version> - <executions> - <execution> - <id>javacc</id> - <goals> - <goal>javacc</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - </dependency> - - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs-spi</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>net.sourceforge.saxon</groupId> - <artifactId>saxon</artifactId> - </dependency> - - <dependency> - <groupId>net.sourceforge.saxon</groupId> - <classifier>dom</classifier> - <artifactId>saxon</artifactId> - </dependency> - - <dependency> - <groupId>com.googlecode.json-simple</groupId> - <artifactId>json-simple</artifactId> - </dependency> - - </dependencies> - -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/engine/pom.xml (from rev 3169, branches/7.4.x/engine/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/engine/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/engine/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-engine</artifactId> + <name>Engine</name> + <description>Relational, procedural, and xml core engine.</description> + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javacc-maven-plugin</artifactId> + <version>2.4</version> + <executions> + <execution> + <id>javacc</id> + <goals> + <goal>javacc</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <type>test-jar</type> + </dependency> + + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs-spi</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + </dependency> + + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <classifier>dom</classifier> + <artifactId>saxon</artifactId> + </dependency> + + <dependency> + <groupId>com.googlecode.json-simple</groupId> + <artifactId>json-simple</artifactId> + </dependency> + + </dependencies> + +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/hibernate-dialect/pom.xml =================================================================== --- branches/7.4.x/hibernate-dialect/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/hibernate-dialect/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,18 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-hibernate-dialect</artifactId> - <name>Hibernate Dialect</name> - <description>Teiid Hibernate Dialect</description> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>3.5.2-Final</version> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/hibernate-dialect/pom.xml (from rev 3169, branches/7.4.x/hibernate-dialect/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/hibernate-dialect/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/hibernate-dialect/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,18 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-hibernate-dialect</artifactId> + <name>Hibernate Dialect</name> + <description>Teiid Hibernate Dialect</description> + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.5.2-Final</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/jboss-integration/pom.xml =================================================================== --- branches/7.4.x/jboss-integration/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/jboss-integration/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,146 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-jboss-integration</artifactId> - <name>teiid-jboss-integration</name> - <description>JBoss specific integration layer for teiid</description> - - <dependencies> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-runtime</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-cache-jbosscache</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-reflect</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.man</groupId> - <artifactId>jboss-managed</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.integration</groupId> - <artifactId>jboss-profileservice-spi</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-connector</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-aop-mc-int</artifactId> - <version>2.0.6.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.security</groupId> - <artifactId>jbosssx</artifactId> - <version>2.0.3.SP1</version> - <scope>provided</scope> - </dependency> -  - <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-parent-7.4.0.Final/jboss-integration/pom.xml (from rev 3169, branches/7.4.x/jboss-integration/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/jboss-integration/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/jboss-integration/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,146 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-jboss-integration</artifactId> + <name>teiid-jboss-integration</name> + <description>JBoss specific integration layer for teiid</description> + + <dependencies> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-runtime</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-cache-jbosscache</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-managed</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-profileservice-spi</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-connector</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-aop-mc-int</artifactId> + <version>2.0.6.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + <version>2.0.3.SP1</version> + <scope>provided</scope> + </dependency> +  + <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-parent-7.4.0.Final/metadata/pom.xml =================================================================== --- branches/7.4.x/metadata/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/metadata/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-metadata</artifactId> - <name>Metadata</name> - <description>Provides vdb metadata from index files.</description> - - <dependencies> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.man</groupId> - <artifactId>jboss-managed</artifactId> - </dependency> - - </dependencies> - -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/metadata/pom.xml (from rev 3169, branches/7.4.x/metadata/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/metadata/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/metadata/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-metadata</artifactId> + <name>Metadata</name> + <description>Provides vdb metadata from index files.</description> + + <dependencies> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + <type>test-jar</type> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-vfs</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-managed</artifactId> + </dependency> + + </dependencies> + +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/pom.xml =================================================================== --- branches/7.4.x/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,496 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-parent</artifactId> - <packaging>pom</packaging> - <name>Teiid</name> - <version>7.4.0.CR2-SNAPSHOT</version> - <description>Federated SQL and XML query engine.</description> - <properties> - <ant.version>1.7.0</ant.version> - <site.url>http://www.jboss.org/teiid</site.url> - </properties> - <scm> - <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/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> - <modules> - <module>documentation</module> - <module>build</module> - </modules> - </profile> - <profile> -  - <id>dev</id> - <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> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-6-m1-jboss</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.15.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <version>3.2.5.GA</version> - <exclusions> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </exclusion> - </exclusions> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.man</groupId> - <artifactId>jboss-managed</artifactId> - <version>2.1.0.SP1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.man</groupId> - <artifactId>jboss-metatype</artifactId> - <version>2.1.0.SP1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.integration</groupId> - <artifactId>jboss-profileservice-spi</artifactId> - <version>5.1.0.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - <version>2.1.2.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs-spi</artifactId> - <version>2.0.7.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - <version>2.0.7.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-connector</artifactId> - <version>5.1.0.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-reflect</artifactId> - <version>2.0.2.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.remoting</groupId> - <artifactId>jboss-remoting</artifactId> - <version>2.5.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>net.sourceforge.saxon</groupId> - <artifactId>saxon</artifactId> - <version>9.1.0.8</version> - </dependency> - <dependency> - <groupId>net.sourceforge.saxon</groupId> - <artifactId>saxon</artifactId> - <classifier>dom</classifier> - <version>9.1.0.8</version> - </dependency> - <dependency> - <groupId>org.jboss.netty</groupId> - <artifactId>netty</artifactId> - <version>3.2.1.Final</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>${ant.version}</version> - </dependency> - <dependency> - <groupId>com.googlecode.json-simple</groupId> - <artifactId>json-simple</artifactId> - <version>1.1</version> - </dependency> - </dependencies> - </dependencyManagement> - <modules> - <module>common-core</module> - <module>api</module> - <module>client</module> - <module>engine</module> - <module>connectors</module> - <module>console</module> - <module>metadata</module> - <module>runtime</module> - <module>adminshell</module> - <module>cache-jbosscache</module> - <module>hibernate-dialect</module> - <module>jboss-integration</module> - <module>test-integration</module> - <module>client-jdk15</module> - </modules> - <distributionManagement> - <repository> - <id>jboss-releases-repository</id> - <name>JBoss Releases Repository</name> - <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url> - </repository> - <snapshotRepository> - <id>jboss-snapshots-repository</id> - <name>JBoss Snapshots Repository</name> - <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url> - </snapshotRepository> - </distributionManagement> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/pom.xml (from rev 3169, branches/7.4.x/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,496 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-parent</artifactId> + <packaging>pom</packaging> + <name>Teiid</name> + <version>7.4.0.Final</version> + <description>Federated SQL and XML query engine.</description> + <properties> + <ant.version>1.7.0</ant.version> + <site.url>http://www.jboss.org/teiid</site.url> + </properties> + <scm> + <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-7.4.0.Final</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-7.4.0.Final</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> + <modules> + <module>documentation</module> + <module>build</module> + </modules> + </profile> + <profile> +  + <id>dev</id> + <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> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-6-m1-jboss</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.15.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>3.2.5.GA</version> + <exclusions> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + </exclusions> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-managed</artifactId> + <version>2.1.0.SP1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-metatype</artifactId> + <version>2.1.0.SP1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-profileservice-spi</artifactId> + <version>5.1.0.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-vfs</artifactId> + <version>2.1.2.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs-spi</artifactId> + <version>2.0.7.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs</artifactId> + <version>2.0.7.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-connector</artifactId> + <version>5.1.0.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + <version>2.0.2.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + <version>2.5.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + <version>9.1.0.8</version> + </dependency> + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + <classifier>dom</classifier> + <version>9.1.0.8</version> + </dependency> + <dependency> + <groupId>org.jboss.netty</groupId> + <artifactId>netty</artifactId> + <version>3.2.1.Final</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>${ant.version}</version> + </dependency> + <dependency> + <groupId>com.googlecode.json-simple</groupId> + <artifactId>json-simple</artifactId> + <version>1.1</version> + </dependency> + </dependencies> + </dependencyManagement> + <modules> + <module>common-core</module> + <module>api</module> + <module>client</module> + <module>engine</module> + <module>connectors</module> + <module>console</module> + <module>metadata</module> + <module>runtime</module> + <module>adminshell</module> + <module>cache-jbosscache</module> + <module>hibernate-dialect</module> + <module>jboss-integration</module> + <module>test-integration</module> + <module>client-jdk15</module> + </modules> + <distributionManagement> + <repository> + <id>jboss-releases-repository</id> + <name>JBoss Releases Repository</name> + <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url> + </repository> + <snapshotRepository> + <id>jboss-snapshots-repository</id> + <name>JBoss Snapshots Repository</name> + <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url> + </snapshotRepository> + </distributionManagement> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/runtime/pom.xml =================================================================== --- branches/7.4.x/runtime/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/runtime/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-runtime</artifactId> - <name>Runtime Engine</name> - <description>Teiid Runtime Engine</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-metadata</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.netty</groupId> - <artifactId>netty</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs-spi</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.integration</groupId> - <artifactId>jboss-profileservice-spi</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/runtime/pom.xml (from rev 3169, branches/7.4.x/runtime/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/runtime/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/runtime/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-runtime</artifactId> + <name>Runtime Engine</name> + <description>Teiid Runtime Engine</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-metadata</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.netty</groupId> + <artifactId>netty</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-vfs</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs-spi</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-profileservice-spi</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/test-integration/common/pom.xml =================================================================== --- branches/7.4.x/test-integration/common/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/test-integration/common/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-test-integration</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>test-integration-common</artifactId> - <name>Common Integration Tests</name> - <description>Common Integration tests that do not require external dependencies</description> - <dependencies> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.3-606.jdbc3</version> - </dependency> - </dependencies> - -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/test-integration/common/pom.xml (from rev 3169, branches/7.4.x/test-integration/common/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/test-integration/common/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/test-integration/common/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-test-integration</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>test-integration-common</artifactId> + <name>Common Integration Tests</name> + <description>Common Integration tests that do not require external dependencies</description> + <dependencies> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.3-606.jdbc3</version> + </dependency> + </dependencies> + +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/test-integration/db/pom.xml =================================================================== --- branches/7.4.x/test-integration/db/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/test-integration/db/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,537 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - - - <parent> - <artifactId>teiid-test-integration</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>test-integration-db</artifactId> - - <name>DB Dependent Integration Tests</name> - <groupId>org.jboss.teiid.teiid-test-integration</groupId> - <description>Integration tests that require external database dependencies </description> - <dependencies> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - </dependency> - - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <type>test-jar</type> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - <scope>compile</scope> - </dependency> - - - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - <type>test-jar</type> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>test-integration-common</artifactId> - <type>test-jar</type> - <scope>compile</scope> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>1.7.0</version> - </dependency> - - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-launcher</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>ant-contrib</groupId> - <artifactId>ant-contrib</artifactId> - <version>1.0b3</version> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - - </dependency> - - <dependency> - <groupId>ant-contrib</groupId> - <artifactId>cpptasks</artifactId> - <version>1.0b3</version> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> - - -  - - <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> - <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> - <configuration> - <descriptors> - <descriptor>src/assembly/binaries.xml</descriptor> - </descriptors> - <outputDirectory>target/distribution</outputDirectory> - <workDirectory>target/work/assembly</workDirectory> - - </configuration> - <executions> - - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> - </profile> - - </profiles> - - -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Final/test-integration/db/pom.xml (from rev 3169, branches/7.4.x/test-integration/db/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/test-integration/db/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/test-integration/db/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,537 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + + + <parent> + <artifactId>teiid-test-integration</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>test-integration-db</artifactId> + + <name>DB Dependent Integration Tests</name> + <groupId>org.jboss.teiid.teiid-test-integration</groupId> + <description>Integration tests that require external database dependencies </description> + <dependencies> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + </dependency> + + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <type>test-jar</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + <scope>compile</scope> + </dependency> + + + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + <type>test-jar</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>test-integration-common</artifactId> + <type>test-jar</type> + <scope>compile</scope> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.7.0</version> + </dependency> + + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-launcher</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>ant-contrib</artifactId> + <version>1.0b3</version> + <exclusions> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + + </dependency> + + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>cpptasks</artifactId> + <version>1.0b3</version> + <exclusions> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + </dependency> + + +  + + <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> + <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> + <configuration> + <descriptors> + <descriptor>src/assembly/binaries.xml</descriptor> + </descriptors> + <outputDirectory>target/distribution</outputDirectory> + <workDirectory>target/work/assembly</workDirectory> + + </configuration> + <executions> + + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + + </profiles> + + +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Final/test-integration/pom.xml =================================================================== --- branches/7.4.x/test-integration/pom.xml 2011-05-12 14:52:21 UTC (rev 3167) +++ tags/teiid-parent-7.4.0.Final/test-integration/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -1,107 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-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-parent-7.4.0.Final/test-integration/pom.xml (from rev 3169, branches/7.4.x/test-integration/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Final/test-integration/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Final/test-integration/pom.xml 2011-05-12 15:48:44 UTC (rev 3170) @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Final</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

12 years, 11 months

1
0
0 / 0

teiid SVN: r3169 - in branches/7.4.x: adminshell and 37 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-05-12 11:46:37 -0400 (Thu, 12 May 2011) New Revision: 3169 Modified: branches/7.4.x/adminshell/pom.xml branches/7.4.x/api/pom.xml branches/7.4.x/build/pom.xml branches/7.4.x/cache-jbosscache/pom.xml branches/7.4.x/client-jdk15/pom.xml branches/7.4.x/client/pom.xml branches/7.4.x/common-core/pom.xml branches/7.4.x/connectors/connector-file/pom.xml branches/7.4.x/connectors/connector-ldap/pom.xml branches/7.4.x/connectors/connector-salesforce/pom.xml branches/7.4.x/connectors/connector-ws/pom.xml branches/7.4.x/connectors/pom.xml branches/7.4.x/connectors/salesforce-api/pom.xml branches/7.4.x/connectors/sandbox/pom.xml branches/7.4.x/connectors/sandbox/translator-yahoo/pom.xml branches/7.4.x/connectors/translator-file/pom.xml branches/7.4.x/connectors/translator-jdbc/pom.xml branches/7.4.x/connectors/translator-ldap/pom.xml branches/7.4.x/connectors/translator-loopback/pom.xml branches/7.4.x/connectors/translator-olap/pom.xml branches/7.4.x/connectors/translator-salesforce/pom.xml branches/7.4.x/connectors/translator-ws/pom.xml branches/7.4.x/console/pom.xml branches/7.4.x/documentation/admin-guide/pom.xml branches/7.4.x/documentation/caching-guide/pom.xml branches/7.4.x/documentation/client-developers-guide/pom.xml branches/7.4.x/documentation/developer-guide/pom.xml branches/7.4.x/documentation/pom.xml branches/7.4.x/documentation/quick-start-example/pom.xml branches/7.4.x/documentation/reference/pom.xml branches/7.4.x/engine/pom.xml branches/7.4.x/hibernate-dialect/pom.xml branches/7.4.x/jboss-integration/pom.xml branches/7.4.x/metadata/pom.xml branches/7.4.x/pom.xml branches/7.4.x/runtime/pom.xml branches/7.4.x/test-integration/common/pom.xml branches/7.4.x/test-integration/db/pom.xml branches/7.4.x/test-integration/pom.xml Log: [maven-release-plugin] prepare release teiid-parent-7.4.0.Final Modified: branches/7.4.x/adminshell/pom.xml =================================================================== --- branches/7.4.x/adminshell/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/adminshell/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-adminshell</artifactId> Modified: branches/7.4.x/api/pom.xml =================================================================== --- branches/7.4.x/api/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/api/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-api</artifactId> Modified: branches/7.4.x/build/pom.xml =================================================================== --- branches/7.4.x/build/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/build/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid</artifactId> Modified: branches/7.4.x/cache-jbosscache/pom.xml =================================================================== --- branches/7.4.x/cache-jbosscache/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/cache-jbosscache/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-cache-jbosscache</artifactId> Modified: branches/7.4.x/client/pom.xml =================================================================== --- branches/7.4.x/client/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/client/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-client</artifactId> Modified: branches/7.4.x/client-jdk15/pom.xml =================================================================== --- branches/7.4.x/client-jdk15/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/client-jdk15/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-client-jdk15</artifactId> Modified: branches/7.4.x/common-core/pom.xml =================================================================== --- branches/7.4.x/common-core/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/common-core/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-common-core</artifactId> Modified: branches/7.4.x/connectors/connector-file/pom.xml =================================================================== --- branches/7.4.x/connectors/connector-file/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/connectors/connector-file/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-file</artifactId> Modified: branches/7.4.x/connectors/connector-ldap/pom.xml =================================================================== --- branches/7.4.x/connectors/connector-ldap/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/connectors/connector-ldap/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ldap</artifactId> Modified: branches/7.4.x/connectors/connector-salesforce/pom.xml =================================================================== --- branches/7.4.x/connectors/connector-salesforce/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/connectors/connector-salesforce/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-salesforce</artifactId> Modified: branches/7.4.x/connectors/connector-ws/pom.xml =================================================================== --- branches/7.4.x/connectors/connector-ws/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/connectors/connector-ws/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ws</artifactId> Modified: branches/7.4.x/connectors/pom.xml =================================================================== --- branches/7.4.x/connectors/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/connectors/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: branches/7.4.x/connectors/salesforce-api/pom.xml =================================================================== --- branches/7.4.x/connectors/salesforce-api/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/connectors/salesforce-api/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>salesforce-api</artifactId> Modified: branches/7.4.x/connectors/sandbox/pom.xml =================================================================== --- branches/7.4.x/connectors/sandbox/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/connectors/sandbox/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid.connectors</groupId> Modified: branches/7.4.x/connectors/sandbox/translator-yahoo/pom.xml =================================================================== --- branches/7.4.x/connectors/sandbox/translator-yahoo/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/connectors/sandbox/translator-yahoo/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-yahoo</artifactId> Modified: branches/7.4.x/connectors/translator-file/pom.xml =================================================================== --- branches/7.4.x/connectors/translator-file/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/connectors/translator-file/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-file</artifactId> Modified: branches/7.4.x/connectors/translator-jdbc/pom.xml =================================================================== --- branches/7.4.x/connectors/translator-jdbc/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/connectors/translator-jdbc/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-jdbc</artifactId> Modified: branches/7.4.x/connectors/translator-ldap/pom.xml =================================================================== --- branches/7.4.x/connectors/translator-ldap/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/connectors/translator-ldap/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ldap</artifactId> Modified: branches/7.4.x/connectors/translator-loopback/pom.xml =================================================================== --- branches/7.4.x/connectors/translator-loopback/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/connectors/translator-loopback/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-loopback</artifactId> Modified: branches/7.4.x/connectors/translator-olap/pom.xml =================================================================== --- branches/7.4.x/connectors/translator-olap/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/connectors/translator-olap/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-olap</artifactId> Modified: branches/7.4.x/connectors/translator-salesforce/pom.xml =================================================================== --- branches/7.4.x/connectors/translator-salesforce/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/connectors/translator-salesforce/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-salesforce</artifactId> Modified: branches/7.4.x/connectors/translator-ws/pom.xml =================================================================== --- branches/7.4.x/connectors/translator-ws/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/connectors/translator-ws/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ws</artifactId> Modified: branches/7.4.x/console/pom.xml =================================================================== --- branches/7.4.x/console/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/console/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/7.4.x/documentation/admin-guide/pom.xml =================================================================== --- branches/7.4.x/documentation/admin-guide/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/documentation/admin-guide/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>admin-guide</artifactId> Modified: branches/7.4.x/documentation/caching-guide/pom.xml =================================================================== --- branches/7.4.x/documentation/caching-guide/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/documentation/caching-guide/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>caching-guide</artifactId> Modified: branches/7.4.x/documentation/client-developers-guide/pom.xml =================================================================== --- branches/7.4.x/documentation/client-developers-guide/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/documentation/client-developers-guide/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>client-developers-guide</artifactId> Modified: branches/7.4.x/documentation/developer-guide/pom.xml =================================================================== --- branches/7.4.x/documentation/developer-guide/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/documentation/developer-guide/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>developer-guide</artifactId> Modified: branches/7.4.x/documentation/pom.xml =================================================================== --- branches/7.4.x/documentation/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/documentation/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: branches/7.4.x/documentation/quick-start-example/pom.xml =================================================================== --- branches/7.4.x/documentation/quick-start-example/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/documentation/quick-start-example/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>quick-start-example</artifactId> Modified: branches/7.4.x/documentation/reference/pom.xml =================================================================== --- branches/7.4.x/documentation/reference/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/documentation/reference/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>reference</artifactId> Modified: branches/7.4.x/engine/pom.xml =================================================================== --- branches/7.4.x/engine/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/engine/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-engine</artifactId> Modified: branches/7.4.x/hibernate-dialect/pom.xml =================================================================== --- branches/7.4.x/hibernate-dialect/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/hibernate-dialect/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-hibernate-dialect</artifactId> Modified: branches/7.4.x/jboss-integration/pom.xml =================================================================== --- branches/7.4.x/jboss-integration/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/jboss-integration/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: branches/7.4.x/metadata/pom.xml =================================================================== --- branches/7.4.x/metadata/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/metadata/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-metadata</artifactId> Modified: branches/7.4.x/pom.xml =================================================================== --- branches/7.4.x/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -5,15 +5,15 @@ <artifactId>teiid-parent</artifactId> <packaging>pom</packaging> <name>Teiid</name> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</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-parent-7.4.0.Final</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-7.4.0.Final</developerConnection> </scm> <licenses> <license> Modified: branches/7.4.x/runtime/pom.xml =================================================================== --- branches/7.4.x/runtime/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/runtime/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: branches/7.4.x/test-integration/common/pom.xml =================================================================== --- branches/7.4.x/test-integration/common/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/test-integration/common/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>test-integration-common</artifactId> Modified: branches/7.4.x/test-integration/db/pom.xml =================================================================== --- branches/7.4.x/test-integration/db/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/test-integration/db/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -9,7 +9,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/7.4.x/test-integration/pom.xml =================================================================== --- branches/7.4.x/test-integration/pom.xml 2011-05-12 15:27:35 UTC (rev 3168) +++ branches/7.4.x/test-integration/pom.xml 2011-05-12 15:46:37 UTC (rev 3169) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.CR2-SNAPSHOT</version> + <version>7.4.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-test-integration</artifactId>

12 years, 11 months

1
0
0 / 0

teiid SVN: r3168 - branches/7.4.x/build/kits/jboss-container.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-05-12 11:27:35 -0400 (Thu, 12 May 2011) New Revision: 3168 Modified: branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html Log: updating to final release notes Modified: branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html =================================================================== --- branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html 2011-05-12 14:52:21 UTC (rev 3167) +++ branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html 2011-05-12 15:27:35 UTC (rev 3168) @@ -54,7 +54,7 @@ <LI><B>JDK1.5 JDBC Client JAR</B> - A retro-translated Teiid client JDBC jar now available to use with JDK 1.5 VM. Note only the JDBC API is supported, not the Admin API, or retrieving query plans as XML. <LI><B>Security Improvements</B> - UDF and pushdown functions can now be protected with data roles. Also the CommandContext can provide the Subject for custom security checks in UDFs. <LI><B>Cache Invalidation</B> - Prepared plan and result set caches have will invalidate entries based upon metadata and data changes respectively. See the cache configuration maxStaleness setting and the Admin and Developer Guides for more. - <LI><B>Runtime-updates of Metadata</B> - ALTER statements have been added to change view/procedure/INSTEAD OF trigger (update procedure) definitions. A CREATE TRIGGER statement is also available to add an INSTEAD OF trigger (update procedures) to views. + <LI><B>Runtime Updates of Metadata</B> - ALTER statements have been added to change view/procedure/INSTEAD OF trigger (update procedure) definitions. A CREATE TRIGGER statement is also available to add an INSTEAD OF trigger (update procedures) to views. System procedures were added to set extension metadata and stat values. By default all effects of metadata updates happen only on running vdbs across the cluster. To make the changes persistent see the Developers Guide Runtime Updates section. </UL> @@ -216,6 +216,266 @@ <h2><a name="Details">Detailed Release Notes</a></h2> Detailed Release Notes - Teiid - Version ${project.version} + +<h2> Bug +</h2> +<ul> +<li>[<a href='https://issues.jboss.org/browse/TEIID-99'>TEIID-99</a>] - Stored procedures should work in multisource connector binding scenarios +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1163'>TEIID-1163</a>] - Provide LOB support in ODBC +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1164'>TEIID-1164</a>] - Getting the Procedure Parameter metadata is not supported in ODBC +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1432'>TEIID-1432</a>] - Getting SocketTimeout Exceptions on long running queries with CXF +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1458'>TEIID-1458</a>] - Wrong count(*) result when joining data from two models +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1466'>TEIID-1466</a>] - MySQL syntax error in cast from date to timestamp +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1467'>TEIID-1467</a>] - Procedures in Teiid are not Resolvable if Their Models are Marked as Not Visible +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1469'>TEIID-1469</a>] - EDS Teiid Plugin uses Invalid Datatype Mask for SessionID Parameter to Terminate Session Operation +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1470'>TEIID-1470</a>] - Deploying VDB XML file before data sources leads to failed deployment +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1476'>TEIID-1476</a>] - correct preventable exceptions +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1478'>TEIID-1478</a>] - various jdbc import issues +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1479'>TEIID-1479</a>] - Teiid Documentation does not include MS SQL Server as an available translator in section 10.2.2. JDBC Translator of the Reference Guide +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1480'>TEIID-1480</a>] - Teiid's ODBC interaction with PostgreSQL-ODBC fails when column lengths exceed 64K as PostgreSQL stores these values as a short +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1488'>TEIID-1488</a>] - EDS adminshell fails to connect to server with IBM JDK +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1489'>TEIID-1489</a>] - Teiid assumes fqns in transformations, but they are no longer required to be there +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1492'>TEIID-1492</a>] - StackOverflowError in DefaultCache +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1498'>TEIID-1498</a>] - Incorrect rewrite of not disjunctive criteria +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1502'>TEIID-1502</a>] - ODBC (and admin) scalability limited by maxWorker cap +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1503'>TEIID-1503</a>] - Exception during Optimization +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1504'>TEIID-1504</a>] - Internal Materialization does not honor the cache hint +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1505'>TEIID-1505</a>] - MaxActivePlans is not being read from the configuration +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1506'>TEIID-1506</a>] - ODBC Driver reporting BigInteger, BigDecimal columns as Strings +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1511'>TEIID-1511</a>] - VDB deployment leaves with too many open files +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1512'>TEIID-1512</a>] - show plan statement clob isn't readable +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1515'>TEIID-1515</a>] - ODBC does not report primarykeys on the tables +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1516'>TEIID-1516</a>] - IS_NULLABLE is reported incorrectly for columns +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1521'>TEIID-1521</a>] - Dynamic vdb import logic error with procedures +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1523'>TEIID-1523</a>] - Dynamic sql failure with null procedure parameters +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1528'>TEIID-1528</a>] - ruleimplementjoin strategy may generate an order by that does not use a relevant index +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1529'>TEIID-1529</a>] - LIMIT not pushed down for queries with subselects and ORDER BY +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1530'>TEIID-1530</a>] - ODBC identifer matching issues +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1531'>TEIID-1531</a>] - ODBC charset issues +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1532'>TEIID-1532</a>] - ODBC prepared statement handling can hang +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1534'>TEIID-1534</a>] - The driver incorrectly reports column labels as column names +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1537'>TEIID-1537</a>] - Error loading older cached metadata +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1538'>TEIID-1538</a>] - Invalid conversion from type class java.lang.Object with value 'oracle.sql.ROWID@1379cbd' to type class java.lang.String +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1545'>TEIID-1545</a>] - Order By not pushed down +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1548'>TEIID-1548</a>] - Creating XA data sources from AdminShell: prop name "addtional-ds-properties" has misspelling - could cause confusion +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1549'>TEIID-1549</a>] - aggregate unrelated order by error +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1553'>TEIID-1553</a>] - UDF Function model fails to load when it located inside a folder in the VDB +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1554'>TEIID-1554</a>] - NullPointerException in NodeEditor +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1555'>TEIID-1555</a>] - NPE on server when admin-console requests for the "vdb requests" +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1558'>TEIID-1558</a>] - Salesforce Connector gives NPE when the resultset is empty +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1561'>TEIID-1561</a>] - Database Calender is not correctly being set in JDBC Translator +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1562'>TEIID-1562</a>] - ArrayIndexOutOfBounds and ASSERTION FAILED in models with UNION +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1564'>TEIID-1564</a>] - Clustered Caching Not Working +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1566'>TEIID-1566</a>] - More complex join: ORDER BY and LIMIT not pushed down +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1567'>TEIID-1567</a>] - Sybase translator needs to handle CROSS JOIN syntax. +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1570'>TEIID-1570</a>] - pg catalog transformation issues +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1571'>TEIID-1571</a>] - Error due to merge virtual with join and group by +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1572'>TEIID-1572</a>] - Teiid ODBC does not handle SET and Show operations correctly +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1576'>TEIID-1576</a>] - unexpected query result when joining with a virtual procedure +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1577'>TEIID-1577</a>] - ArrayIndexOutOfBoundsException in queries with ORDER BY +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1578'>TEIID-1578</a>] - Set query to string should account for branch limits/order bys +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1579'>TEIID-1579</a>] - LocalServer Connection is not working +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1580'>TEIID-1580</a>] - CME on VDB deploy +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1583'>TEIID-1583</a>] - importer.useFullSchemaName property default value is incorrectly documented +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1584'>TEIID-1584</a>] - Querying a virtual table backed by a SELECT x,y,z FROM EXECT ... TEXTTABLE() call fails to return data +</li> +</ul> + +<h2> Enhancement +</h2> +<ul> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1473'>TEIID-1473</a>] - Don't batch more rows than is needed when query contains limit but translator does not support limit +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1482'>TEIID-1482</a>] - Prevent unnecessary rebuffering of sorted results +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1490'>TEIID-1490</a>] - In the process of loading the schema metadata and duplicate table is found, add a suggestion to the error message to use FQN option +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1519'>TEIID-1519</a>] - Changing dynamicportfolio example in the JBoss as kit to use HSQL instead of Derby +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1539'>TEIID-1539</a>] - Improve warning message when maximum thread count is encountered +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1556'>TEIID-1556</a>] - Improve xmlagg performance +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1569'>TEIID-1569</a>] - Documentation on creating UDF, extending ExecutionFactory and defining @Translator name should indicate what to do with the translator name +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1581'>TEIID-1581</a>] - Adding a JCA example for creating a Teiid Data Source to the kits +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1582'>TEIID-1582</a>] - Avoid buffering in enhanced sort merge join +</li> +</ul> + +<h2> Feature Request +</h2> +<ul> +<li>[<a href='https://issues.jboss.org/browse/TEIID-217'>TEIID-217</a>] - LDAP Connector should provide a way to retrieve all values of an attribute that appears multiple times within a search result +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-231'>TEIID-231</a>] - Ability to support Connector Level UDF functions in the System +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-239'>TEIID-239</a>] - ENHANCEMENT: Costing beyond cardinality sould be propogated +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-796'>TEIID-796</a>] - Allow for the import of overloaded procedures +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-946'>TEIID-946</a>] - add support for in/out out return params +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1011'>TEIID-1011</a>] - Add support for connecting to Mondrian +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1059'>TEIID-1059</a>] - Add a specific translator for Ingres +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1060'>TEIID-1060</a>] - Add a specific translator for Intersystems Cache +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1061'>TEIID-1061</a>] - Add a specific translator for SAP Business Warehouse +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1176'>TEIID-1176</a>] - Provide a non-blocking JDBC api for ODBC support +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1217'>TEIID-1217</a>] - Derive VDB Name Using Version During Deployment in Jopr +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1326'>TEIID-1326</a>] - API request: rewrite query/command before it reaches the teiid planner +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1327'>TEIID-1327</a>] - API request: Fine grained security +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1329'>TEIID-1329</a>] - API to force metadata read +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1437'>TEIID-1437</a>] - It's not possible to deploy single file (*.xml) virtual database through web admin console +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1463'>TEIID-1463</a>] - limit buffering for large results +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1464'>TEIID-1464</a>] - Add uuid function +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1471'>TEIID-1471</a>] - Projection should be minimized prior to view removal +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1474'>TEIID-1474</a>] - Add a limit to the number of concurrent source queries issued. +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1487'>TEIID-1487</a>] - CLONE - Add implicit conversion of NULL to correct datatype in transformation validator +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1491'>TEIID-1491</a>] - Provide JDBC 3.0 JRE 1.5 backwards compatibility +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1494'>TEIID-1494</a>] - Allow the optional join hint to work with non-ansi joins +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1496'>TEIID-1496</a>] - disjunctive rewrite +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1497'>TEIID-1497</a>] - misc subquery enhancements +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1507'>TEIID-1507</a>] - Cache invalidation +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1510'>TEIID-1510</a>] - RulePushAggregates should consider cost in addition to key information +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1533'>TEIID-1533</a>] - additional controls for dependent joins +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1536'>TEIID-1536</a>] - Local connections should use calling thread +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1546'>TEIID-1546</a>] - Be more selective as to what are created as bind variables +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1550'>TEIID-1550</a>] - Row level security enhancements +</li> +</ul> + +<h2> Quality Risk +</h2> +<ul> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1008'>TEIID-1008</a>] - Correlated subquery handling for Oracle/MySQL +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1281'>TEIID-1281</a>] - DB2 substring index bounds are different than teiid +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1493'>TEIID-1493</a>] - In a cluster the distributed cache is cleared by a node rejoining +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1508'>TEIID-1508</a>] - Dependent join planning problem +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1509'>TEIID-1509</a>] - Change the default for value caching +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1513'>TEIID-1513</a>] - Setting of translator properties should not be case sensitive +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1520'>TEIID-1520</a>] - Reduce the memory footprint of metadata +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1525'>TEIID-1525</a>] - update the hibernate usage with a note about id generation +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1527'>TEIID-1527</a>] - local connection doc provides an invalid example +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1535'>TEIID-1535</a>] - pg/odbc support should report rel oid with column metadata +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1574'>TEIID-1574</a>] - Add new permission types for alter/execute +</li> +</ul> + +<h2> Task +</h2> +<ul> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1431'>TEIID-1431</a>] - provide a working example of data roles +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1481'>TEIID-1481</a>] - client url cleanups +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1483'>TEIID-1483</a>] - Resolving changes to consolidate teiid/teiid designer handling +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1495'>TEIID-1495</a>] - Validate the TeraData Translator +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1514'>TEIID-1514</a>] - testZipFile.zip contains absolute path which impacted the MEAD sign +</li> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1551'>TEIID-1551</a>] - ODBC logging context is not documented +</li> +</ul> + +<h2> Sub-task +</h2> +<ul> +<li>[<a href='https://issues.jboss.org/browse/TEIID-1524'>TEIID-1524</a>] - Index metadata strings container their entire record line. +</li> +</ul> <h2><a name="Documentation">Documentation and Help</a></h2>

12 years, 11 months

1
0
0 / 0

teiid SVN: r3167 - branches/7.4.x/documentation/reference/src/main/docbook/en-US/content.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-05-12 10:52:21 -0400 (Thu, 12 May 2011) New Revision: 3167 Modified: branches/7.4.x/documentation/reference/src/main/docbook/en-US/content/scalar_functions.xml Log: minor update to left/right types Modified: branches/7.4.x/documentation/reference/src/main/docbook/en-US/content/scalar_functions.xml =================================================================== --- branches/7.4.x/documentation/reference/src/main/docbook/en-US/content/scalar_functions.xml 2011-05-12 14:19:43 UTC (rev 3166) +++ branches/7.4.x/documentation/reference/src/main/docbook/en-US/content/scalar_functions.xml 2011-05-12 14:52:21 UTC (rev 3167) @@ -845,7 +845,7 @@ <para>Get left y characters of x</para> </entry> <entry> - <para>x in {string}, y in {string}, return string</para> + <para>x in {string}, y in {integer}, return string</para> </entry> </row> <row> @@ -963,7 +963,7 @@ <para>Get right y characters of x</para> </entry> <entry> - <para>x in {string}, y in {string}, return string</para> + <para>x in {string}, y in {integer}, return string</para> </entry> </row> <row>

12 years, 11 months

1
0
0 / 0

teiid SVN: r3166 - in branches/7.4.x/connectors/translator-jdbc/src: main/java/org/teiid/translator/jdbc/intersyscache and 2 other directories.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2011-05-12 10:19:43 -0400 (Thu, 12 May 2011) New Revision: 3166 Modified: branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/IngresExecutionFactory.java branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/intersyscache/InterSystemsCacheExecutionFactory.java branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teradata/TeradataExecutionFactory.java branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/teradata/TestTeradataTranslator.java Log: TEIID-1495: few more changes to pushdown correct queries to Teradata. Also fixed other translators with errors in defining them to support all pushdown functions. Modified: branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/IngresExecutionFactory.java =================================================================== --- branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/IngresExecutionFactory.java 2011-05-12 03:37:24 UTC (rev 3165) +++ branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/IngresExecutionFactory.java 2011-05-12 14:19:43 UTC (rev 3166) @@ -67,13 +67,7 @@ convert.addTypeMapping("clob", FunctionModifier.CLOB); //$NON-NLS-1$ convert.addNumericBooleanConversions(); registerFunctionModifier(SourceSystemFunctions.CONVERT, convert); - } - - @Override - public List<String> getSupportedFunctions() { - List<String> supportedFunctions = new ArrayList<String>(); - supportedFunctions.addAll(super.getSupportedFunctions()); - + registerFunctionModifier(SourceSystemFunctions.BITAND, new AliasModifier("bit_and")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.BITNOT, new AliasModifier("bit_not")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.BITOR, new AliasModifier("bit_or")); //$NON-NLS-1$ @@ -84,16 +78,29 @@ registerFunctionModifier(SourceSystemFunctions.RAND, new AliasModifier("random")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.UCASE, new AliasModifier("uppercase")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.DAYOFMONTH, new AliasModifier("day")); //$NON-NLS-1$ - registerFunctionModifier(SourceSystemFunctions.LOCATE, new LocateFunctionModifier(getLanguageFactory())); - + registerFunctionModifier(SourceSystemFunctions.LOCATE, new LocateFunctionModifier(getLanguageFactory())); + } + + @Override + public List<String> getSupportedFunctions() { + List<String> supportedFunctions = new ArrayList<String>(); + supportedFunctions.addAll(super.getSupportedFunctions()); + supportedFunctions.add(SourceSystemFunctions.ABS); supportedFunctions.add(SourceSystemFunctions.ATAN); + supportedFunctions.add(SourceSystemFunctions.BITAND); + supportedFunctions.add(SourceSystemFunctions.BITNOT); + supportedFunctions.add(SourceSystemFunctions.BITOR); + supportedFunctions.add(SourceSystemFunctions.BITXOR); supportedFunctions.add(SourceSystemFunctions.CONCAT); supportedFunctions.add(SourceSystemFunctions.COS); supportedFunctions.add(SourceSystemFunctions.CONVERT); + supportedFunctions.add(SourceSystemFunctions.CURTIME); + supportedFunctions.add(SourceSystemFunctions.CURDATE); supportedFunctions.add(SourceSystemFunctions.DAYOFMONTH); supportedFunctions.add(SourceSystemFunctions.EXP); supportedFunctions.add(SourceSystemFunctions.HOUR); + supportedFunctions.add(SourceSystemFunctions.LCASE); supportedFunctions.add(SourceSystemFunctions.LEFT); supportedFunctions.add(SourceSystemFunctions.LPAD); supportedFunctions.add(SourceSystemFunctions.LOCATE); @@ -102,6 +109,7 @@ supportedFunctions.add(SourceSystemFunctions.MINUTE); supportedFunctions.add(SourceSystemFunctions.MONTH); supportedFunctions.add(SourceSystemFunctions.POWER); + supportedFunctions.add(SourceSystemFunctions.RAND); supportedFunctions.add(SourceSystemFunctions.RIGHT); supportedFunctions.add(SourceSystemFunctions.RPAD); supportedFunctions.add(SourceSystemFunctions.SECOND); @@ -109,6 +117,7 @@ supportedFunctions.add(SourceSystemFunctions.SQRT); supportedFunctions.add(SourceSystemFunctions.SUBSTRING); supportedFunctions.add(SourceSystemFunctions.YEAR); + supportedFunctions.add(SourceSystemFunctions.UCASE); return supportedFunctions; } Modified: branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/intersyscache/InterSystemsCacheExecutionFactory.java =================================================================== --- branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/intersyscache/InterSystemsCacheExecutionFactory.java 2011-05-12 03:37:24 UTC (rev 3165) +++ branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/intersyscache/InterSystemsCacheExecutionFactory.java 2011-05-12 14:19:43 UTC (rev 3166) @@ -104,7 +104,7 @@ @Override public List<?> translate(Function function) { if (function.getType() == TypeFacility.RUNTIME_TYPES.INTEGER || function.getType() == TypeFacility.RUNTIME_TYPES.LONG) { - Function result = convert.createConvertFunction(getLanguageFactory(), function, TypeFacility.getDataTypeName(function.getType())); + Function result = ConvertModifier.createConvertFunction(getLanguageFactory(), function, TypeFacility.getDataTypeName(function.getType())); function.setType(TypeFacility.RUNTIME_TYPES.BIG_DECIMAL); return Arrays.asList(result); } @@ -119,19 +119,44 @@ supportedFunctions.addAll(super.getSupportedFunctions()); supportedFunctions.add(SourceSystemFunctions.ABS); + supportedFunctions.add(SourceSystemFunctions.ACOS); + supportedFunctions.add(SourceSystemFunctions.ASIN); + supportedFunctions.add(SourceSystemFunctions.ATAN); supportedFunctions.add(SourceSystemFunctions.ASCII); supportedFunctions.add(SourceSystemFunctions.CEILING); supportedFunctions.add(SourceSystemFunctions.CHAR); supportedFunctions.add(SourceSystemFunctions.COALESCE); + supportedFunctions.add(SourceSystemFunctions.CONCAT); supportedFunctions.add(SourceSystemFunctions.CONVERT); + supportedFunctions.add(SourceSystemFunctions.COS); + supportedFunctions.add(SourceSystemFunctions.COT); + supportedFunctions.add(SourceSystemFunctions.CURDATE); + supportedFunctions.add(SourceSystemFunctions.CURTIME); + supportedFunctions.add(SourceSystemFunctions.DAYNAME); + supportedFunctions.add(SourceSystemFunctions.DAYOFMONTH); + supportedFunctions.add(SourceSystemFunctions.DAYOFWEEK); + supportedFunctions.add(SourceSystemFunctions.DAYOFYEAR); + supportedFunctions.add(SourceSystemFunctions.EXP); supportedFunctions.add(SourceSystemFunctions.FLOOR); + supportedFunctions.add(SourceSystemFunctions.HOUR); supportedFunctions.add(SourceSystemFunctions.IFNULL); supportedFunctions.add(SourceSystemFunctions.LCASE); supportedFunctions.add(SourceSystemFunctions.LENGTH); supportedFunctions.add(SourceSystemFunctions.LPAD); supportedFunctions.add(SourceSystemFunctions.LTRIM); + supportedFunctions.add(SourceSystemFunctions.LOG); + supportedFunctions.add(SourceSystemFunctions.LOG10); + supportedFunctions.add(SourceSystemFunctions.LEFT); + supportedFunctions.add(SourceSystemFunctions.MINUTE); + supportedFunctions.add(SourceSystemFunctions.MONTH); + supportedFunctions.add(SourceSystemFunctions.MONTHNAME); + supportedFunctions.add(SourceSystemFunctions.MOD); supportedFunctions.add(SourceSystemFunctions.NULLIF); + supportedFunctions.add(SourceSystemFunctions.NOW); + supportedFunctions.add(SourceSystemFunctions.PI); supportedFunctions.add(SourceSystemFunctions.POWER); + supportedFunctions.add(SourceSystemFunctions.QUARTER); + supportedFunctions.add(SourceSystemFunctions.RIGHT); supportedFunctions.add(SourceSystemFunctions.REPEAT); supportedFunctions.add(SourceSystemFunctions.REPLACE); supportedFunctions.add(SourceSystemFunctions.ROUND); @@ -139,8 +164,16 @@ supportedFunctions.add(SourceSystemFunctions.RTRIM); supportedFunctions.add(SourceSystemFunctions.SIGN); supportedFunctions.add(SourceSystemFunctions.SUBSTRING); + supportedFunctions.add(SourceSystemFunctions.SIN); + supportedFunctions.add(SourceSystemFunctions.SECOND); + supportedFunctions.add(SourceSystemFunctions.SQRT); + supportedFunctions.add(SourceSystemFunctions.TAN); + supportedFunctions.add(SourceSystemFunctions.TIMESTAMPADD); + supportedFunctions.add(SourceSystemFunctions.TIMESTAMPDIFF); + supportedFunctions.add(SourceSystemFunctions.TRUNCATE); supportedFunctions.add(SourceSystemFunctions.UCASE); supportedFunctions.add(SourceSystemFunctions.XMLCONCAT); + supportedFunctions.add(SourceSystemFunctions.WEEK); return supportedFunctions; } Modified: branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teradata/TeradataExecutionFactory.java =================================================================== --- branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teradata/TeradataExecutionFactory.java 2011-05-12 03:37:24 UTC (rev 3165) +++ branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teradata/TeradataExecutionFactory.java 2011-05-12 14:19:43 UTC (rev 3166) @@ -30,8 +30,10 @@ import java.util.List; import org.teiid.core.types.DataTypeManager; +import org.teiid.language.ColumnReference; import org.teiid.language.Expression; import org.teiid.language.Function; +import org.teiid.language.LanguageFactory; import org.teiid.language.Literal; import org.teiid.metadata.FunctionMethod; import org.teiid.metadata.FunctionParameter; @@ -44,7 +46,6 @@ import org.teiid.translator.jdbc.FunctionModifier; import org.teiid.translator.jdbc.JDBCExecutionFactory; import org.teiid.translator.jdbc.SQLConversionVisitor; -import org.teiid.translator.jdbc.oracle.LeftOrRightFunctionModifier; @@ -80,8 +81,10 @@ convert.addConvert(FunctionModifier.TIMESTAMP, FunctionModifier.TIME, new TimeModifier("TIME")); //$NON-NLS-1$ convert.addConvert(FunctionModifier.TIMESTAMP, FunctionModifier.DATE, new TimeModifier("DATE")); //$NON-NLS-1$ convert.addConvert(FunctionModifier.TIME, FunctionModifier.TIMESTAMP, new TimeModifier("TIMESTAMP")); //$NON-NLS-1$ - convert.addConvert(FunctionModifier.DATE, FunctionModifier.TIMESTAMP, new TimeModifier("TIMESTAMP")); //$NON-NLS-1$ - + convert.addConvert(FunctionModifier.DATE, FunctionModifier.TIMESTAMP, new TimeModifier("TIMESTAMP")); //$NON-NLS-1$ + convert.addConvert(FunctionModifier.TIMESTAMP, FunctionModifier.STRING, new TimeModifier("varchar(100)")); //$NON-NLS-1$ + convert.addConvert(FunctionModifier.TIME, FunctionModifier.STRING, new TimeModifier("varchar(100)")); //$NON-NLS-1$ + convert.addConvert(FunctionModifier.DATE, FunctionModifier.STRING, new TimeModifier("varchar(100)")); //$NON-NLS-1$ convert.addTypeMapping("varchar(4000)", FunctionModifier.STRING); //$NON-NLS-1$ convert.addNumericBooleanConversions(); @@ -90,27 +93,20 @@ registerFunctionModifier(SourceSystemFunctions.RAND, new AliasModifier("random")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.LOG, new AliasModifier("LN")); //$NON-NLS-1$ - registerFunctionModifier(SourceSystemFunctions.LCASE, new AliasModifier("LOWER")); //$NON-NLS-1$ - registerFunctionModifier(SourceSystemFunctions.UCASE, new AliasModifier("UPPER")); //$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.LCASE, new UpperOrLowerModifier("LOWER", this.convert)); //$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.UCASE, new UpperOrLowerModifier("UPPER", this.convert)); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.LENGTH, new AliasModifier("CHARACTER_LENGTH")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.CURDATE, new AliasModifier("CURRENT_DATE")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.CURTIME, new AliasModifier("CURRENT_TIME")); //$NON-NLS-1$ - registerFunctionModifier(SourceSystemFunctions.SUBSTRING, new AliasModifier("substr"));//$NON-NLS-1$ - registerFunctionModifier(SourceSystemFunctions.YEAR, new ExtractModifier("YEAR")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.MONTH, new ExtractModifier("MONTH")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.DAYOFMONTH, new ExtractModifier("DAY")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.HOUR, new ExtractModifier("HOUR")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.MINUTE, new ExtractModifier("MINUTE")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.SECOND, new ExtractModifier("SECOND")); //$NON-NLS-1$ - registerFunctionModifier(SourceSystemFunctions.LOCATE, new FunctionModifier() { - @Override - public List<?> translate(Function function) { - return Arrays.asList("position(",function.getParameters().get(0)," in ",function.getParameters().get(1) ,")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - }); - registerFunctionModifier(SourceSystemFunctions.LEFT, new LeftOrRightFunctionModifier(getLanguageFactory())); - registerFunctionModifier(SourceSystemFunctions.RIGHT, new LeftOrRightFunctionModifier(getLanguageFactory())); + registerFunctionModifier(SourceSystemFunctions.LOCATE, new LocateModifier(this.convert)); + registerFunctionModifier(SourceSystemFunctions.LEFT, new LeftOrRightFunctionModifier(getLanguageFactory(), this.convert)); + registerFunctionModifier(SourceSystemFunctions.RIGHT, new LeftOrRightFunctionModifier(getLanguageFactory(), this.convert)); registerFunctionModifier(SourceSystemFunctions.COT, new FunctionModifier() { @Override public List<?> translate(Function function) { @@ -121,13 +117,13 @@ registerFunctionModifier(SourceSystemFunctions.LTRIM, new FunctionModifier() { @Override public List<?> translate(Function function) { - return Arrays.asList("TRIM(LEADING FROM ", function.getParameters().get(0), ")"); //$NON-NLS-1$ //$NON-NLS-2$ + return Arrays.asList("TRIM(LEADING FROM ", expressionToString(function.getParameters().get(0), convert), ")"); //$NON-NLS-1$ //$NON-NLS-2$ } }); registerFunctionModifier(SourceSystemFunctions.RTRIM, new FunctionModifier() { @Override public List<?> translate(Function function) { - return Arrays.asList("TRIM(TRAILING FROM ", function.getParameters().get(0), ")"); //$NON-NLS-1$ //$NON-NLS-2$ + return Arrays.asList("TRIM(TRAILING FROM ", expressionToString(function.getParameters().get(0), convert), ")"); //$NON-NLS-1$ //$NON-NLS-2$ } }); registerFunctionModifier(SourceSystemFunctions.MOD, new FunctionModifier() { @@ -167,6 +163,7 @@ supportedFunctions.add(SourceSystemFunctions.LOCATE); supportedFunctions.add(SourceSystemFunctions.LOG); supportedFunctions.add(SourceSystemFunctions.LCASE); + supportedFunctions.add("lower");//$NON-NLS-1$ supportedFunctions.add(SourceSystemFunctions.LTRIM); supportedFunctions.add(SourceSystemFunctions.LENGTH); supportedFunctions.add(SourceSystemFunctions.MINUTE); @@ -343,7 +340,55 @@ return false; } - public static class ExtractModifier extends FunctionModifier { + public static class LocateModifier extends FunctionModifier { + ConvertModifier convertModifier; + + public LocateModifier(ConvertModifier convertModifier) { + this.convertModifier = convertModifier; + } + + @Override + public List<?> translate(Function function) { + Expression expr1 = function.getParameters().get(0); + Expression expr2 = function.getParameters().get(1); + ArrayList target = new ArrayList(); + target.add("position("); //$NON-NLS-1$ + target.addAll(expressionToString(expr1, this.convertModifier)); + target.add( " in "); //$NON-NLS-1$ + target.addAll(expressionToString(expr2, this.convertModifier)); + target.add(")"); //$NON-NLS-1$ + return target; + } + } + + private static List<?> expressionToString(Expression expr, ConvertModifier modifier) { + Class tgtType = expr.getType(); + if (tgtType.equals(String.class) && (expr instanceof Literal)) { + return Arrays.asList(expr); + } + else if (tgtType.equals(String.class) && (expr instanceof Function)) { + + Function func = (Function)expr; + if (func.getParameters().get(0) instanceof ColumnReference) { + ColumnReference ref = (ColumnReference)func.getParameters().get(0); + if(Number.class.isAssignableFrom(ref.getType())) { + ArrayList target = new ArrayList(); + target.add("cast("); //$NON-NLS-1$ + target.add(func.getParameters().get(0)); + target.add(" AS varchar(100))"); //$NON-NLS-1$ + } + else { + return modifier.translate(func); + } + } + else { + return modifier.translate(func); + } + } + return Arrays.asList("cast(" , expr, " AS varchar(100))"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public static class ExtractModifier extends FunctionModifier { private String type; public ExtractModifier(String type) { this.type = type; @@ -369,7 +414,61 @@ } @Override public List<?> translate(Function function) { - return Arrays.asList("cast("+function.getParameters().get(0), " AS "+this.target+")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + return Arrays.asList("cast(", function.getParameters().get(0), " AS "+this.target+")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } + + public static class UpperOrLowerModifier extends FunctionModifier { + String funcName; + ConvertModifier convertModifier; + public UpperOrLowerModifier(String name, ConvertModifier converModifier) { + this.funcName = name; + this.convertModifier = converModifier; + } + @Override + public List<?> translate(Function function) { + Expression expr = function.getParameters().get(0); + ArrayList target = new ArrayList(); + target.add(this.funcName); + target.add("("); //$NON-NLS-1$ + target.addAll(expressionToString(expr, this.convertModifier)); + target.add(")"); //$NON-NLS-1$ + return target; + } + } + + public static class LeftOrRightFunctionModifier extends FunctionModifier { + private LanguageFactory langFactory; + ConvertModifier convertModifier; + + public LeftOrRightFunctionModifier(LanguageFactory langFactory, ConvertModifier converModifier) { + this.langFactory = langFactory; + this.convertModifier = converModifier; + } + + @Override + public List<?> translate(Function function) { + List<Expression> args = function.getParameters(); + ArrayList target = new ArrayList(); + if (function.getName().equalsIgnoreCase("left")) { //$NON-NLS-1$ + //substr(string, 1, length) + target.add("substr("); //$NON-NLS-1$ + target.addAll(expressionToString(args.get(0), this.convertModifier)); + target.add(langFactory.createLiteral(Integer.valueOf(1), TypeFacility.RUNTIME_TYPES.INTEGER)); + target.add(args.get(1)); + target.add(")"); //$NON-NLS-1$ + } else if (function.getName().equalsIgnoreCase("right")) { //$NON-NLS-1$ + //substr(case_size, character_length(case_size) -4) + target.add("substr("); //$NON-NLS-1$ + target.addAll(expressionToString(args.get(0), this.convertModifier)); + + target.add(",(character_length("); //$NON-NLS-1$ + target.addAll(expressionToString(args.get(0), this.convertModifier)); + target.add(")-"); //$NON-NLS-1$ + target.add(args.get(1)); + target.add("))"); //$NON-NLS-1$ + } + return target; + } + } } Modified: branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/teradata/TestTeradataTranslator.java =================================================================== --- branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/teradata/TestTeradataTranslator.java 2011-05-12 03:37:24 UTC (rev 3165) +++ branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/teradata/TestTeradataTranslator.java 2011-05-12 14:19:43 UTC (rev 3166) @@ -76,9 +76,28 @@ } @Test public void testTimestampToTime() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Timestamp(1304604994220L), Timestamp.class), "time", "cast({ts '2011-05-05 09:16:34.22'} AS TIME)"); + helpTest(LANG_FACTORY.createLiteral(new Timestamp(1304604994220L), Timestamp.class), "time", "cast(cast('2011-05-05 09:16:34.22' AS TIMESTAMP(6)) AS TIME)"); } + @Test public void testIntegerToString() throws Exception { + String input = "SELECT lcase(bigdecimalvalue) FROM BQT1.SMALLA"; + String output = "SELECT LOWER(cast(SmallA.BigDecimalValue AS varchar(100))) FROM SmallA"; + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); + } + + @Test public void testDateToString() throws Exception { + String input = "SELECT intkey, UPPER(timevalue) AS UPPER FROM BQT1.SmallA ORDER BY intkey"; + String output = "SELECT SmallA.IntKey, UPPER(cast(SmallA.TimeValue AS varchar(100))) AS UPPER FROM SmallA ORDER BY SmallA.IntKey"; + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); + } + + @Test public void testLocate() throws Exception { + String input = "SELECT INTKEY, BIGDECIMALVALUE FROM BQT1.SmallA WHERE LOCATE('-', BIGDECIMALVALUE) = 1 ORDER BY intkey"; + String output = "SELECT SmallA.IntKey, SmallA.BigDecimalValue FROM SmallA WHERE position('-' in cast(SmallA.BigDecimalValue AS varchar(100))) = 1 ORDER BY SmallA.IntKey"; + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); + } + + @Test public void testByteToString() throws Exception { helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class), "string", "1"); } @@ -158,7 +177,7 @@ @Test public void testRightFunction() throws Exception { String input = "SELECT INTKEY, FLOATNUM FROM BQT1.SmallA WHERE right(FLOATNUM, 2) <> 0 ORDER BY INTKEY"; - String out = "SELECT SmallA.IntKey, SmallA.FloatNum FROM SmallA WHERE SUBSTR(SmallA.FloatNum, (-1 * 2)) <> '0' ORDER BY SmallA.IntKey"; + String out = "SELECT SmallA.IntKey, SmallA.FloatNum FROM SmallA WHERE substr(cast(SmallA.FloatNum AS varchar(100)),(character_length(cast(SmallA.FloatNum AS varchar(100)))-2)) <> '0' ORDER BY SmallA.IntKey"; TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, null, input, out, TRANSLATOR); } }

12 years, 11 months

1
0
0 / 0

teiid SVN: r3165 - in branches/7.4.x/engine/src: test/java/org/teiid/query/processor and 1 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-05-11 23:37:24 -0400 (Wed, 11 May 2011) New Revision: 3165 Added: branches/7.4.x/engine/src/test/resources/text/cdm_dos_win.txt Modified: branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/TextTableNode.java branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java Log: TEIID-1584 fixing support for windows line terminators Modified: branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/TextTableNode.java =================================================================== --- branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/TextTableNode.java 2011-05-11 14:02:20 UTC (rev 3164) +++ branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/TextTableNode.java 2011-05-12 03:37:24 UTC (rev 3165) @@ -246,8 +246,12 @@ switch (c) { case '\r': cr = true; + textLine++; + return '\n'; case -1: eof = true; + textLine++; + return '\n'; case '\n': textLine++; return '\n'; Modified: branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java =================================================================== --- branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java 2011-05-11 14:02:20 UTC (rev 3164) +++ branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java 2011-05-12 03:37:24 UTC (rev 3165) @@ -75,6 +75,19 @@ processPreparedStatement(sql, expected, dataManager, new DefaultCapabilitiesFinder(), FakeMetadataFactory.example1Cached(), Arrays.asList(clobFromFile("text/cdm_dos.txt"))); } + @Test public void testTextTableFixedWin() throws Exception { + String sql = "select max(compkey), max(cdm_id), max(currency), max(\"start\"), max(maturity), max(amount), count(*) from texttable(? COLUMNS compkey string width 76, CDM_ID string width 14, CURRENCY string width 9, \"START\" string width 31, MATURITY string width 31, AMOUNT double width 21, RECORDSOURCE string width 13, SUMMIT_ID string width 15, RATE double width 20, SPREAD double width 20, DESK string width 14) x"; //$NON-NLS-1$ + + List[] expected = new List[] { + Arrays.asList("000369USD05/20/200405/20/2007", "000369", "USD", "12/18/2000", "12/19/2005", 6.7209685146E8, 52), + }; + + FakeDataManager dataManager = new FakeDataManager(); + sampleData1(dataManager); + + processPreparedStatement(sql, expected, dataManager, new DefaultCapabilitiesFinder(), FakeMetadataFactory.example1Cached(), Arrays.asList(clobFromFile("text/cdm_dos_win.txt"))); + } + @Test public void testTextTableFixedPartial() throws Exception { String sql = "select max(length(compkey)) from texttable(? COLUMNS compkey string width 76) x"; //$NON-NLS-1$ Added: branches/7.4.x/engine/src/test/resources/text/cdm_dos_win.txt =================================================================== --- branches/7.4.x/engine/src/test/resources/text/cdm_dos_win.txt (rev 0) +++ branches/7.4.x/engine/src/test/resources/text/cdm_dos_win.txt 2011-05-12 03:37:24 UTC (rev 3165) @@ -0,0 +1,52 @@ + 000183USD07/26/200107/26/2004 000183 USD 07/26/2001 07/26/2004 10000000.00 Summit 195205NY 0.005450 0.000000 MCREDCLN + 000184USD07/26/200107/26/2004 000184 USD 07/26/2001 07/26/2004 10000000.00 Summit 195219NY 0.005450 0.000000 NYBDUMMY + 000185USD07/26/200107/26/2004 000185 USD 07/26/2001 07/26/2004 10000000.00 Summit 195233NY 0.009700 0.000000 MCREDCLN + 000186USD07/26/200107/26/2004 000186 USD 07/26/2001 07/26/2004 10000000.00 Summit 195234NY 0.009700 0.000000 NYBDUMMY + 000258AUSD12/12/200209/15/2005 000258 USD 12/12/2002 09/15/2005 10000000.00 Summit 247299N 0.011500 0.000000 DCC2 + 000259AUSD01/17/200303/20/2005 000259 USD 01/17/2003 03/20/2005 10000000.00 Summit 247300N 0.011000 0.000000 DCC2 + 000273USD04/25/200307/07/2006 000273 USD 04/25/2003 07/07/2006 5000000.00 Summit 258123NY 0.008000 0.000000 LTINV + 000276AUSD05/10/200306/20/2008 000276 USD 05/10/2003 06/20/2008 10000000.00 Summit 260100N 0.033000 0.000000 DCC2 + 000277AUSD05/10/200306/20/2008 000277 USD 05/10/2003 06/20/2008 5000000.00 Summit 260101N 0.006500 0.000000 DCC2 + 000278AUSD05/13/200306/20/2008 000278 USD 05/13/2003 06/20/2008 5000000.00 Summit 260102N 0.033000 0.000000 DCC2 + 000279AUSD05/14/200306/20/2008 000279 USD 05/14/2003 06/20/2008 5000000.00 Summit 260131N 0.033000 0.000000 DCC2 + 000280USD06/11/200307/07/2006 000280 USD 06/11/2003 07/07/2006 5000000.00 Summit 264602NY 0.008900 0.000000 LTINV + 000289AUSD07/03/200309/20/2008 000289 USD 07/03/2003 09/20/2008 5000000.00 Summit 265496NY 0.004400 0.000000 LTINV + 000292USD07/19/200309/20/2008 000292 USD 07/19/2003 09/20/2008 5000000.00 Summit 271005NY 0.005000 0.000000 LTINV + 000350USD01/28/200403/20/2009 000350 USD 01/28/2004 03/20/2009 10000000.00 Summit 314996N 0.005200 0.000000 DCC2 + 000354USD03/10/200403/10/2007 000354 USD 03/10/2004 03/10/2007 9324082.77 Summit 318622NY 0.037500 0.000000 LTTRSCDS + 000357USD03/16/200403/16/2007 000357 USD 03/16/2004 03/16/2007 9924050.62 Summit 318638NY 0.030000 0.000000 LTTRSCDS + 000359USD03/09/200403/09/2007 000359 USD 03/09/2004 03/09/2007 9329349.59 Summit 318641NY 0.027500 0.000000 LTTRSCDS + 000360USD03/18/200403/18/2007 000360 USD 03/18/2004 03/18/2007 232935.47 Summit 318642NY 0.032500 0.000000 LTTRSCDS + 000352USD04/08/200404/08/2007 000352 USD 04/08/2004 04/08/2007 9788013.59 Summit 318643NY 0.032500 0.000000 LTTRSCDS + 000353USD03/04/200403/04/2007 000353 USD 03/04/2004 03/04/2007 809831.58 Summit 318644NY 0.032500 0.000000 LTTRSCDS + 000353USD03/04/200403/04/2007 000353 USD 03/04/2004 03/04/2007 705882.35 Summit 325357NY 0.032500 0.000000 LTTRSCDS + 000353USD03/04/200403/04/2007 000353 USD 03/04/2004 03/04/2007 156623.38 Summit 325358NY 0.032500 0.000000 LTTRSCDS + 000353USD03/04/200403/04/2007 000353 USD 03/04/2004 03/04/2007 278643.02 Summit 325363NY 0.032500 0.000000 LTTRSCDS + 000353USD03/04/200403/04/2007 000353 USD 03/04/2004 03/04/2007 711809.48 Summit 325364NY 0.032500 0.000000 LTTRSCDS + 000359USD03/09/200403/09/2007 000359 USD 03/09/2004 03/09/2007 76890.25 Summit 325366NY 0.027500 0.000000 LTTRSCDS + 000360USD03/18/200403/18/2007 000360 USD 03/18/2004 03/18/2007 1049811.00 Summit 329001NY 0.032500 0.000000 LTTRSCDS + 000360USD03/18/200403/18/2007 000360 USD 03/18/2004 03/18/2007 414407.12 Summit 329002NY 0.032500 0.000000 LTTRSCDS + 000360USD03/18/200403/18/2007 000360 USD 03/18/2004 03/18/2007 1204408.30 Summit 329003NY 0.032500 0.000000 LTTRSCDS + 000360USD03/18/200403/18/2007 000360 USD 03/18/2004 03/18/2007 1058626.60 Summit 329004NY 0.032500 0.000000 LTTRSCDS + 000362USD04/12/200404/12/2007 000362 USD 04/12/2004 04/12/2007 194934.82 Summit 331567NY 0.040000 0.000000 LTTRSCDS + 000362USD04/12/200404/12/2007 000362 USD 04/12/2004 04/12/2007 131062.23 Summit 335678NY 0.040000 0.000000 LTTRSCDS + 000362USD04/12/200404/12/2007 000362 USD 04/12/2004 04/12/2007 1094136.66 Summit 335679NY 0.040000 0.000000 LTTRSCDS + 000362USD04/12/200404/12/2007 000362 USD 04/12/2004 04/12/2007 2785075.14 Summit 335680NY 0.040000 0.000000 LTTRSCDS + 000362USD04/12/200404/12/2007 000362 USD 04/12/2004 04/12/2007 2785075.14 Summit 335681NY 0.040000 0.000000 LTTRSCDS + 000362USD04/12/200404/12/2007 000362 USD 04/12/2004 04/12/2007 2984009.08 Summit 335682NY 0.040000 0.000000 LTTRSCDS + 000363USD05/03/200405/03/2007 000363 USD 05/03/2004 05/03/2007 10000000.00 Summit 338242NY 0.025000 0.000000 LTTRSCDS + 000364USD05/17/200405/17/2007 000364 USD 05/17/2004 05/17/2007 5000000.00 Summit 338820NY 0.032500 0.000000 LTTRSCDS + 000365USD05/07/200406/20/2009 000365 USD 05/07/2004 06/20/2009 5000000.00 Summit 340411N 0.004800 0.000000 DCC2 + 000099USD12/06/199912/06/2004 000099 USD 12/06/1999 12/06/2004 200000000.00 Summit 340805NY 0.000000 0.000000 PCTRSCDS + 000129USD04/03/200010/01/2008 000129 USD 04/03/2000 10/01/2008 200000000.00 Summit 340834NY 0.000000 0.000000 PCTRSCDS + 000148USD09/12/200012/19/2005 000148 USD 09/12/2000 12/19/2005 573667.12 Summit 340844NY 0.000000 0.000000 PCTRSCDS + 000149USD09/12/200012/19/2005 000149 USD 09/12/2000 12/19/2005 2118155.52 Summit 340847NY 0.000000 0.000000 PCTRSCDS + 000150USD09/12/200012/19/2005 000150 USD 09/12/2000 12/19/2005 4986491.88 Summit 340848NY 0.000000 0.000000 PCTRSCDS + 000366USD05/06/200405/06/2007 000366 USD 05/06/2004 05/06/2007 3058823.53 Summit 341369NY 0.030000 0.000000 LTTRSCDS + 000367USD05/06/200405/06/2007 000367 USD 05/06/2004 05/06/2007 6941176.47 Summit 341377NY 0.030000 0.000000 LTTRSCDS + 000213USD02/11/200202/11/2007 000213 USD 02/11/2002 02/11/2007 8000000.00 Summit 343117NY 0.056500 0.000000 CNA2 + 000272USD03/05/200301/31/2005 000272 USD 03/05/2003 01/31/2005 28000000.00 Summit 343123NY 0.006000 0.000000 CNA2 + 000333USD11/13/200311/20/2004 000333 USD 11/13/2003 11/20/2004 25000000.00 Summit 343151NY 0.003800 0.000000 CNA2 + 000368USD05/24/200405/24/2007 000368 USD 05/24/2004 05/24/2007 10000000.00 Summit 343169NY 0.025000 0.000000 LTTRSCDS + 000168USD12/18/200001/31/2006 000168 USD 12/18/2000 01/31/2006 672096851.46 Summit 344846NY 0.000000 0.000000 ASGCGD + 000369USD05/20/200405/20/2007 000369 USD 05/20/2004 05/20/2007 10000000.00 Summit 344851NY 0.032500 0.000000 LTTRSCDS Property changes on: branches/7.4.x/engine/src/test/resources/text/cdm_dos_win.txt ___________________________________________________________________ Added: svn:mime-type + text/plain

12 years, 11 months

1
0
0 / 0

teiid SVN: r3164 - branches/7.4.x/build/kits/jboss-container.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-05-11 10:02:20 -0400 (Wed, 11 May 2011) New Revision: 3164 Modified: branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html Log: TEIID-1583 changing the default to match the docs Modified: branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html =================================================================== --- branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html 2011-05-11 13:59:23 UTC (rev 3163) +++ branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html 2011-05-11 14:02:20 UTC (rev 3164) @@ -127,6 +127,7 @@ <h4>from 7.3</h4> <ul> + <LI>The default value for the JDBC dynamic vdb importer setting importer.useFullSchemaName is now true, which matches the expected behavior from the documentation. <LI>The prepared plan cache is now configured via the PreparedPlanCacheConfig bean, rather than through properties on the RuntimeEngineDeployer <LI>SocketConfiguration.maxSocketThreads will interpret a setting of 0 to mean use the system default of max available processors. Both the ODBC and JDBC transports now default to the 0 setting. <LI>maxReserveBatchColumns and maxProcessingBatchesColumns will interpret a setting of -1 to mean auto-calculate acceptable values given the max heap and other information. See the admin guide for more.

12 years, 11 months

1
0
0 / 0

teiid SVN: r3163 - in branches/7.4.x: test-integration/common/src/test/java/org/teiid/jdbc and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-05-11 09:59:23 -0400 (Wed, 11 May 2011) New Revision: 3163 Modified: branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCMetdataProcessor.java branches/7.4.x/test-integration/common/src/test/java/org/teiid/jdbc/TestDymamicImportedMetaData.java Log: TEIID-1583 changing the default to match the docs Modified: branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCMetdataProcessor.java =================================================================== --- branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCMetdataProcessor.java 2011-05-10 19:53:41 UTC (rev 3162) +++ branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCMetdataProcessor.java 2011-05-11 13:59:23 UTC (rev 3163) @@ -76,7 +76,7 @@ private boolean importKeys; private boolean importIndexes; private String procedureNamePattern; - private boolean useFullSchemaName; + private boolean useFullSchemaName = true; private String[] tableTypes; private String tableNamePattern; private String catalog; Modified: branches/7.4.x/test-integration/common/src/test/java/org/teiid/jdbc/TestDymamicImportedMetaData.java =================================================================== --- branches/7.4.x/test-integration/common/src/test/java/org/teiid/jdbc/TestDymamicImportedMetaData.java 2011-05-10 19:53:41 UTC (rev 3162) +++ branches/7.4.x/test-integration/common/src/test/java/org/teiid/jdbc/TestDymamicImportedMetaData.java 2011-05-11 13:59:23 UTC (rev 3163) @@ -64,13 +64,13 @@ @Test public void testProcImport() throws Exception { FakeServer server = new FakeServer(); - server.deployVDB("test", UnitTestUtil.getTestDataPath() + "/TestCase3473/test.vdb"); - Connection conn = server.createConnection("jdbc:teiid:test"); //$NON-NLS-1$ + server.deployVDB("vdb", UnitTestUtil.getTestDataPath() + "/TestCase3473/test.vdb"); + Connection conn = server.createConnection("jdbc:teiid:vdb"); //$NON-NLS-1$ Properties importProperties = new Properties(); importProperties.setProperty("importer.importProcedures", Boolean.TRUE.toString()); MetadataFactory mf = getMetadata(importProperties, conn); - Procedure p = mf.getMetadataStore().getSchemas().get("TEST").getProcedures().get("GETXMLSCHEMAS"); + Procedure p = mf.getMetadataStore().getSchemas().get("TEST").getProcedures().get("VDB.SYS.GETXMLSCHEMAS"); assertEquals(1, p.getResultSet().getColumns().size()); } @@ -92,15 +92,17 @@ Connection conn = server.createConnection("jdbc:teiid:test"); //$NON-NLS-1$ Properties importProperties = new Properties(); + + getMetadata(importProperties, conn); + assertNotNull(mf.getMetadataStore().getSchemas().get("X").getTables().get("DUP")); + + importProperties.setProperty("importer.useFullSchemaName", Boolean.FALSE.toString()); try { getMetadata(importProperties, conn); + fail(); } catch (TranslatorException e) { } - - importProperties.setProperty("importer.useFullSchemaName", Boolean.TRUE.toString()); - getMetadata(importProperties, conn); - assertNotNull(mf.getMetadataStore().getSchemas().get("X").getTables().get("DUP")); } }

12 years, 11 months

1
0
0 / 0

teiid SVN: r3162 - in branches/7.4.x/engine/src: test/java/org/teiid/query/processor and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-05-10 15:53:41 -0400 (Tue, 10 May 2011) New Revision: 3162 Modified: branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java Log: update to accomodate designer function model integration Modified: branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java =================================================================== --- branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java 2011-05-10 18:14:22 UTC (rev 3161) +++ branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java 2011-05-10 19:53:41 UTC (rev 3162) @@ -53,6 +53,7 @@ private boolean requiresContext; private FunctionMethod method; private String schema; //TODO: remove me - we need to create a proper schema for udf and system functions + private Object metadataID; // This is transient as it would be useless to invoke this method in // a different VM. This function descriptor can be used to look up @@ -104,6 +105,7 @@ return this.requiresContext; } + @Override public String toString() { StringBuffer str = new StringBuffer(this.method.getName()); str.append("("); //$NON-NLS-1$ @@ -134,7 +136,8 @@ return this.method.getDeterminism(); } - public Object clone() { + @Override + public Object clone() { try { return super.clone(); } catch (CloneNotSupportedException e) { @@ -149,7 +152,15 @@ void setReturnType(Class<?> returnType) { this.returnType = returnType; } - + + public Object getMetadataID() { + return this.metadataID; + } + + public void setMetadataID(Object metadataID) { + this.metadataID = metadataID; + } + /** * Invoke the function described in the function descriptor, using the * values provided. Return the result of the function. Modified: branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java =================================================================== --- branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java 2011-05-10 18:14:22 UTC (rev 3161) +++ branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java 2011-05-10 19:53:41 UTC (rev 3162) @@ -189,7 +189,7 @@ * @param source The function metadata source, which knows how to obtain the invocation class * @param method The function metadata for a particular method signature */ - private void addFunction(String schema, FunctionMetadataSource source, FunctionMethod method) { + public FunctionDescriptor addFunction(String schema, FunctionMetadataSource source, FunctionMethod method) { String categoryKey = method.getCategory(); if (categoryKey == null) { method.setCategory(FunctionCategoryConstants.MISCELLANEOUS); @@ -270,6 +270,7 @@ } allFunctions.add(method); + return descriptor; } private FunctionDescriptor createFunctionDescriptor( @@ -285,7 +286,7 @@ Method invocationMethod = null; boolean requiresContext = false; // Defect 20007 - Ignore the invocation method if pushdown is not required. - if (method.getPushdown() == PushDown.CAN_PUSHDOWN || method.getPushdown() == PushDown.CANNOT_PUSHDOWN) { + if (validateClass && (method.getPushdown() == PushDown.CAN_PUSHDOWN || method.getPushdown() == PushDown.CANNOT_PUSHDOWN)) { try { Class<?> methodClass = source.getInvocationClass(method.getInvocationClass()); ReflectionHelper helper = new ReflectionHelper(methodClass); @@ -297,9 +298,7 @@ requiresContext = true; } } catch (ClassNotFoundException e) { - if (validateClass) { - throw new TeiidRuntimeException(e, "ERR.015.001.0047", QueryPlugin.Util.getString("FunctionTree.no_class", method.getName(), method.getInvocationClass())); //$NON-NLS-1$ //$NON-NLS-2$ - } + throw new TeiidRuntimeException(e, "ERR.015.001.0047", QueryPlugin.Util.getString("FunctionTree.no_class", method.getName(), method.getInvocationClass())); //$NON-NLS-1$ //$NON-NLS-2$ } catch (NoSuchMethodException e) { throw new TeiidRuntimeException(e, "ERR.015.001.0047", QueryPlugin.Util.getString("FunctionTree.no_method", method, method.getInvocationClass(), method.getInvocationMethod())); //$NON-NLS-1$ //$NON-NLS-2$ } catch (Exception e) { Modified: branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java =================================================================== --- branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2011-05-10 18:14:22 UTC (rev 3161) +++ branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2011-05-10 19:53:41 UTC (rev 3162) @@ -5265,7 +5265,7 @@ caps.setFunctionSupport("myrtrim", true); //$NON-NLS-1$ capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$ - FunctionLibrary funcLibrary = new FunctionLibrary(FakeMetadataFactory.SFM.getSystemFunctions(), new FunctionTree("foo", new FakeFunctionMetadataSource())); + FunctionLibrary funcLibrary = new FunctionLibrary(FakeMetadataFactory.SFM.getSystemFunctions(), new FunctionTree("foo", new FakeFunctionMetadataSource(), true)); FakeMetadataFacade metadata = new FakeMetadataFacade(FakeMetadataFactory.example1Cached().getStore(), funcLibrary); processPreparedStatement(sql, expected, dataManager, capFinder, @@ -5313,7 +5313,7 @@ caps.setFunctionSupport("concat", true); //$NON-NLS-1$ capFinder.addCapabilities("pm4", caps); //$NON-NLS-1$ - FunctionLibrary funcLibrary = new FunctionLibrary(FakeMetadataFactory.SFM.getSystemFunctions(), new FunctionTree("foo", new FakeFunctionMetadataSource())); + FunctionLibrary funcLibrary = new FunctionLibrary(FakeMetadataFactory.SFM.getSystemFunctions(), new FunctionTree("foo", new FakeFunctionMetadataSource(), true)); FakeMetadataFacade metadata = new FakeMetadataFacade(FakeMetadataFactory.example1Cached().getStore(), funcLibrary); processPreparedStatement(sql, expected, dataManager, capFinder,

12 years, 11 months

1
0
0 / 0

teiid SVN: r3161 - in branches/7.4.x/engine/src: test/java/org/teiid/query/processor and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-05-10 14:14:22 -0400 (Tue, 10 May 2011) New Revision: 3161 Modified: branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/JoinNode.java branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java Log: TEIID-1582 avoiding buffering if possible Modified: branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java =================================================================== --- branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java 2011-05-10 15:25:04 UTC (rev 3160) +++ branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java 2011-05-10 18:14:22 UTC (rev 3161) @@ -37,6 +37,7 @@ import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidProcessingException; import org.teiid.core.types.DataTypeManager; +import org.teiid.query.optimizer.relational.rules.NewCalculateCostUtil; import org.teiid.query.processor.CollectionTupleSource; import org.teiid.query.sql.lang.OrderBy; import org.teiid.query.sql.symbol.ElementSymbol; @@ -50,14 +51,14 @@ * Will be used for inner joins and only if both sorts are not required. * Degrades to a normal merge join if the tuples are balanced. * - * Refined in 7.4 to use a full index if it is small enough or a repeated merge, rather than a partitioning approach (which was really just a sinlge level index) + * Refined in 7.4 to use a full index if it is small enough or a repeated merge, rather than a partitioning approach (which was really just a single level index) */ public class EnhancedSortMergeJoinStrategy extends MergeJoinStrategy { private TupleSource currentSource; private SourceState sortedSource; private SourceState notSortedSource; - private List<?> partitionedTuple; + private List<?> currentTuple; private TupleBrowser tb; private int reserved; private STree index; @@ -132,7 +133,7 @@ if (!state.isDistinct()) { index.getComparator().setDistinctIndex(keyLength-2); } - IndexedTupleSource its = state.getTupleBuffer().createIndexedTupleSource(true); + IndexedTupleSource its = state.getTupleBuffer().createIndexedTupleSource(!joinNode.isDependent()); int rowId = 0; List<?> lastTuple = null; boolean sortedDistinct = sorted && !state.isDistinct(); @@ -175,20 +176,35 @@ @Override protected void loadLeft() throws TeiidComponentException, TeiidProcessingException { - //always buffer to determine row counts - this.leftSource.getTupleBuffer(); + if (this.joinNode.isDependent()) { + this.leftSource.getTupleBuffer(); + } } + private boolean shouldIndexIfSmall(SourceState source) throws TeiidComponentException, TeiidProcessingException { + Number cardinality = source.getSource().getEstimateNodeCardinality(); + return (source.hasBuffer() || (cardinality != null && cardinality.floatValue() != NewCalculateCostUtil.UNKNOWN_VALUE && cardinality.floatValue() <= this.joinNode.getBatchSize())) + && (source.getRowCount() <= this.joinNode.getBatchSize()); + } + @Override protected void loadRight() throws TeiidComponentException, TeiidProcessingException { - this.rightSource.getTupleBuffer(); - - if (processingSortRight == SortOption.SORT && shouldIndex(this.leftSource, this.rightSource)) { - this.processingSortRight = SortOption.NOT_SORTED; - } else if (processingSortLeft == SortOption.SORT && shouldIndex(this.rightSource, this.leftSource)) { + //the checks are done in a particular order to ensure we don't buffer if possible + if (processingSortRight == SortOption.SORT && shouldIndexIfSmall(this.leftSource)) { + this.processingSortRight = SortOption.NOT_SORTED; + } else if (!this.leftSource.hasBuffer() && processingSortLeft == SortOption.SORT && shouldIndexIfSmall(this.rightSource)) { this.processingSortLeft = SortOption.NOT_SORTED; - } + } else { + this.leftSource.getTupleBuffer(); + if (!this.rightSource.hasBuffer() && processingSortRight == SortOption.SORT && shouldIndexIfSmall(this.leftSource)) { + this.processingSortRight = SortOption.NOT_SORTED; + } else if (processingSortRight == SortOption.SORT && shouldIndex(this.leftSource, this.rightSource)) { + this.processingSortRight = SortOption.NOT_SORTED; + } else if (processingSortLeft == SortOption.SORT && shouldIndex(this.rightSource, this.leftSource)) { + this.processingSortLeft = SortOption.NOT_SORTED; + } + } if (this.processingSortLeft != SortOption.NOT_SORTED && this.processingSortRight != SortOption.NOT_SORTED) { super.loadRight(); super.loadLeft(); @@ -257,7 +273,7 @@ super.process(); return; } - if (this.rightSource.getTupleBuffer().getRowCount() == 0) { + if (this.sortedSource.getTupleBuffer().getRowCount() == 0) { return; } if (repeatedMerge) { @@ -271,28 +287,28 @@ } //else this is a single scan against the index if (currentSource == null) { - currentSource = this.notSortedSource.getTupleBuffer().createIndexedTupleSource(); + currentSource = this.notSortedSource.getIterator(); } while (true) { - if (this.partitionedTuple == null) { - partitionedTuple = this.currentSource.nextTuple(); - if (partitionedTuple == null) { + if (this.currentTuple == null) { + currentTuple = this.currentSource.nextTuple(); + if (currentTuple == null) { return; } - List<?> key = RelationalNode.projectTuple(this.notSortedSource.getExpressionIndexes(), this.partitionedTuple); + List<?> key = RelationalNode.projectTuple(this.notSortedSource.getExpressionIndexes(), this.currentTuple); tb = new TupleBrowser(this.index, new CollectionTupleSource(Arrays.asList(key).iterator()), OrderBy.ASC); } if (sortedTuple == null) { sortedTuple = tb.nextTuple(); if (sortedTuple == null) { - partitionedTuple = null; + currentTuple = null; continue; } } List<?> reorderedTuple = RelationalNode.projectTuple(reverseIndexes, sortedTuple); - List outputTuple = outputTuple(this.processingSortLeft==SortOption.NOT_SORTED?partitionedTuple:reorderedTuple, - this.processingSortLeft==SortOption.NOT_SORTED?reorderedTuple:partitionedTuple); + List outputTuple = outputTuple(this.processingSortLeft==SortOption.NOT_SORTED?currentTuple:reorderedTuple, + this.processingSortLeft==SortOption.NOT_SORTED?reorderedTuple:currentTuple); boolean matches = this.joinNode.matchesCriteria(outputTuple); this.sortedTuple = null; if (matches) { Modified: branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/JoinNode.java =================================================================== --- branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/JoinNode.java 2011-05-10 15:25:04 UTC (rev 3160) +++ branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/JoinNode.java 2011-05-10 18:14:22 UTC (rev 3161) @@ -189,7 +189,6 @@ if (state == State.LOAD_RIGHT) { this.joinStrategy.openRight(); this.joinStrategy.loadRight(); - this.getContext().getVariableContext().setGlobalValue(this.dependentValueSource, null); state = State.EXECUTE; } try { @@ -274,7 +273,7 @@ public void closeDirect() { super.closeDirect(); joinStrategy.close(); - if (this.getContext() != null) { + if (this.getContext() != null && this.dependentValueSource != null) { this.getContext().getVariableContext().setGlobalValue(this.dependentValueSource, null); } } Modified: branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java =================================================================== --- branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java 2011-05-10 15:25:04 UTC (rev 3160) +++ branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java 2011-05-10 18:14:22 UTC (rev 3161) @@ -229,7 +229,7 @@ @Test public void testMultiCritDepJoin5b() { //Create query - String sql = "SELECT X.e1, X.e2 FROM pm1.g1 as X, pm2.g1 WHERE concat(X.e1, convert(X.e4, string)) = concat(pm2.g1.e1, convert(pm2.g1.e4, string)) AND X.e2=pm2.g1.e2 order by x.e1 option makedep x"; //$NON-NLS-1$ + String sql = "SELECT X.e1, X.e2 FROM pm1.g1 as X, pm2.g1 WHERE concat(X.e1, convert(X.e4, string)) = concat(pm2.g1.e1, convert(pm2.g1.e4, string)) AND X.e2=pm2.g1.e2 order by x.e1, x.e2 option makedep x"; //$NON-NLS-1$ // Create expected results List[] expected = new List[] { @@ -779,7 +779,7 @@ /** SELECT pm1.g1.e2, pm2.g1.e2 FROM pm1.g1, pm2.g1 WHERE (pm1.g1.e2+1)=pm2.g1.e2 OPTION MAKEDEP pm1.g2 */ @Test public void testExpressionInDepJoin() { // Create query - String sql = "SELECT pm1.g1.e2, pm2.g1.e2 FROM pm1.g1, pm2.g1 WHERE (pm1.g1.e2+1)=pm2.g1.e2 OPTION MAKEDEP pm2.g1"; //$NON-NLS-1$ + String sql = "SELECT pm1.g1.e2, pm2.g1.e2 FROM pm1.g1, pm2.g1 WHERE (pm1.g1.e2+1)=pm2.g1.e2 order by pm1.g1.e2, pm2.g1.e2 OPTION MAKEDEP pm2.g1"; //$NON-NLS-1$ // Create expected results List[] expected = new List[] { Modified: branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java =================================================================== --- branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2011-05-10 15:25:04 UTC (rev 3160) +++ branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2011-05-10 18:14:22 UTC (rev 3161) @@ -1721,7 +1721,7 @@ @Test public void testSubqueryInJoinPredicate() { // Create query - String sql = "SELECT x.e1 FROM (SELECT e1 FROM pm1.g1) AS x JOIN (SELECT e1 FROM pm1.g1) y ON x.e1=y.e1"; //$NON-NLS-1$ + String sql = "SELECT x.e1 FROM (SELECT e1 FROM pm1.g1) AS x JOIN (SELECT e1 FROM pm1.g1) y ON x.e1=y.e1 order by x.e1"; //$NON-NLS-1$ // Create expected results List[] expected = new List[] { @@ -2805,15 +2805,15 @@ } @Test public void testCorrelatedSubqueryVirtualLayer2() { - String sql = "Select e1, e2 from vm1.g2 where e2 in (select e2 FROM vm1.g1 WHERE vm1.g2.e4 = vm1.g1.e4)"; //$NON-NLS-1$ + String sql = "Select e1, e2 from vm1.g2 where e2 in (select e2 FROM vm1.g1 WHERE vm1.g2.e4 = vm1.g1.e4) order by e1, e2"; //$NON-NLS-1$ // Create expected results List[] expected = new List[] { Arrays.asList(new Object[] { "a", new Integer(0) }), //$NON-NLS-1$ Arrays.asList(new Object[] { "a", new Integer(0) }), //$NON-NLS-1$ - Arrays.asList(new Object[] { "a", new Integer(3) }), //$NON-NLS-1$ Arrays.asList(new Object[] { "a", new Integer(0) }), //$NON-NLS-1$ Arrays.asList(new Object[] { "a", new Integer(0) }), //$NON-NLS-1$ + Arrays.asList(new Object[] { "a", new Integer(3) }), //$NON-NLS-1$ Arrays.asList(new Object[] { "b", new Integer(2) }) //$NON-NLS-1$ }; @@ -4452,7 +4452,7 @@ @Test public void testDefect11236_MergeJoinWithFunctions() { // Create query - String sql = "SELECT pm1.g1.e2, pm2.g1.e2 FROM pm1.g1, pm2.g1 WHERE pm1.g1.e2 = (pm2.g1.e2+1)"; //$NON-NLS-1$ + String sql = "SELECT pm1.g1.e2, pm2.g1.e2 FROM pm1.g1, pm2.g1 WHERE pm1.g1.e2 = (pm2.g1.e2+1) order by pm1.g1.e2, pm2.g1.e2"; //$NON-NLS-1$ boolean pushDown = false; boolean dependent = false; Modified: branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java =================================================================== --- branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java 2011-05-10 15:25:04 UTC (rev 3160) +++ branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java 2011-05-10 18:14:22 UTC (rev 3161) @@ -221,7 +221,7 @@ public void helpTestVirtualDepJoinSourceSelection(boolean setPushdown) throws Exception { // Create query - String sql = "select c.id as CustomerID, First, Last, a.account_id as AccountID, transaction_id as TransactionID, txn_type AS TxnCode, Amount, source from (CustomerMaster.Customers c join CustomerMaster.Locations l on c.id=l.id) join Accounts.Accounts a on c.id=a.customer_id and l.location=a.source where c.first='Miles' option makenotdep c, l"; //$NON-NLS-1$ + String sql = "select c.id as CustomerID, First, Last, a.account_id as AccountID, transaction_id as TransactionID, txn_type AS TxnCode, Amount, source from (CustomerMaster.Customers c join CustomerMaster.Locations l on c.id=l.id) join Accounts.Accounts a on c.id=a.customer_id and l.location=a.source where c.first='Miles' order by accountid option makenotdep c, l"; //$NON-NLS-1$ // Create expected results List[] expected = new List[] { @@ -270,7 +270,7 @@ 0, // PlanExecution 3, // Project selectCount, // Select - 0, // Sort + 1, // Sort 1 // UnionAll });

12 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

teiid-commits May 2011