October 2010 - teiid-commits - Jboss List Archives

teiid SVN: r2698 - in trunk: adminshell and 36 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-10-29 16:02:52 -0400 (Fri, 29 Oct 2010) New Revision: 2698 Modified: trunk/adminshell/pom.xml trunk/api/pom.xml trunk/build/pom.xml trunk/cache-jbosscache/pom.xml trunk/client/pom.xml trunk/common-core/pom.xml trunk/connectors/connector-file/pom.xml trunk/connectors/connector-ldap/pom.xml trunk/connectors/connector-salesforce/pom.xml trunk/connectors/connector-ws/pom.xml trunk/connectors/pom.xml trunk/connectors/salesforce-api/pom.xml trunk/connectors/sandbox/pom.xml trunk/connectors/sandbox/translator-yahoo/pom.xml trunk/connectors/translator-file/pom.xml trunk/connectors/translator-jdbc/pom.xml trunk/connectors/translator-ldap/pom.xml trunk/connectors/translator-loopback/pom.xml trunk/connectors/translator-salesforce/pom.xml trunk/connectors/translator-ws/pom.xml trunk/console/pom.xml trunk/documentation/admin-guide/pom.xml trunk/documentation/caching-guide/pom.xml trunk/documentation/client-developers-guide/pom.xml trunk/documentation/developer-guide/pom.xml trunk/documentation/pom.xml trunk/documentation/quick-start-example/pom.xml trunk/documentation/reference/pom.xml trunk/engine/pom.xml trunk/hibernate-dialect/pom.xml trunk/jboss-integration/pom.xml trunk/metadata/pom.xml trunk/pom.xml trunk/runtime/pom.xml trunk/test-integration/common/pom.xml trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java trunk/test-integration/db/pom.xml trunk/test-integration/pom.xml Log: switching trunk to 7.3 Modified: trunk/adminshell/pom.xml =================================================================== --- trunk/adminshell/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/adminshell/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-adminshell</artifactId> Modified: trunk/api/pom.xml =================================================================== --- trunk/api/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/api/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-api</artifactId> Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/build/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid</artifactId> Modified: trunk/cache-jbosscache/pom.xml =================================================================== --- trunk/cache-jbosscache/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/cache-jbosscache/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-cache-jbosscache</artifactId> Modified: trunk/client/pom.xml =================================================================== --- trunk/client/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/client/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-client</artifactId> Modified: trunk/common-core/pom.xml =================================================================== --- trunk/common-core/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/common-core/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-common-core</artifactId> Modified: trunk/connectors/connector-file/pom.xml =================================================================== --- trunk/connectors/connector-file/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/connectors/connector-file/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-file</artifactId> Modified: trunk/connectors/connector-ldap/pom.xml =================================================================== --- trunk/connectors/connector-ldap/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/connectors/connector-ldap/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ldap</artifactId> Modified: trunk/connectors/connector-salesforce/pom.xml =================================================================== --- trunk/connectors/connector-salesforce/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/connectors/connector-salesforce/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-salesforce</artifactId> Modified: trunk/connectors/connector-ws/pom.xml =================================================================== --- trunk/connectors/connector-ws/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/connectors/connector-ws/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ws</artifactId> Modified: trunk/connectors/pom.xml =================================================================== --- trunk/connectors/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/connectors/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/connectors/salesforce-api/pom.xml =================================================================== --- trunk/connectors/salesforce-api/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/connectors/salesforce-api/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>salesforce-api</artifactId> Modified: trunk/connectors/sandbox/pom.xml =================================================================== --- trunk/connectors/sandbox/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/connectors/sandbox/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid.connectors</groupId> Modified: trunk/connectors/sandbox/translator-yahoo/pom.xml =================================================================== --- trunk/connectors/sandbox/translator-yahoo/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/connectors/sandbox/translator-yahoo/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-yahoo</artifactId> Modified: trunk/connectors/translator-file/pom.xml =================================================================== --- trunk/connectors/translator-file/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/connectors/translator-file/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-file</artifactId> Modified: trunk/connectors/translator-jdbc/pom.xml =================================================================== --- trunk/connectors/translator-jdbc/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/connectors/translator-jdbc/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-jdbc</artifactId> Modified: trunk/connectors/translator-ldap/pom.xml =================================================================== --- trunk/connectors/translator-ldap/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/connectors/translator-ldap/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ldap</artifactId> Modified: trunk/connectors/translator-loopback/pom.xml =================================================================== --- trunk/connectors/translator-loopback/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/connectors/translator-loopback/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-loopback</artifactId> Modified: trunk/connectors/translator-salesforce/pom.xml =================================================================== --- trunk/connectors/translator-salesforce/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/connectors/translator-salesforce/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-salesforce</artifactId> Modified: trunk/connectors/translator-ws/pom.xml =================================================================== --- trunk/connectors/translator-ws/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/connectors/translator-ws/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ws</artifactId> Modified: trunk/console/pom.xml =================================================================== --- trunk/console/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/console/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/documentation/admin-guide/pom.xml =================================================================== --- trunk/documentation/admin-guide/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/documentation/admin-guide/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>admin-guide</artifactId> Modified: trunk/documentation/caching-guide/pom.xml =================================================================== --- trunk/documentation/caching-guide/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/documentation/caching-guide/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>caching-guide</artifactId> Modified: trunk/documentation/client-developers-guide/pom.xml =================================================================== --- trunk/documentation/client-developers-guide/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/documentation/client-developers-guide/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>client-developers-guide</artifactId> Modified: trunk/documentation/developer-guide/pom.xml =================================================================== --- trunk/documentation/developer-guide/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/documentation/developer-guide/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>developer-guide</artifactId> Modified: trunk/documentation/pom.xml =================================================================== --- trunk/documentation/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/documentation/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/documentation/quick-start-example/pom.xml =================================================================== --- trunk/documentation/quick-start-example/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/documentation/quick-start-example/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>quick-start-example</artifactId> Modified: trunk/documentation/reference/pom.xml =================================================================== --- trunk/documentation/reference/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/documentation/reference/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>reference</artifactId> Modified: trunk/engine/pom.xml =================================================================== --- trunk/engine/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/engine/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-engine</artifactId> Modified: trunk/hibernate-dialect/pom.xml =================================================================== --- trunk/hibernate-dialect/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/hibernate-dialect/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-hibernate-dialect</artifactId> Modified: trunk/jboss-integration/pom.xml =================================================================== --- trunk/jboss-integration/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/jboss-integration/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/metadata/pom.xml =================================================================== --- trunk/metadata/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/metadata/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-metadata</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -5,7 +5,7 @@ <artifactId>teiid-parent</artifactId> <packaging>pom</packaging> <name>Teiid</name> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> <description>Federated SQL and XML query engine.</description> <properties> <ant.version>1.7.0</ant.version> Modified: trunk/runtime/pom.xml =================================================================== --- trunk/runtime/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/runtime/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/test-integration/common/pom.xml =================================================================== --- trunk/test-integration/common/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/test-integration/common/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>test-integration-common</artifactId> Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java 2010-10-29 20:02:52 UTC (rev 2698) @@ -895,7 +895,7 @@ expected.put("getCatalogSeparator", ""); //$NON-NLS-1$ //$NON-NLS-2$ expected.put("getCatalogTerm", "VirtualDatabase"); //$NON-NLS-1$ //$NON-NLS-2$ expected.put("getDatabaseProductName", "Teiid Embedded"); //$NON-NLS-1$ //$NON-NLS-2$ - expected.put("getDatabaseProductVersion", "7.2"); //$NON-NLS-1$ //$NON-NLS-2$ + expected.put("getDatabaseProductVersion", ApplicationInfo.getInstance().getMajorReleaseVersion()+"."+ApplicationInfo.getInstance().getMinorReleaseVersion()); //$NON-NLS-1$ //$NON-NLS-2$ expected.put("getDriverName", "Teiid JDBC Driver"); //$NON-NLS-1$ //$NON-NLS-2$ expected.put("getDriverVersion", ApplicationInfo.getInstance().getMajorReleaseVersion()+"."+ApplicationInfo.getInstance().getMinorReleaseVersion()); //$NON-NLS-1$ //$NON-NLS-2$ expected.put("getExtraNameCharacters", ".@"); //$NON-NLS-1$ //$NON-NLS-2$ Modified: trunk/test-integration/db/pom.xml =================================================================== --- trunk/test-integration/db/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/test-integration/db/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -9,7 +9,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/test-integration/pom.xml =================================================================== --- trunk/test-integration/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) +++ trunk/test-integration/pom.xml 2010-10-29 20:02:52 UTC (rev 2698) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.3.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-test-integration</artifactId>

14 years, 1 month

1
0
0 / 0

teiid SVN: r2697 - in branches/7.2.x: adminshell and 35 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-10-29 16:02:40 -0400 (Fri, 29 Oct 2010) New Revision: 2697 Modified: branches/7.2.x/adminshell/pom.xml branches/7.2.x/api/pom.xml branches/7.2.x/build/pom.xml branches/7.2.x/cache-jbosscache/pom.xml branches/7.2.x/client/pom.xml branches/7.2.x/common-core/pom.xml branches/7.2.x/connectors/connector-file/pom.xml branches/7.2.x/connectors/connector-ldap/pom.xml branches/7.2.x/connectors/connector-salesforce/pom.xml branches/7.2.x/connectors/connector-ws/pom.xml branches/7.2.x/connectors/pom.xml branches/7.2.x/connectors/salesforce-api/pom.xml branches/7.2.x/connectors/sandbox/pom.xml branches/7.2.x/connectors/sandbox/translator-yahoo/pom.xml branches/7.2.x/connectors/translator-file/pom.xml branches/7.2.x/connectors/translator-jdbc/pom.xml branches/7.2.x/connectors/translator-ldap/pom.xml branches/7.2.x/connectors/translator-loopback/pom.xml branches/7.2.x/connectors/translator-salesforce/pom.xml branches/7.2.x/connectors/translator-ws/pom.xml branches/7.2.x/console/pom.xml branches/7.2.x/documentation/admin-guide/pom.xml branches/7.2.x/documentation/caching-guide/pom.xml branches/7.2.x/documentation/client-developers-guide/pom.xml branches/7.2.x/documentation/developer-guide/pom.xml branches/7.2.x/documentation/pom.xml branches/7.2.x/documentation/quick-start-example/pom.xml branches/7.2.x/documentation/reference/pom.xml branches/7.2.x/engine/pom.xml branches/7.2.x/hibernate-dialect/pom.xml branches/7.2.x/jboss-integration/pom.xml branches/7.2.x/metadata/pom.xml branches/7.2.x/pom.xml branches/7.2.x/runtime/pom.xml branches/7.2.x/test-integration/common/pom.xml branches/7.2.x/test-integration/db/pom.xml branches/7.2.x/test-integration/pom.xml Log: correcting to the snapshot version Modified: branches/7.2.x/adminshell/pom.xml =================================================================== --- branches/7.2.x/adminshell/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/adminshell/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-adminshell</artifactId> Modified: branches/7.2.x/api/pom.xml =================================================================== --- branches/7.2.x/api/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/api/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-api</artifactId> Modified: branches/7.2.x/build/pom.xml =================================================================== --- branches/7.2.x/build/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/build/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid</artifactId> Modified: branches/7.2.x/cache-jbosscache/pom.xml =================================================================== --- branches/7.2.x/cache-jbosscache/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/cache-jbosscache/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-cache-jbosscache</artifactId> Modified: branches/7.2.x/client/pom.xml =================================================================== --- branches/7.2.x/client/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/client/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-client</artifactId> Modified: branches/7.2.x/common-core/pom.xml =================================================================== --- branches/7.2.x/common-core/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/common-core/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-common-core</artifactId> Modified: branches/7.2.x/connectors/connector-file/pom.xml =================================================================== --- branches/7.2.x/connectors/connector-file/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/connectors/connector-file/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-file</artifactId> Modified: branches/7.2.x/connectors/connector-ldap/pom.xml =================================================================== --- branches/7.2.x/connectors/connector-ldap/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/connectors/connector-ldap/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ldap</artifactId> Modified: branches/7.2.x/connectors/connector-salesforce/pom.xml =================================================================== --- branches/7.2.x/connectors/connector-salesforce/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/connectors/connector-salesforce/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-salesforce</artifactId> Modified: branches/7.2.x/connectors/connector-ws/pom.xml =================================================================== --- branches/7.2.x/connectors/connector-ws/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/connectors/connector-ws/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ws</artifactId> Modified: branches/7.2.x/connectors/pom.xml =================================================================== --- branches/7.2.x/connectors/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/connectors/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: branches/7.2.x/connectors/salesforce-api/pom.xml =================================================================== --- branches/7.2.x/connectors/salesforce-api/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/connectors/salesforce-api/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>salesforce-api</artifactId> Modified: branches/7.2.x/connectors/sandbox/pom.xml =================================================================== --- branches/7.2.x/connectors/sandbox/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/connectors/sandbox/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid.connectors</groupId> Modified: branches/7.2.x/connectors/sandbox/translator-yahoo/pom.xml =================================================================== --- branches/7.2.x/connectors/sandbox/translator-yahoo/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/connectors/sandbox/translator-yahoo/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-yahoo</artifactId> Modified: branches/7.2.x/connectors/translator-file/pom.xml =================================================================== --- branches/7.2.x/connectors/translator-file/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/connectors/translator-file/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-file</artifactId> Modified: branches/7.2.x/connectors/translator-jdbc/pom.xml =================================================================== --- branches/7.2.x/connectors/translator-jdbc/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/connectors/translator-jdbc/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-jdbc</artifactId> Modified: branches/7.2.x/connectors/translator-ldap/pom.xml =================================================================== --- branches/7.2.x/connectors/translator-ldap/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/connectors/translator-ldap/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ldap</artifactId> Modified: branches/7.2.x/connectors/translator-loopback/pom.xml =================================================================== --- branches/7.2.x/connectors/translator-loopback/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/connectors/translator-loopback/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-loopback</artifactId> Modified: branches/7.2.x/connectors/translator-salesforce/pom.xml =================================================================== --- branches/7.2.x/connectors/translator-salesforce/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/connectors/translator-salesforce/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-salesforce</artifactId> Modified: branches/7.2.x/connectors/translator-ws/pom.xml =================================================================== --- branches/7.2.x/connectors/translator-ws/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/connectors/translator-ws/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ws</artifactId> Modified: branches/7.2.x/console/pom.xml =================================================================== --- branches/7.2.x/console/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/console/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/7.2.x/documentation/admin-guide/pom.xml =================================================================== --- branches/7.2.x/documentation/admin-guide/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/documentation/admin-guide/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>admin-guide</artifactId> Modified: branches/7.2.x/documentation/caching-guide/pom.xml =================================================================== --- branches/7.2.x/documentation/caching-guide/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/documentation/caching-guide/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>caching-guide</artifactId> Modified: branches/7.2.x/documentation/client-developers-guide/pom.xml =================================================================== --- branches/7.2.x/documentation/client-developers-guide/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/documentation/client-developers-guide/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>client-developers-guide</artifactId> Modified: branches/7.2.x/documentation/developer-guide/pom.xml =================================================================== --- branches/7.2.x/documentation/developer-guide/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/documentation/developer-guide/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>developer-guide</artifactId> Modified: branches/7.2.x/documentation/pom.xml =================================================================== --- branches/7.2.x/documentation/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/documentation/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: branches/7.2.x/documentation/quick-start-example/pom.xml =================================================================== --- branches/7.2.x/documentation/quick-start-example/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/documentation/quick-start-example/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>quick-start-example</artifactId> Modified: branches/7.2.x/documentation/reference/pom.xml =================================================================== --- branches/7.2.x/documentation/reference/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/documentation/reference/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>reference</artifactId> Modified: branches/7.2.x/engine/pom.xml =================================================================== --- branches/7.2.x/engine/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/engine/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-engine</artifactId> Modified: branches/7.2.x/hibernate-dialect/pom.xml =================================================================== --- branches/7.2.x/hibernate-dialect/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/hibernate-dialect/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-hibernate-dialect</artifactId> Modified: branches/7.2.x/jboss-integration/pom.xml =================================================================== --- branches/7.2.x/jboss-integration/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/jboss-integration/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: branches/7.2.x/metadata/pom.xml =================================================================== --- branches/7.2.x/metadata/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/metadata/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-metadata</artifactId> Modified: branches/7.2.x/pom.xml =================================================================== --- branches/7.2.x/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -5,7 +5,7 @@ <artifactId>teiid-parent</artifactId> <packaging>pom</packaging> <name>Teiid</name> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> <description>Federated SQL and XML query engine.</description> <properties> <ant.version>1.7.0</ant.version> Modified: branches/7.2.x/runtime/pom.xml =================================================================== --- branches/7.2.x/runtime/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/runtime/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: branches/7.2.x/test-integration/common/pom.xml =================================================================== --- branches/7.2.x/test-integration/common/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/test-integration/common/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>test-integration-common</artifactId> Modified: branches/7.2.x/test-integration/db/pom.xml =================================================================== --- branches/7.2.x/test-integration/db/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/test-integration/db/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -9,7 +9,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/7.2.x/test-integration/pom.xml =================================================================== --- branches/7.2.x/test-integration/pom.xml 2010-10-29 19:44:14 UTC (rev 2696) +++ branches/7.2.x/test-integration/pom.xml 2010-10-29 20:02:40 UTC (rev 2697) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Final</version> + <version>7.2.0.Final-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-test-integration</artifactId>

14 years, 1 month

1
0
0 / 0

teiid SVN: r2696 - branches.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-10-29 15:44:14 -0400 (Fri, 29 Oct 2010) New Revision: 2696 Added: branches/7.2.x/ Log: creating 7.2.x branch Copied: branches/7.2.x (from rev 2695, trunk)

14 years, 1 month

1
0
0 / 0

teiid SVN: r2695 - in branches/7.1.x/engine/src/main/java/org/teiid: query/parser and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2010-10-29 15:17:54 -0400 (Fri, 29 Oct 2010) New Revision: 2695 Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/SessionAwareCache.java branches/7.1.x/engine/src/main/java/org/teiid/query/parser/QueryParser.java Log: TEIID-1336: Fixing the code to not hit the cache when user did not turn on caching or did not provide a cache hint. Also, resetting the total requests and cacheHitRatio if the contents of the cache are cleared. Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java 2010-10-29 18:45:33 UTC (rev 2694) +++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java 2010-10-29 19:17:54 UTC (rev 2695) @@ -60,6 +60,7 @@ import org.teiid.query.analysis.AnalysisRecord; import org.teiid.query.function.metadata.FunctionMethod; import org.teiid.query.parser.ParseInfo; +import org.teiid.query.parser.QueryParser; import org.teiid.query.processor.BatchCollector; import org.teiid.query.processor.QueryProcessor; import org.teiid.query.sql.lang.Command; @@ -333,19 +334,27 @@ protected void processNew() throws TeiidProcessingException, TeiidComponentException { SessionAwareCache<CachedResults> rsCache = dqpCore.getRsCache(); - ParseInfo pi = Request.createParseInfo(requestMsg); - CacheID cacheId = new CacheID(this.dqpWorkContext, pi, requestMsg.getCommandString()); - boolean cachable = cacheId.setParameters(requestMsg.getParameterValues()); - if (rsCache != null && cachable) { - CachedResults cr = rsCache.get(cacheId); - if (cr != null && (requestMsg.useResultSetCache() || cr.getHint() != null)) { - this.resultsBuffer = cr.getResults(); - this.analysisRecord = cr.getAnalysisRecord(); - request.initMetadata(); - this.originalCommand = cr.getCommand(requestMsg.getCommandString(), request.metadata, pi); - request.validateAccess(this.originalCommand); - this.doneProducingBatches(); - return; + + boolean cachable = false; + CacheID cacheId = null; + boolean canUseCached = (requestMsg.useResultSetCache() || + QueryParser.getQueryParser().parseCacheHint(requestMsg.getCommandString()) != null); + + if (rsCache != null && canUseCached) { + ParseInfo pi = Request.createParseInfo(requestMsg); + cacheId = new CacheID(this.dqpWorkContext, pi, requestMsg.getCommandString()); + cachable = cacheId.setParameters(requestMsg.getParameterValues()); + if (cachable) { + CachedResults cr = rsCache.get(cacheId); + if (cr != null) { + this.resultsBuffer = cr.getResults(); + this.analysisRecord = cr.getAnalysisRecord(); + request.initMetadata(); + this.originalCommand = cr.getCommand(requestMsg.getCommandString(), request.metadata, pi); + request.validateAccess(this.originalCommand); + this.doneProducingBatches(); + return; + } } } request.processRequest(); Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/SessionAwareCache.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/SessionAwareCache.java 2010-10-29 18:45:33 UTC (rev 2694) +++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/SessionAwareCache.java 2010-10-29 19:17:54 UTC (rev 2695) @@ -173,6 +173,8 @@ public void clearAll(){ this.localCache.clear(); this.distributedCache.clear(); + this.totalRequests.set(0); + this.cacheHit.set(0); } public void clearForVDB(String vdbName, int version) { Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/parser/QueryParser.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/parser/QueryParser.java 2010-10-29 18:45:33 UTC (rev 2694) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/parser/QueryParser.java 2010-10-29 19:17:54 UTC (rev 2695) @@ -26,6 +26,7 @@ import org.teiid.api.exception.query.QueryParserException; import org.teiid.query.QueryPlugin; +import org.teiid.query.sql.lang.CacheHint; import org.teiid.query.sql.lang.Command; import org.teiid.query.sql.lang.Criteria; import org.teiid.query.sql.symbol.Expression; @@ -123,6 +124,13 @@ } return result; } + + public CacheHint parseCacheHint(String sql) throws QueryParserException { + if(sql == null || sql.length() == 0) { + throw new QueryParserException(QueryPlugin.Util.getString("QueryParser.emptysql")); //$NON-NLS-1$ + } + return SQLParserUtil.getQueryCacheOption(sql); + } /** * Takes a SQL string representing an SQL criteria (i.e. just the WHERE

14 years, 1 month

1
0
0 / 0

teiid SVN: r2694 - in trunk: adminshell and 35 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-10-29 14:45:33 -0400 (Fri, 29 Oct 2010) New Revision: 2694 Modified: trunk/adminshell/pom.xml trunk/api/pom.xml trunk/build/pom.xml trunk/cache-jbosscache/pom.xml trunk/client/pom.xml trunk/common-core/pom.xml trunk/connectors/connector-file/pom.xml trunk/connectors/connector-ldap/pom.xml trunk/connectors/connector-salesforce/pom.xml trunk/connectors/connector-ws/pom.xml trunk/connectors/pom.xml trunk/connectors/salesforce-api/pom.xml trunk/connectors/sandbox/pom.xml trunk/connectors/sandbox/translator-yahoo/pom.xml trunk/connectors/translator-file/pom.xml trunk/connectors/translator-jdbc/pom.xml trunk/connectors/translator-ldap/pom.xml trunk/connectors/translator-loopback/pom.xml trunk/connectors/translator-salesforce/pom.xml trunk/connectors/translator-ws/pom.xml trunk/console/pom.xml trunk/documentation/admin-guide/pom.xml trunk/documentation/caching-guide/pom.xml trunk/documentation/client-developers-guide/pom.xml trunk/documentation/developer-guide/pom.xml trunk/documentation/pom.xml trunk/documentation/quick-start-example/pom.xml trunk/documentation/reference/pom.xml trunk/engine/pom.xml trunk/hibernate-dialect/pom.xml trunk/jboss-integration/pom.xml trunk/metadata/pom.xml trunk/pom.xml trunk/runtime/pom.xml trunk/test-integration/common/pom.xml trunk/test-integration/db/pom.xml trunk/test-integration/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/adminshell/pom.xml =================================================================== --- trunk/adminshell/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/adminshell/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-adminshell</artifactId> Modified: trunk/api/pom.xml =================================================================== --- trunk/api/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/api/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-api</artifactId> Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/build/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid</artifactId> Modified: trunk/cache-jbosscache/pom.xml =================================================================== --- trunk/cache-jbosscache/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/cache-jbosscache/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-cache-jbosscache</artifactId> Modified: trunk/client/pom.xml =================================================================== --- trunk/client/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/client/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-client</artifactId> Modified: trunk/common-core/pom.xml =================================================================== --- trunk/common-core/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/common-core/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-common-core</artifactId> Modified: trunk/connectors/connector-file/pom.xml =================================================================== --- trunk/connectors/connector-file/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/connectors/connector-file/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-file</artifactId> Modified: trunk/connectors/connector-ldap/pom.xml =================================================================== --- trunk/connectors/connector-ldap/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/connectors/connector-ldap/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ldap</artifactId> Modified: trunk/connectors/connector-salesforce/pom.xml =================================================================== --- trunk/connectors/connector-salesforce/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/connectors/connector-salesforce/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-salesforce</artifactId> Modified: trunk/connectors/connector-ws/pom.xml =================================================================== --- trunk/connectors/connector-ws/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/connectors/connector-ws/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ws</artifactId> Modified: trunk/connectors/pom.xml =================================================================== --- trunk/connectors/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/connectors/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/connectors/salesforce-api/pom.xml =================================================================== --- trunk/connectors/salesforce-api/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/connectors/salesforce-api/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>salesforce-api</artifactId> Modified: trunk/connectors/sandbox/pom.xml =================================================================== --- trunk/connectors/sandbox/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/connectors/sandbox/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid.connectors</groupId> Modified: trunk/connectors/sandbox/translator-yahoo/pom.xml =================================================================== --- trunk/connectors/sandbox/translator-yahoo/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/connectors/sandbox/translator-yahoo/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-yahoo</artifactId> Modified: trunk/connectors/translator-file/pom.xml =================================================================== --- trunk/connectors/translator-file/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/connectors/translator-file/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-file</artifactId> Modified: trunk/connectors/translator-jdbc/pom.xml =================================================================== --- trunk/connectors/translator-jdbc/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/connectors/translator-jdbc/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-jdbc</artifactId> Modified: trunk/connectors/translator-ldap/pom.xml =================================================================== --- trunk/connectors/translator-ldap/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/connectors/translator-ldap/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ldap</artifactId> Modified: trunk/connectors/translator-loopback/pom.xml =================================================================== --- trunk/connectors/translator-loopback/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/connectors/translator-loopback/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-loopback</artifactId> Modified: trunk/connectors/translator-salesforce/pom.xml =================================================================== --- trunk/connectors/translator-salesforce/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/connectors/translator-salesforce/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-salesforce</artifactId> Modified: trunk/connectors/translator-ws/pom.xml =================================================================== --- trunk/connectors/translator-ws/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/connectors/translator-ws/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ws</artifactId> Modified: trunk/console/pom.xml =================================================================== --- trunk/console/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/console/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/documentation/admin-guide/pom.xml =================================================================== --- trunk/documentation/admin-guide/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/documentation/admin-guide/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>admin-guide</artifactId> Modified: trunk/documentation/caching-guide/pom.xml =================================================================== --- trunk/documentation/caching-guide/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/documentation/caching-guide/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>caching-guide</artifactId> Modified: trunk/documentation/client-developers-guide/pom.xml =================================================================== --- trunk/documentation/client-developers-guide/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/documentation/client-developers-guide/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>client-developers-guide</artifactId> Modified: trunk/documentation/developer-guide/pom.xml =================================================================== --- trunk/documentation/developer-guide/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/documentation/developer-guide/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>developer-guide</artifactId> Modified: trunk/documentation/pom.xml =================================================================== --- trunk/documentation/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/documentation/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/documentation/quick-start-example/pom.xml =================================================================== --- trunk/documentation/quick-start-example/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/documentation/quick-start-example/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>quick-start-example</artifactId> Modified: trunk/documentation/reference/pom.xml =================================================================== --- trunk/documentation/reference/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/documentation/reference/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>reference</artifactId> Modified: trunk/engine/pom.xml =================================================================== --- trunk/engine/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/engine/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-engine</artifactId> Modified: trunk/hibernate-dialect/pom.xml =================================================================== --- trunk/hibernate-dialect/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/hibernate-dialect/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-hibernate-dialect</artifactId> Modified: trunk/jboss-integration/pom.xml =================================================================== --- trunk/jboss-integration/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/jboss-integration/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/metadata/pom.xml =================================================================== --- trunk/metadata/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/metadata/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-metadata</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -5,15 +5,15 @@ <artifactId>teiid-parent</artifactId> <packaging>pom</packaging> <name>Teiid</name> - <version>7.2.0.CR1</version> + <version>7.2.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.2.0.CR1</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-7.2.0.CR1</developerConnection> + <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/trunk</developerConnection> </scm> <licenses> <license> Modified: trunk/runtime/pom.xml =================================================================== --- trunk/runtime/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/runtime/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/test-integration/common/pom.xml =================================================================== --- trunk/test-integration/common/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/test-integration/common/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>test-integration-common</artifactId> Modified: trunk/test-integration/db/pom.xml =================================================================== --- trunk/test-integration/db/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/test-integration/db/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -9,7 +9,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/test-integration/pom.xml =================================================================== --- trunk/test-integration/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) +++ trunk/test-integration/pom.xml 2010-10-29 18:45:33 UTC (rev 2694) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1</version> + <version>7.2.0.Final</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-test-integration</artifactId>

14 years, 1 month

1
0
0 / 0

teiid SVN: r2693 - in tags: teiid-parent-7.2.0.CR1 and 39 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-10-29 14:44:50 -0400 (Fri, 29 Oct 2010) New Revision: 2693 Added: tags/teiid-parent-7.2.0.CR1/ tags/teiid-parent-7.2.0.CR1/adminshell/pom.xml tags/teiid-parent-7.2.0.CR1/api/pom.xml tags/teiid-parent-7.2.0.CR1/build/pom.xml tags/teiid-parent-7.2.0.CR1/cache-jbosscache/pom.xml tags/teiid-parent-7.2.0.CR1/client/pom.xml tags/teiid-parent-7.2.0.CR1/client/src/main/java/org/teiid/adminapi/AdminFactory.java tags/teiid-parent-7.2.0.CR1/client/src/main/java/org/teiid/adminapi/impl/ModelMetaData.java tags/teiid-parent-7.2.0.CR1/common-core/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/connector-file/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/connector-ldap/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/connector-salesforce/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/connector-ws/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/salesforce-api/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/sandbox/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/sandbox/translator-yahoo/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/translator-file/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/translator-jdbc/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/translator-ldap/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/translator-loopback/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/translator-salesforce/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/translator-ws/pom.xml tags/teiid-parent-7.2.0.CR1/console/pom.xml tags/teiid-parent-7.2.0.CR1/documentation/admin-guide/pom.xml tags/teiid-parent-7.2.0.CR1/documentation/caching-guide/pom.xml tags/teiid-parent-7.2.0.CR1/documentation/client-developers-guide/pom.xml tags/teiid-parent-7.2.0.CR1/documentation/developer-guide/pom.xml tags/teiid-parent-7.2.0.CR1/documentation/pom.xml tags/teiid-parent-7.2.0.CR1/documentation/quick-start-example/pom.xml tags/teiid-parent-7.2.0.CR1/documentation/reference/pom.xml tags/teiid-parent-7.2.0.CR1/engine/pom.xml tags/teiid-parent-7.2.0.CR1/hibernate-dialect/pom.xml tags/teiid-parent-7.2.0.CR1/jboss-integration/pom.xml tags/teiid-parent-7.2.0.CR1/metadata/pom.xml tags/teiid-parent-7.2.0.CR1/pom.xml tags/teiid-parent-7.2.0.CR1/runtime/pom.xml tags/teiid-parent-7.2.0.CR1/runtime/src/main/java/org/teiid/deployers/SystemVDBDeployer.java tags/teiid-parent-7.2.0.CR1/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java tags/teiid-parent-7.2.0.CR1/test-integration/common/pom.xml tags/teiid-parent-7.2.0.CR1/test-integration/db/pom.xml tags/teiid-parent-7.2.0.CR1/test-integration/pom.xml Removed: tags/teiid-parent-7.2.0.CR1/adminshell/pom.xml tags/teiid-parent-7.2.0.CR1/api/pom.xml tags/teiid-parent-7.2.0.CR1/build/pom.xml tags/teiid-parent-7.2.0.CR1/cache-jbosscache/pom.xml tags/teiid-parent-7.2.0.CR1/client/pom.xml tags/teiid-parent-7.2.0.CR1/client/src/main/java/org/teiid/adminapi/AdminFactory.java tags/teiid-parent-7.2.0.CR1/client/src/main/java/org/teiid/adminapi/impl/ModelMetaData.java tags/teiid-parent-7.2.0.CR1/common-core/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/connector-file/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/connector-ldap/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/connector-salesforce/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/connector-ws/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/salesforce-api/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/sandbox/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/sandbox/translator-yahoo/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/translator-file/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/translator-jdbc/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/translator-ldap/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/translator-loopback/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/translator-salesforce/pom.xml tags/teiid-parent-7.2.0.CR1/connectors/translator-ws/pom.xml tags/teiid-parent-7.2.0.CR1/console/pom.xml tags/teiid-parent-7.2.0.CR1/documentation/admin-guide/pom.xml tags/teiid-parent-7.2.0.CR1/documentation/caching-guide/pom.xml tags/teiid-parent-7.2.0.CR1/documentation/client-developers-guide/pom.xml tags/teiid-parent-7.2.0.CR1/documentation/developer-guide/pom.xml tags/teiid-parent-7.2.0.CR1/documentation/pom.xml tags/teiid-parent-7.2.0.CR1/documentation/quick-start-example/pom.xml tags/teiid-parent-7.2.0.CR1/documentation/reference/pom.xml tags/teiid-parent-7.2.0.CR1/engine/pom.xml tags/teiid-parent-7.2.0.CR1/hibernate-dialect/pom.xml tags/teiid-parent-7.2.0.CR1/jboss-integration/pom.xml tags/teiid-parent-7.2.0.CR1/metadata/pom.xml tags/teiid-parent-7.2.0.CR1/pom.xml tags/teiid-parent-7.2.0.CR1/runtime/pom.xml tags/teiid-parent-7.2.0.CR1/runtime/src/main/java/org/teiid/deployers/SystemVDBDeployer.java tags/teiid-parent-7.2.0.CR1/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java tags/teiid-parent-7.2.0.CR1/test-integration/common/pom.xml tags/teiid-parent-7.2.0.CR1/test-integration/db/pom.xml tags/teiid-parent-7.2.0.CR1/test-integration/pom.xml Log: [maven-release-plugin] copy for tag teiid-parent-7.2.0.CR1 Copied: tags/teiid-parent-7.2.0.CR1 (from rev 2690, trunk) Deleted: tags/teiid-parent-7.2.0.CR1/adminshell/pom.xml =================================================================== --- trunk/adminshell/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/adminshell/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-adminshell</artifactId> - <name>Adminshell</name> - <description>Adminshell for Teiid</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>1.7.2</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jline</groupId> - <artifactId>jline</artifactId> - <version>0.9.94</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.fusesource.jansi</groupId> - <artifactId>jansi</artifactId> - <version>1.2.1</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.2</version> - <scope>compile</scope> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.2.0.CR1/adminshell/pom.xml (from rev 2692, trunk/adminshell/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/adminshell/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/adminshell/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-adminshell</artifactId> + <name>Adminshell</name> + <description>Adminshell for Teiid</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>1.7.2</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jline</groupId> + <artifactId>jline</artifactId> + <version>0.9.94</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.fusesource.jansi</groupId> + <artifactId>jansi</artifactId> + <version>1.2.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>1.2</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.2.0.CR1/api/pom.xml =================================================================== --- trunk/api/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/api/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-api</artifactId> - <name>Teiid Translator API</name> - <description>API for creating Translators and other common extenders in Teiid</description> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - - </dependencies> -</project> Copied: tags/teiid-parent-7.2.0.CR1/api/pom.xml (from rev 2692, trunk/api/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/api/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/api/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-api</artifactId> + <name>Teiid Translator API</name> + <description>API for creating Translators and other common extenders in Teiid</description> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + + </dependencies> +</project> Deleted: tags/teiid-parent-7.2.0.CR1/build/pom.xml =================================================================== --- trunk/build/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/build/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -1,93 +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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid</artifactId> - <name>Build</name> - <description>Teiid Build</description> - <build> - <outputDirectory>target/kits</outputDirectory> - <resources> - <resource> - <directory>kits</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - <include>**/*.sh</include> - <include>**/*.bat</include> - <include>**/*.html</include> - </includes> - </resource> - <resource> - <directory>kits</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - <exclude>**/*.sh</exclude> - <exclude>**/*.bat</exclude> - <exclude>**/*.html</exclude> - </excludes> - </resource> - </resources> - <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> - </plugins> - </build> - </profile> - </profiles> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.2.0.CR1/build/pom.xml (from rev 2692, trunk/build/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/build/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/build/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -0,0 +1,93 @@ +<project xmlns="http://maven.apache.org/POM/4.0.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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid</artifactId> + <name>Build</name> + <description>Teiid Build</description> + <build> + <outputDirectory>target/kits</outputDirectory> + <resources> + <resource> + <directory>kits</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + <include>**/*.sh</include> + <include>**/*.bat</include> + <include>**/*.html</include> + </includes> + </resource> + <resource> + <directory>kits</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + <exclude>**/*.sh</exclude> + <exclude>**/*.bat</exclude> + <exclude>**/*.html</exclude> + </excludes> + </resource> + </resources> + <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> + </plugins> + </build> + </profile> + </profiles> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.2.0.CR1/cache-jbosscache/pom.xml =================================================================== --- trunk/cache-jbosscache/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/cache-jbosscache/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-cache-jbosscache</artifactId> - <name>JBoss Cache</name> - <description>JBossCache provider.</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.2.0.CR1/cache-jbosscache/pom.xml (from rev 2692, trunk/cache-jbosscache/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/cache-jbosscache/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/cache-jbosscache/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-cache-jbosscache</artifactId> + <name>JBoss Cache</name> + <description>JBossCache provider.</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.2.0.CR1/client/pom.xml =================================================================== --- trunk/client/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/client/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-client</artifactId> - <name>Client</name> - <description>Contains the packages related to communication, administrative api, - sessioning and transport level messaging.</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.man</groupId> - <artifactId>jboss-managed</artifactId> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.2.0.CR1/client/pom.xml (from rev 2692, trunk/client/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/client/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/client/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-client</artifactId> + <name>Client</name> + <description>Contains the packages related to communication, administrative api, + sessioning and transport level messaging.</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-managed</artifactId> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.2.0.CR1/client/src/main/java/org/teiid/adminapi/AdminFactory.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/AdminFactory.java 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/client/src/main/java/org/teiid/adminapi/AdminFactory.java 2010-10-29 18:44:50 UTC (rev 2693) @@ -1,172 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.adminapi; - -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.util.Properties; - -import org.teiid.client.util.ExceptionUtil; -import org.teiid.core.util.PropertiesUtils; -import org.teiid.jdbc.JDBCPlugin; -import org.teiid.net.CommunicationException; -import org.teiid.net.ConnectionException; -import org.teiid.net.ServerConnection; -import org.teiid.net.ServerConnectionFactory; -import org.teiid.net.TeiidURL; -import org.teiid.net.socket.SocketServerConnectionFactory; - - -/** - * Singleton factory for class for creating Admin connections to the Teiid - */ -public class AdminFactory { - - private final class AdminProxy implements InvocationHandler { - - private Admin admin; - private ServerConnection serverConnection; - private boolean closed; - - public AdminProxy(Properties p) throws ConnectionException, CommunicationException { - this.serverConnection = serverConnectionFactory.getConnection(p); - this.admin = serverConnection.getService(Admin.class); - } - - private synchronized Admin getTarget() throws AdminComponentException { - if (closed) { - throw new AdminComponentException(JDBCPlugin.Util.getString("admin_conn_closed")); //$NON-NLS-1$ - } - return admin; - } - - @Override - public Object invoke(Object proxy, Method method, Object[] args) - throws Throwable { - if (method.getName().equals("close")) { //$NON-NLS-1$ - close(); - return null; - } - if (!method.getDeclaringClass().equals(Admin.class)) { - return method.invoke(this, args); - } - try { - return method.invoke(getTarget(), args); - } catch (InvocationTargetException e) { - if (ExceptionUtil.getExceptionOfType(e, CommunicationException.class) != null) { - this.admin = null; - } - throw e.getTargetException(); - } - } - - public synchronized void close() { - if (closed) { - return; - } - this.closed = true; - if (serverConnection != null) { - serverConnection.close(); - } - } - } - - public static final String DEFAULT_APPLICATION_NAME = "Admin"; //$NON-NLS-1$ - - private static AdminFactory instance = new AdminFactory(SocketServerConnectionFactory.getInstance()); - - private ServerConnectionFactory serverConnectionFactory; - - AdminFactory(ServerConnectionFactory connFactory) { - this.serverConnectionFactory = connFactory; - } - - public static AdminFactory getInstance() { - return instance; - } - - - /** - * Creates a ServerAdmin with the specified connection properties. - * Uses the DEFAULT_APPLICATION_NAME as the application name. - * @param userName - * @param password - * @param serverURL - * @return - * @throws AdminException - */ - public Admin createAdmin(String userName, - char[] password, - String serverURL) throws AdminException { - - return createAdmin(userName, password, serverURL, DEFAULT_APPLICATION_NAME); - - } - - /** - * Creates a ServerAdmin with the specified connection properties. - * @param userName - * @param password - * @param serverURL - * @param applicationName - * @return - * @throws AdminException - */ - public Admin createAdmin(String userName, - char[] password, - String serverURL, - String applicationName) throws AdminException { - - if (userName == null || userName.trim().length() == 0) { - throw new IllegalArgumentException(JDBCPlugin.Util.getString("invalid_parameter")); //$NON-NLS-1$ - } - - final Properties p = new Properties(); - p.setProperty(TeiidURL.CONNECTION.APP_NAME, applicationName); - p.setProperty(TeiidURL.CONNECTION.USER_NAME, userName); - if (password != null) { - p.setProperty(TeiidURL.CONNECTION.PASSWORD, new String(password)); - } - p.setProperty(TeiidURL.CONNECTION.SERVER_URL, serverURL); - return createAdmin(p); - } - - public Admin createAdmin(Properties p) throws AdminException { - p = PropertiesUtils.clone(p); - p.remove(TeiidURL.JDBC.VDB_NAME); - p.remove(TeiidURL.JDBC.VDB_VERSION); - p.setProperty(TeiidURL.CONNECTION.ADMIN, Boolean.TRUE.toString()); - - try { - Admin serverAdmin = (Admin)Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] { Admin.class }, new AdminProxy(p)); - return serverAdmin; - } catch (ConnectionException e) { - throw new AdminComponentException(e); - } catch (CommunicationException e) { - throw new AdminComponentException(e); - } - } - -} Copied: tags/teiid-parent-7.2.0.CR1/client/src/main/java/org/teiid/adminapi/AdminFactory.java (from rev 2691, trunk/client/src/main/java/org/teiid/adminapi/AdminFactory.java) =================================================================== --- tags/teiid-parent-7.2.0.CR1/client/src/main/java/org/teiid/adminapi/AdminFactory.java (rev 0) +++ tags/teiid-parent-7.2.0.CR1/client/src/main/java/org/teiid/adminapi/AdminFactory.java 2010-10-29 18:44:50 UTC (rev 2693) @@ -0,0 +1,168 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.adminapi; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.util.Properties; + +import org.teiid.core.util.PropertiesUtils; +import org.teiid.jdbc.JDBCPlugin; +import org.teiid.net.CommunicationException; +import org.teiid.net.ConnectionException; +import org.teiid.net.ServerConnection; +import org.teiid.net.ServerConnectionFactory; +import org.teiid.net.TeiidURL; +import org.teiid.net.socket.SocketServerConnectionFactory; + + +/** + * Singleton factory for class for creating Admin connections to the Teiid + */ +public class AdminFactory { + + private final class AdminProxy implements InvocationHandler { + + private Admin admin; + private ServerConnection serverConnection; + private boolean closed; + + public AdminProxy(Properties p) throws ConnectionException, CommunicationException { + this.serverConnection = serverConnectionFactory.getConnection(p); + this.admin = serverConnection.getService(Admin.class); + } + + private synchronized Admin getTarget() throws AdminComponentException { + if (closed) { + throw new AdminComponentException(JDBCPlugin.Util.getString("admin_conn_closed")); //$NON-NLS-1$ + } + return admin; + } + + @Override + public Object invoke(Object proxy, Method method, Object[] args) + throws Throwable { + if (method.getName().equals("close")) { //$NON-NLS-1$ + close(); + return null; + } + if (!method.getDeclaringClass().equals(Admin.class)) { + return method.invoke(this, args); + } + try { + return method.invoke(getTarget(), args); + } catch (InvocationTargetException e) { + throw e.getTargetException(); + } + } + + public synchronized void close() { + if (closed) { + return; + } + this.closed = true; + if (serverConnection != null) { + serverConnection.close(); + } + } + } + + public static final String DEFAULT_APPLICATION_NAME = "Admin"; //$NON-NLS-1$ + + private static AdminFactory instance = new AdminFactory(SocketServerConnectionFactory.getInstance()); + + private ServerConnectionFactory serverConnectionFactory; + + AdminFactory(ServerConnectionFactory connFactory) { + this.serverConnectionFactory = connFactory; + } + + public static AdminFactory getInstance() { + return instance; + } + + + /** + * Creates a ServerAdmin with the specified connection properties. + * Uses the DEFAULT_APPLICATION_NAME as the application name. + * @param userName + * @param password + * @param serverURL + * @return + * @throws AdminException + */ + public Admin createAdmin(String userName, + char[] password, + String serverURL) throws AdminException { + + return createAdmin(userName, password, serverURL, DEFAULT_APPLICATION_NAME); + + } + + /** + * Creates a ServerAdmin with the specified connection properties. + * @param userName + * @param password + * @param serverURL + * @param applicationName + * @return + * @throws AdminException + */ + public Admin createAdmin(String userName, + char[] password, + String serverURL, + String applicationName) throws AdminException { + + if (userName == null || userName.trim().length() == 0) { + throw new IllegalArgumentException(JDBCPlugin.Util.getString("invalid_parameter")); //$NON-NLS-1$ + } + + final Properties p = new Properties(); + p.setProperty(TeiidURL.CONNECTION.APP_NAME, applicationName); + p.setProperty(TeiidURL.CONNECTION.USER_NAME, userName); + if (password != null) { + p.setProperty(TeiidURL.CONNECTION.PASSWORD, new String(password)); + } + p.setProperty(TeiidURL.CONNECTION.SERVER_URL, serverURL); + return createAdmin(p); + } + + public Admin createAdmin(Properties p) throws AdminException { + p = PropertiesUtils.clone(p); + p.remove(TeiidURL.JDBC.VDB_NAME); + p.remove(TeiidURL.JDBC.VDB_VERSION); + p.setProperty(TeiidURL.CONNECTION.ADMIN, Boolean.TRUE.toString()); + + try { + Admin serverAdmin = (Admin)Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] { Admin.class }, new AdminProxy(p)); + return serverAdmin; + } catch (ConnectionException e) { + throw new AdminComponentException(e); + } catch (CommunicationException e) { + throw new AdminComponentException(e); + } + } + +} Deleted: tags/teiid-parent-7.2.0.CR1/client/src/main/java/org/teiid/adminapi/impl/ModelMetaData.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/impl/ModelMetaData.java 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/client/src/main/java/org/teiid/adminapi/impl/ModelMetaData.java 2010-10-29 18:44:50 UTC (rev 2693) @@ -1,294 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.adminapi.impl; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; - -import org.jboss.managed.api.annotation.ManagementObject; -import org.jboss.managed.api.annotation.ManagementObjectID; -import org.jboss.managed.api.annotation.ManagementProperties; -import org.jboss.managed.api.annotation.ManagementProperty; -import org.teiid.adminapi.Model; -import org.teiid.adminapi.impl.ModelMetaData.ValidationError.Severity; - - -(a)XmlAccessorType(XmlAccessType.NONE) -@XmlType(name = "", propOrder = { - "description", - "JAXBProperties", - "sources", - "errors" -}) -(a)ManagementObject(properties=ManagementProperties.EXPLICIT) -public class ModelMetaData extends AdminObjectImpl implements Model { - - private static final String SUPPORTS_MULTI_SOURCE_BINDINGS_KEY = "supports-multi-source-bindings"; //$NON-NLS-1$ - private static final long serialVersionUID = 3714234763056162230L; - - @XmlElement(name = "source") - protected ListOverMap<SourceMappingMetadata> sources = new ListOverMap<SourceMappingMetadata>(new KeyBuilder<SourceMappingMetadata>() { - private static final long serialVersionUID = 2273673984691112369L; - - @Override - public String getKey(SourceMappingMetadata entry) { - return entry.getName(); - } - }); - - @XmlAttribute(name = "type") - protected String modelType = Type.PHYSICAL.name(); - - @XmlElement(name = "description") - protected String description; - - @XmlAttribute(name = "path") - protected String path; - - @XmlAttribute(name = "visible") - protected Boolean visible = true; - - @XmlElement(name = "validation-error") - protected List<ValidationError> errors; - - @ManagementProperty(description="Model Name") - @XmlAttribute(name = "name", required = true) - @ManagementObjectID(type="models") - public String getName() { - return super.getName(); - } - - // This is needed by JAXB - public void setName(String name) { - super.setName(name); - } - - @Override - @ManagementProperty(description = "Model description") - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - @Override - @ManagementProperty(description = "Is Model Source model") - public boolean isSource() { - return getModelType() == Model.Type.PHYSICAL; - } - - @Override - @ManagementProperty(description = "Is Model Visible") - public boolean isVisible() { - return this.visible; - } - - @Override - @ManagementProperty(description = "Model Type") - public Type getModelType() { - try { - return Type.valueOf(modelType.toUpperCase()); - } catch(IllegalArgumentException e) { - return Type.OTHER; - } - } - - @ManagementProperty(description = "Path to model file inside the archive") - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - - @Override - @ManagementProperty(description = "Does Model supports multi-source bindings") - public boolean isSupportsMultiSourceBindings() { - String supports = getPropertyValue(SUPPORTS_MULTI_SOURCE_BINDINGS_KEY); - return Boolean.parseBoolean(supports); - } - - @Override - @XmlElement(name = "property", type = PropertyMetadata.class) - @ManagementProperty(description = "Model Properties", managed=true) - public List<PropertyMetadata> getJAXBProperties(){ - return super.getJAXBProperties(); - } - - public void setSupportsMultiSourceBindings(boolean supports) { - addProperty(SUPPORTS_MULTI_SOURCE_BINDINGS_KEY, Boolean.toString(supports)); - } - - public void setModelType(Model.Type modelType) { - this.modelType = modelType.name(); - } - - public void setModelType(String modelType) { - this.modelType = modelType; - } - - public String toString() { - return getName() + this.sources; - } - - public void setVisible(Boolean value) { - this.visible = value; - } - - @ManagementProperty(description = "Source Mappings (defined by user)", managed=true) - public List<SourceMappingMetadata> getSourceMappings(){ - return new ArrayList<SourceMappingMetadata>(this.sources.getMap().values()); - } - - public void setSourceMappings(List<SourceMappingMetadata> sources){ - for (SourceMappingMetadata source: sources) { - addSourceMapping(source.getName(), source.getTranslatorName(), source.getConnectionJndiName()); - } - } - - @Override - public List<String> getSourceNames() { - return new ArrayList<String>(this.sources.getMap().keySet()); - } - - @Override - public String getSourceConnectionJndiName(String sourceName) { - SourceMappingMetadata s = this.sources.getMap().get(sourceName); - if (s == null) { - return null; - } - return s.getConnectionJndiName(); - } - - @Override - public String getSourceTranslatorName(String sourceName) { - SourceMappingMetadata s = this.sources.getMap().get(sourceName); - if (s == null) { - return null; - } - return s.getTranslatorName(); - } - - public void addSourceMapping(String name, String translatorName, String connJndiName) { - this.sources.getMap().put(name, new SourceMappingMetadata(name, translatorName, connJndiName)); - } - - @ManagementProperty(description = "Model Validity Errors", readOnly=true, managed=true) - public List<ValidationError> getErrors(){ - return getValidationErrors(Severity.ERROR); - } - - public void setErrors(List<ValidationError> errors){ - this.errors = errors; - } - - public List<ValidationError> getValidationErrors(ValidationError.Severity severity){ - if (this.errors == null) { - return Collections.emptyList(); - } - List<ValidationError> list = new ArrayList<ValidationError>(); - for (ValidationError ve: this.errors) { - if (Severity.valueOf(ve.severity) == severity) { - list.add(ve); - } - } - return list; - } - - public void addError(String severity, String message) { - if (this.errors == null) { - this.errors = new ArrayList<ValidationError>(); - } - this.errors.add(new ValidationError(severity, message)); - } - - public void clearErrors() { - this.errors.clear(); - } - - @XmlAccessorType(XmlAccessType.NONE) - @XmlType(name = "", propOrder = { - "value" - }) - @ManagementObject(properties=ManagementProperties.EXPLICIT) - public static class ValidationError implements Serializable{ - private static final long serialVersionUID = 2044197069467559527L; - - public enum Severity {ERROR, WARNING}; - - @XmlValue - protected String value; - - @XmlAttribute(name = "severity", required = true) - protected String severity; - - @XmlAttribute(name = "path") - protected String path; - - public ValidationError() {}; - - public ValidationError(String severity, String msg) { - this.severity = severity; - this.value = msg; - } - - @ManagementProperty (description="Error Message") - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - @ManagementProperty (description="Severity") - public String getSeverity() { - return severity; - } - - public void setSeverity(String severity) { - this.severity = severity; - } - - @ManagementProperty (description="Path") - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - } -} Copied: tags/teiid-parent-7.2.0.CR1/client/src/main/java/org/teiid/adminapi/impl/ModelMetaData.java (from rev 2691, trunk/client/src/main/java/org/teiid/adminapi/impl/ModelMetaData.java) =================================================================== --- tags/teiid-parent-7.2.0.CR1/client/src/main/java/org/teiid/adminapi/impl/ModelMetaData.java (rev 0) +++ tags/teiid-parent-7.2.0.CR1/client/src/main/java/org/teiid/adminapi/impl/ModelMetaData.java 2010-10-29 18:44:50 UTC (rev 2693) @@ -0,0 +1,325 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.adminapi.impl; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; + +import org.jboss.managed.api.annotation.ManagementObject; +import org.jboss.managed.api.annotation.ManagementObjectID; +import org.jboss.managed.api.annotation.ManagementProperties; +import org.jboss.managed.api.annotation.ManagementProperty; +import org.teiid.adminapi.Model; +import org.teiid.adminapi.impl.ModelMetaData.ValidationError.Severity; + + +(a)XmlAccessorType(XmlAccessType.NONE) +@XmlType(name = "", propOrder = { + "description", + "JAXBProperties", + "sources", + "errors" +}) +(a)ManagementObject(properties=ManagementProperties.EXPLICIT) +public class ModelMetaData extends AdminObjectImpl implements Model { + + private static final String SUPPORTS_MULTI_SOURCE_BINDINGS_KEY = "supports-multi-source-bindings"; //$NON-NLS-1$ + private static final long serialVersionUID = 3714234763056162230L; + + @XmlElement(name = "source") + protected ListOverMap<SourceMappingMetadata> sources = new ListOverMap<SourceMappingMetadata>(new KeyBuilder<SourceMappingMetadata>() { + private static final long serialVersionUID = 2273673984691112369L; + + @Override + public String getKey(SourceMappingMetadata entry) { + return entry.getName(); + } + }); + + @XmlAttribute(name = "type") + protected String modelType = Type.PHYSICAL.name(); + + @XmlElement(name = "description") + protected String description; + + @XmlAttribute(name = "path") + protected String path; + + @XmlAttribute(name = "visible") + protected Boolean visible = true; + + @XmlElement(name = "validation-error") + protected List<ValidationError> errors; + + @ManagementProperty(description="Model Name") + @XmlAttribute(name = "name", required = true) + @ManagementObjectID(type="models") + public String getName() { + return super.getName(); + } + + // This is needed by JAXB + public void setName(String name) { + super.setName(name); + } + + @Override + @ManagementProperty(description = "Model description") + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + @Override + @ManagementProperty(description = "Is Model Source model") + public boolean isSource() { + return getModelType() == Model.Type.PHYSICAL; + } + + @Override + @ManagementProperty(description = "Is Model Visible") + public boolean isVisible() { + return this.visible; + } + + @Override + @ManagementProperty(description = "Model Type") + public Type getModelType() { + try { + return Type.valueOf(modelType.toUpperCase()); + } catch(IllegalArgumentException e) { + return Type.OTHER; + } + } + + @ManagementProperty(description = "Path to model file inside the archive") + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + @Override + @ManagementProperty(description = "Does Model supports multi-source bindings") + public boolean isSupportsMultiSourceBindings() { + String supports = getPropertyValue(SUPPORTS_MULTI_SOURCE_BINDINGS_KEY); + return Boolean.parseBoolean(supports); + } + + @Override + @XmlElement(name = "property", type = PropertyMetadata.class) + @ManagementProperty(description = "Model Properties", managed=true) + public List<PropertyMetadata> getJAXBProperties(){ + return super.getJAXBProperties(); + } + + public void setSupportsMultiSourceBindings(boolean supports) { + addProperty(SUPPORTS_MULTI_SOURCE_BINDINGS_KEY, Boolean.toString(supports)); + } + + public void setModelType(Model.Type modelType) { + this.modelType = modelType.name(); + } + + public void setModelType(String modelType) { + this.modelType = modelType; + } + + public String toString() { + return getName() + this.sources; + } + + public void setVisible(Boolean value) { + this.visible = value; + } + + @ManagementProperty(description = "Source Mappings (defined by user)", managed=true) + public List<SourceMappingMetadata> getSourceMappings(){ + return new ArrayList<SourceMappingMetadata>(this.sources.getMap().values()); + } + + public void setSourceMappings(List<SourceMappingMetadata> sources){ + for (SourceMappingMetadata source: sources) { + addSourceMapping(source.getName(), source.getTranslatorName(), source.getConnectionJndiName()); + } + } + + @Override + public List<String> getSourceNames() { + return new ArrayList<String>(this.sources.getMap().keySet()); + } + + @Override + public String getSourceConnectionJndiName(String sourceName) { + SourceMappingMetadata s = this.sources.getMap().get(sourceName); + if (s == null) { + return null; + } + return s.getConnectionJndiName(); + } + + @Override + public String getSourceTranslatorName(String sourceName) { + SourceMappingMetadata s = this.sources.getMap().get(sourceName); + if (s == null) { + return null; + } + return s.getTranslatorName(); + } + + public void addSourceMapping(String name, String translatorName, String connJndiName) { + this.sources.getMap().put(name, new SourceMappingMetadata(name, translatorName, connJndiName)); + } + + @ManagementProperty(description = "Model Validity Errors", readOnly=true, managed=true) + public List<ValidationError> getErrors(){ + return getValidationErrors(Severity.ERROR); + } + + public void setErrors(List<ValidationError> errors){ + this.errors = errors; + } + + public List<ValidationError> getValidationErrors(ValidationError.Severity severity){ + if (this.errors == null) { + return Collections.emptyList(); + } + List<ValidationError> list = new ArrayList<ValidationError>(); + for (ValidationError ve: this.errors) { + if (Severity.valueOf(ve.severity) == severity) { + list.add(ve); + } + } + return list; + } + + public ValidationError addError(String severity, String message) { + if (this.errors == null) { + this.errors = new ArrayList<ValidationError>(); + } + ValidationError ve = new ValidationError(severity, message); + this.errors.add(ve); + return ve; + } + + public boolean removeError(ValidationError remove) { + if (this.errors == null) { + return false; + } + return this.errors.remove(remove); + } + + public void clearErrors() { + this.errors.clear(); + } + + @XmlAccessorType(XmlAccessType.NONE) + @XmlType(name = "", propOrder = { + "value" + }) + @ManagementObject(properties=ManagementProperties.EXPLICIT) + public static class ValidationError implements Serializable{ + private static final long serialVersionUID = 2044197069467559527L; + + public enum Severity {ERROR, WARNING}; + + @XmlValue + protected String value; + + @XmlAttribute(name = "severity", required = true) + protected String severity; + + @XmlAttribute(name = "path") + protected String path; + + public ValidationError() {}; + + public ValidationError(String severity, String msg) { + this.severity = severity; + this.value = msg; + } + + @ManagementProperty (description="Error Message") + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + @ManagementProperty (description="Severity") + public String getSeverity() { + return severity; + } + + public void setSeverity(String severity) { + this.severity = severity; + } + + @ManagementProperty (description="Path") + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ValidationError other = (ValidationError) obj; + if (severity == null) { + if (other.severity != null) + return false; + } else if (!severity.equals(other.severity)) + return false; + if (value == null) { + if (other.value != null) + return false; + } else if (!value.equals(other.value)) + return false; + return true; + } + } +} Deleted: tags/teiid-parent-7.2.0.CR1/common-core/pom.xml =================================================================== --- trunk/common-core/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/common-core/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-common-core</artifactId> - <name>Common Core</name> - <description>Core shared library</description> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>process-resources</phase> - <configuration> - <tasks> - <tstamp /> - <replace dir="${project.build.outputDirectory}" token="@build-date@" value="${DSTAMP}"> - <include name="**/*.properties" /> - </replace> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.2.0.CR1/common-core/pom.xml (from rev 2692, trunk/common-core/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/common-core/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/common-core/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-common-core</artifactId> + <name>Common Core</name> + <description>Core shared library</description> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>process-resources</phase> + <configuration> + <tasks> + <tstamp /> + <replace dir="${project.build.outputDirectory}" token="@build-date@" value="${DSTAMP}"> + <include name="**/*.properties" /> + </replace> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.2.0.CR1/connectors/connector-file/pom.xml =================================================================== --- trunk/connectors/connector-file/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/connectors/connector-file/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>connector-file</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>File Connector</name> - <packaging>rar</packaging> - <description>This connector reads data from files.</description> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>build_jar</id> - <phase>process-classes</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - <execution> - <id>deploy_jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classifier>lib</classifier> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.2.0.CR1/connectors/connector-file/pom.xml (from rev 2692, trunk/connectors/connector-file/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/connectors/connector-file/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/connectors/connector-file/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>connector-file</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>File Connector</name> + <packaging>rar</packaging> + <description>This connector reads data from files.</description> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>build_jar</id> + <phase>process-classes</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + <execution> + <id>deploy_jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>lib</classifier> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.2.0.CR1/connectors/connector-ldap/pom.xml =================================================================== --- trunk/connectors/connector-ldap/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/connectors/connector-ldap/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>connector-ldap</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>LDAP Connector</name> - <description>LDAP Connector</description> - <packaging>rar</packaging> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>build_jar</id> - <phase>process-classes</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - <execution> - <id>deploy_jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classifier>lib</classifier> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.2.0.CR1/connectors/connector-ldap/pom.xml (from rev 2692, trunk/connectors/connector-ldap/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/connectors/connector-ldap/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/connectors/connector-ldap/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>connector-ldap</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>LDAP Connector</name> + <description>LDAP Connector</description> + <packaging>rar</packaging> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>build_jar</id> + <phase>process-classes</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + <execution> + <id>deploy_jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>lib</classifier> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.2.0.CR1/connectors/connector-salesforce/pom.xml =================================================================== --- trunk/connectors/connector-salesforce/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/connectors/connector-salesforce/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>connector-salesforce</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>Salesforce Connector</name> - <packaging>rar</packaging> - <description>Integrates the query engine with Salesforce.com.</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>salesforce-api</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>translator-salesforce</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </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.2.0.CR1/connectors/connector-salesforce/pom.xml (from rev 2692, trunk/connectors/connector-salesforce/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/connectors/connector-salesforce/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/connectors/connector-salesforce/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>connector-salesforce</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>Salesforce Connector</name> + <packaging>rar</packaging> + <description>Integrates the query engine with Salesforce.com.</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>salesforce-api</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>translator-salesforce</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>build_jar</id> + <phase>process-classes</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + <execution> + <id>deploy_jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>lib</classifier> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.2.0.CR1/connectors/connector-ws/pom.xml =================================================================== --- trunk/connectors/connector-ws/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/connectors/connector-ws/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>connector-ws</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>Web Service Connector</name> - <packaging>rar</packaging> - <description>This connector reads data from Web Services</description> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxws</artifactId> - <version>2.2.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http</artifactId> - <version>2.2.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-security</artifactId> - <version>2.2.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-policy</artifactId> - <version>2.2.2</version> - <scope>provided</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>build_jar</id> - <phase>process-classes</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - <execution> - <id>deploy_jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classifier>lib</classifier> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> Copied: tags/teiid-parent-7.2.0.CR1/connectors/connector-ws/pom.xml (from rev 2692, trunk/connectors/connector-ws/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/connectors/connector-ws/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/connectors/connector-ws/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>connector-ws</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>Web Service Connector</name> + <packaging>rar</packaging> + <description>This connector reads data from Web Services</description> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxws</artifactId> + <version>2.2.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http</artifactId> + <version>2.2.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-security</artifactId> + <version>2.2.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-policy</artifactId> + <version>2.2.2</version> + <scope>provided</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>build_jar</id> + <phase>process-classes</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + <execution> + <id>deploy_jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>lib</classifier> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Deleted: tags/teiid-parent-7.2.0.CR1/connectors/pom.xml =================================================================== --- trunk/connectors/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/connectors/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid</groupId> - <artifactId>connectors</artifactId> - <packaging>pom</packaging> - <name>Connectors</name> - <description>This project is aggregator for all the supported connectors.</description> - <dependencies> - -  - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-metadata</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-metadata</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - -  - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.man</groupId> - <artifactId>jboss-managed</artifactId> - <scope>test</scope> - </dependency> - - </dependencies> - - <modules> - <module>translator-jdbc</module> - <module>translator-ldap</module> - - <module>translator-loopback</module> - <module>translator-file</module> - <module>translator-salesforce</module> - - <module>connector-file</module> - <module>connector-salesforce</module> - <module>connector-ldap</module> - <module>salesforce-api</module> - <module>connector-ws</module> - - <module>sandbox</module> - - <module>translator-ws</module> - </modules> -</project> Copied: tags/teiid-parent-7.2.0.CR1/connectors/pom.xml (from rev 2692, trunk/connectors/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/connectors/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/connectors/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.teiid</groupId> + <artifactId>connectors</artifactId> + <packaging>pom</packaging> + <name>Connectors</name> + <description>This project is aggregator for all the supported connectors.</description> + <dependencies> + +  + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-metadata</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-metadata</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + +  + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-vfs</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-managed</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + + <modules> + <module>translator-jdbc</module> + <module>translator-ldap</module> + + <module>translator-loopback</module> + <module>translator-file</module> + <module>translator-salesforce</module> + + <module>connector-file</module> + <module>connector-salesforce</module> + <module>connector-ldap</module> + <module>salesforce-api</module> + <module>connector-ws</module> + + <module>sandbox</module> + + <module>translator-ws</module> + </modules> +</project> Deleted: tags/teiid-parent-7.2.0.CR1/connectors/salesforce-api/pom.xml =================================================================== --- trunk/connectors/salesforce-api/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/connectors/salesforce-api/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>salesforce-api</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>Salesforce API</name> - <description>The java API for the Salesforce.com partner web service API</description> - <dependencies> - </dependencies> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.2.0.CR1/connectors/salesforce-api/pom.xml (from rev 2692, trunk/connectors/salesforce-api/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/connectors/salesforce-api/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/connectors/salesforce-api/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>salesforce-api</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>Salesforce API</name> + <description>The java API for the Salesforce.com partner web service API</description> + <dependencies> + </dependencies> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.2.0.CR1/connectors/sandbox/pom.xml =================================================================== --- trunk/connectors/sandbox/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/connectors/sandbox/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>sandbox</artifactId> - <packaging>pom</packaging> - <name>Sandbox</name> - <description>Experimental connectors in progress</description> - <modules> - <module>translator-yahoo</module> - </modules> -</project> Copied: tags/teiid-parent-7.2.0.CR1/connectors/sandbox/pom.xml (from rev 2692, trunk/connectors/sandbox/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/connectors/sandbox/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/connectors/sandbox/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>sandbox</artifactId> + <packaging>pom</packaging> + <name>Sandbox</name> + <description>Experimental connectors in progress</description> + <modules> + <module>translator-yahoo</module> + </modules> +</project> Deleted: tags/teiid-parent-7.2.0.CR1/connectors/sandbox/translator-yahoo/pom.xml =================================================================== --- trunk/connectors/sandbox/translator-yahoo/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/connectors/sandbox/translator-yahoo/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-yahoo</artifactId> - <groupId>org.jboss.teiid.connectors.sandbox</groupId> - <name>Yahoo Translator</name> - <description>Test translator used to query ticker symbols from Yahoo website</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> -</project> Copied: tags/teiid-parent-7.2.0.CR1/connectors/sandbox/translator-yahoo/pom.xml (from rev 2692, trunk/connectors/sandbox/translator-yahoo/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/connectors/sandbox/translator-yahoo/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/connectors/sandbox/translator-yahoo/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-yahoo</artifactId> + <groupId>org.jboss.teiid.connectors.sandbox</groupId> + <name>Yahoo Translator</name> + <description>Test translator used to query ticker symbols from Yahoo website</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> +</project> Deleted: tags/teiid-parent-7.2.0.CR1/connectors/translator-file/pom.xml =================================================================== --- trunk/connectors/translator-file/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/connectors/translator-file/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-file</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>File Translator</name> - <description>This translator provides access to the file system.</description> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> -</project> Copied: tags/teiid-parent-7.2.0.CR1/connectors/translator-file/pom.xml (from rev 2692, trunk/connectors/translator-file/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/connectors/translator-file/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/connectors/translator-file/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-file</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>File Translator</name> + <description>This translator provides access to the file system.</description> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> +</project> Deleted: tags/teiid-parent-7.2.0.CR1/connectors/translator-jdbc/pom.xml =================================================================== --- trunk/connectors/translator-jdbc/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/connectors/translator-jdbc/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-jdbc</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>JDBC Translator</name> - - <description>This project contains translators for a JDBC source. Currently this is an aggregator for all the JDBC translators relational databases.</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> - -</project> Copied: tags/teiid-parent-7.2.0.CR1/connectors/translator-jdbc/pom.xml (from rev 2692, trunk/connectors/translator-jdbc/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/connectors/translator-jdbc/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/connectors/translator-jdbc/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-jdbc</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>JDBC Translator</name> + + <description>This project contains translators for a JDBC source. Currently this is an aggregator for all the JDBC translators relational databases.</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> + +</project> Deleted: tags/teiid-parent-7.2.0.CR1/connectors/translator-ldap/pom.xml =================================================================== --- trunk/connectors/translator-ldap/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/connectors/translator-ldap/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-ldap</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>LDAP Translator</name> - <description>LDAP Translator</description> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> -</project> Copied: tags/teiid-parent-7.2.0.CR1/connectors/translator-ldap/pom.xml (from rev 2692, trunk/connectors/translator-ldap/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/connectors/translator-ldap/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/connectors/translator-ldap/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-ldap</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>LDAP Translator</name> + <description>LDAP Translator</description> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> +</project> Deleted: tags/teiid-parent-7.2.0.CR1/connectors/translator-loopback/pom.xml =================================================================== --- trunk/connectors/translator-loopback/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/connectors/translator-loopback/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-loopback</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>Loopback Translator</name> - <description>Loopback Translator</description> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> -</project> Copied: tags/teiid-parent-7.2.0.CR1/connectors/translator-loopback/pom.xml (from rev 2692, trunk/connectors/translator-loopback/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/connectors/translator-loopback/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/connectors/translator-loopback/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-loopback</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>Loopback Translator</name> + <description>Loopback Translator</description> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> +</project> Deleted: tags/teiid-parent-7.2.0.CR1/connectors/translator-salesforce/pom.xml =================================================================== --- trunk/connectors/translator-salesforce/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/connectors/translator-salesforce/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-salesforce</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>Salesforce Translator</name> - <description>Integrates the query engine with Salesforce.com.</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>salesforce-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> -</project> Copied: tags/teiid-parent-7.2.0.CR1/connectors/translator-salesforce/pom.xml (from rev 2692, trunk/connectors/translator-salesforce/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/connectors/translator-salesforce/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/connectors/translator-salesforce/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-salesforce</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>Salesforce Translator</name> + <description>Integrates the query engine with Salesforce.com.</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>salesforce-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> +</project> Deleted: tags/teiid-parent-7.2.0.CR1/connectors/translator-ws/pom.xml =================================================================== --- trunk/connectors/translator-ws/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/connectors/translator-ws/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-ws</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>Web service Translator</name> - <description>This translator provides access to Web Services.</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> - -</project> Copied: tags/teiid-parent-7.2.0.CR1/connectors/translator-ws/pom.xml (from rev 2692, trunk/connectors/translator-ws/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/connectors/translator-ws/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/connectors/translator-ws/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-ws</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>Web service Translator</name> + <description>This translator provides access to Web Services.</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> + +</project> Deleted: tags/teiid-parent-7.2.0.CR1/console/pom.xml =================================================================== --- trunk/console/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/console/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -1,181 +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.2.0.CR1-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-console</artifactId> - <name>Console</name> - <description>This project is for the RHQ plugin that supports the TEIID Console </description> - - <properties> -  - <org.jboss.jopr.as5.version>1.2.0.GA</org.jboss.jopr.as5.version> - <jopr.jboss.as5.plugin.version>1.4.0.B01</jopr.jboss.as5.plugin.version> - <org.rhq.version>1.3.0.GA</org.rhq.version> - <apache.ant.version>1.7.0</apache.ant.version> - - - </properties> - - <dependencies> -  - <dependency> - <groupId>org.rhq</groupId> - <artifactId>rhq-core-domain</artifactId> - <version>${org.rhq.version}</version> - <scope>provided</scope> -  - </dependency> - - - <dependency> - <groupId>org.rhq</groupId> - <artifactId>rhq-core-plugin-api</artifactId> - <version>${org.rhq.version}</version> - <scope>provided</scope>  - </dependency> - - <dependency> - <groupId>org.rhq</groupId> - <artifactId>rhq-core-native-system</artifactId> - <version>${org.rhq.version}</version> - <scope>provided</scope>  - </dependency> - - <dependency> - <groupId>org.rhq</groupId> - <artifactId>rhq-jmx-plugin</artifactId> - <version>${org.rhq.version}</version> - </dependency> - - <dependency> - <groupId>org.rhq</groupId> - <artifactId>rhq-core-util</artifactId> - <version>${org.rhq.version}</version> - </dependency> - - <dependency> - <groupId>mc4j</groupId> - <artifactId>org-mc4j-ems</artifactId> - <version>1.2.6</version> - </dependency> - -  - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope>  - </dependency> - - -  - <dependency> - <groupId>jboss.jboss-embeddable-ejb3</groupId> - <artifactId>hibernate-all</artifactId> - <version>1.0.0.Alpha9</version> - <scope>provided</scope>  - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <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> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> - - -</project> \ No newline at end of file Copied: tags/teiid-parent-7.2.0.CR1/console/pom.xml (from rev 2692, trunk/console/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/console/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/console/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -0,0 +1,181 @@ +<?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.2.0.CR1</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-console</artifactId> + <name>Console</name> + <description>This project is for the RHQ plugin that supports the TEIID Console </description> + + <properties> +  + <org.jboss.jopr.as5.version>1.2.0.GA</org.jboss.jopr.as5.version> + <jopr.jboss.as5.plugin.version>1.4.0.B01</jopr.jboss.as5.plugin.version> + <org.rhq.version>1.3.0.GA</org.rhq.version> + <apache.ant.version>1.7.0</apache.ant.version> + + + </properties> + + <dependencies> +  + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-core-domain</artifactId> + <version>${org.rhq.version}</version> + <scope>provided</scope> +  + </dependency> + + + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-core-plugin-api</artifactId> + <version>${org.rhq.version}</version> + <scope>provided</scope>  + </dependency> + + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-core-native-system</artifactId> + <version>${org.rhq.version}</version> + <scope>provided</scope>  + </dependency> + + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-jmx-plugin</artifactId> + <version>${org.rhq.version}</version> + </dependency> + + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-core-util</artifactId> + <version>${org.rhq.version}</version> + </dependency> + + <dependency> + <groupId>mc4j</groupId> + <artifactId>org-mc4j-ems</artifactId> + <version>1.2.6</version> + </dependency> + +  + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>1.0</version> + <scope>provided</scope>  + </dependency> + + +  + <dependency> + <groupId>jboss.jboss-embeddable-ejb3</groupId> + <artifactId>hibernate-all</artifactId> + <version>1.0.0.Alpha9</version> + <scope>provided</scope>  + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <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> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> + + +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.2.0.CR1/documentation/admin-guide/pom.xml =================================================================== --- trunk/documentation/admin-guide/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/documentation/admin-guide/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>admin-guide</artifactId> - <groupId>org.jboss.teiid.documentation</groupId> - <packaging>jdocbook</packaging> - <name>Admin Guide</name> - <description>The Teiid Admin manual</description> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.2</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook</artifactId> - <version>1.74.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>admin_guide.xml</sourceDocumentName> - <imageResource> - <directory>${basedir}/src/main/docbook/en-US</directory> - <excludes> - <exclude>*.xml</exclude> - <exclude>**/*.xml</exclude> - <exclude>*.zargo</exclude> - <exclude>**/*.zargo</exclude> - </excludes> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> - <finalName>teiid_admin_guide.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <xmlTransformerType>saxon</xmlTransformerType> - <docbookVersion>1.72.0</docbookVersion> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>false</useRelativeImageUris> - </options> - </configuration> - </plugin> - </plugins> - </build> -</project> Copied: tags/teiid-parent-7.2.0.CR1/documentation/admin-guide/pom.xml (from rev 2692, trunk/documentation/admin-guide/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/documentation/admin-guide/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/documentation/admin-guide/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>admin-guide</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> + <packaging>jdocbook</packaging> + <name>Admin Guide</name> + <description>The Teiid Admin manual</description> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.2</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>net.sf.docbook</groupId> + <artifactId>docbook</artifactId> + <version>1.74.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>admin_guide.xml</sourceDocumentName> + <imageResource> + <directory>${basedir}/src/main/docbook/en-US</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>**/*.xml</exclude> + <exclude>*.zargo</exclude> + <exclude>**/*.zargo</exclude> + </excludes> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <finalName>teiid_admin_guide.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> + <docbookVersion>1.72.0</docbookVersion> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>false</useRelativeImageUris> + </options> + </configuration> + </plugin> + </plugins> + </build> +</project> Deleted: tags/teiid-parent-7.2.0.CR1/documentation/caching-guide/pom.xml =================================================================== --- trunk/documentation/caching-guide/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/documentation/caching-guide/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>caching-guide</artifactId> - <groupId>org.jboss.teiid.documentation</groupId> - <packaging>jdocbook</packaging> - <name>Teiid Caching Guide</name> - <description>The Teiid Caching Guide</description> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.2</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook</artifactId> - <version>1.74.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>main.xml</sourceDocumentName> - <imageResource> - <directory>${basedir}/src/main/docbook/en-US</directory> - <excludes> - <exclude>*.xml</exclude> - <exclude>**/*.xml</exclude> - <exclude>*.zargo</exclude> - <exclude>**/*.zargo</exclude> - </excludes> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> - <finalName>teiid_caching_guide.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <xmlTransformerType>saxon</xmlTransformerType> - <docbookVersion>1.72.0</docbookVersion> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>false</useRelativeImageUris> - </options> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.2.0.CR1/documentation/caching-guide/pom.xml (from rev 2692, trunk/documentation/caching-guide/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/documentation/caching-guide/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/documentation/caching-guide/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>caching-guide</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> + <packaging>jdocbook</packaging> + <name>Teiid Caching Guide</name> + <description>The Teiid Caching Guide</description> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.2</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>net.sf.docbook</groupId> + <artifactId>docbook</artifactId> + <version>1.74.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>main.xml</sourceDocumentName> + <imageResource> + <directory>${basedir}/src/main/docbook/en-US</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>**/*.xml</exclude> + <exclude>*.zargo</exclude> + <exclude>**/*.zargo</exclude> + </excludes> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <finalName>teiid_caching_guide.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> + <docbookVersion>1.72.0</docbookVersion> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>false</useRelativeImageUris> + </options> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.2.0.CR1/documentation/client-developers-guide/pom.xml =================================================================== --- trunk/documentation/client-developers-guide/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/documentation/client-developers-guide/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>client-developers-guide</artifactId> - <groupId>org.jboss.teiid.documentation</groupId> - <packaging>jdocbook</packaging> - <name>Teiid Client Developers Guide</name> - <description>The Client Developers Guide</description> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.2</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook</artifactId> - <version>1.74.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>main.xml</sourceDocumentName> - <imageResource> - <directory>${basedir}/src/main/docbook/en-US</directory> - <excludes> - <exclude>*.xml</exclude> - <exclude>**/*.xml</exclude> - <exclude>*.zargo</exclude> - <exclude>**/*.zargo</exclude> - </excludes> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> - <finalName>teiid_client_developers_guide.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <xmlTransformerType>saxon</xmlTransformerType> - <docbookVersion>1.72.0</docbookVersion> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>false</useRelativeImageUris> - </options> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.2.0.CR1/documentation/client-developers-guide/pom.xml (from rev 2692, trunk/documentation/client-developers-guide/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/documentation/client-developers-guide/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/documentation/client-developers-guide/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>client-developers-guide</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> + <packaging>jdocbook</packaging> + <name>Teiid Client Developers Guide</name> + <description>The Client Developers Guide</description> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.2</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>net.sf.docbook</groupId> + <artifactId>docbook</artifactId> + <version>1.74.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>main.xml</sourceDocumentName> + <imageResource> + <directory>${basedir}/src/main/docbook/en-US</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>**/*.xml</exclude> + <exclude>*.zargo</exclude> + <exclude>**/*.zargo</exclude> + </excludes> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <finalName>teiid_client_developers_guide.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> + <docbookVersion>1.72.0</docbookVersion> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>false</useRelativeImageUris> + </options> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.2.0.CR1/documentation/developer-guide/pom.xml =================================================================== --- trunk/documentation/developer-guide/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/documentation/developer-guide/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>developer-guide</artifactId> - <groupId>org.jboss.teiid.documentation</groupId> - <packaging>jdocbook</packaging> - <name>Developer's Guide</name> - <description>The Teiid Developer's Guide</description> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.2</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook</artifactId> - <version>1.74.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>Developer_Guide.xml</sourceDocumentName> - <imageResource> - <directory>${basedir}/src/main/docbook/en-US</directory> - <excludes> - <exclude>*.xml</exclude> - <exclude>**/*.xml</exclude> - <exclude>*.zargo</exclude> - <exclude>**/*.zargo</exclude> - </excludes> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> - <finalName>teiid_developer_guide.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <xmlTransformerType>saxon</xmlTransformerType> - <docbookVersion>1.72.0</docbookVersion> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>false</useRelativeImageUris> - </options> - </configuration> - </plugin> - </plugins> - </build> -</project> Copied: tags/teiid-parent-7.2.0.CR1/documentation/developer-guide/pom.xml (from rev 2692, trunk/documentation/developer-guide/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/documentation/developer-guide/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/documentation/developer-guide/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>developer-guide</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> + <packaging>jdocbook</packaging> + <name>Developer's Guide</name> + <description>The Teiid Developer's Guide</description> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.2</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>net.sf.docbook</groupId> + <artifactId>docbook</artifactId> + <version>1.74.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>Developer_Guide.xml</sourceDocumentName> + <imageResource> + <directory>${basedir}/src/main/docbook/en-US</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>**/*.xml</exclude> + <exclude>*.zargo</exclude> + <exclude>**/*.zargo</exclude> + </excludes> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <finalName>teiid_developer_guide.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> + <docbookVersion>1.72.0</docbookVersion> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>false</useRelativeImageUris> + </options> + </configuration> + </plugin> + </plugins> + </build> +</project> Deleted: tags/teiid-parent-7.2.0.CR1/documentation/pom.xml =================================================================== --- trunk/documentation/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/documentation/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid</groupId> - <artifactId>documentation</artifactId> - <packaging>pom</packaging> - <name>Documents</name> - <description>Teiid Documentation Aggregator</description> - <modules> - <module>admin-guide</module> - <module>reference</module> - <module>developer-guide</module> - <module>quick-start-example</module> - <module>client-developers-guide</module> - <module>caching-guide</module> - </modules> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.2.0.CR1/documentation/pom.xml (from rev 2692, trunk/documentation/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/documentation/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/documentation/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.teiid</groupId> + <artifactId>documentation</artifactId> + <packaging>pom</packaging> + <name>Documents</name> + <description>Teiid Documentation Aggregator</description> + <modules> + <module>admin-guide</module> + <module>reference</module> + <module>developer-guide</module> + <module>quick-start-example</module> + <module>client-developers-guide</module> + <module>caching-guide</module> + </modules> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.2.0.CR1/documentation/quick-start-example/pom.xml =================================================================== --- trunk/documentation/quick-start-example/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/documentation/quick-start-example/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>quick-start-example</artifactId> - <groupId>org.jboss.teiid.documentation</groupId> - <packaging>jdocbook</packaging> - <name>Quick Start Guide</name> - <description>The Teiid Quick Start guide</description> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.2</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook</artifactId> - <version>1.74.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>quick_start_example.xml</sourceDocumentName> - <imageResource> - <directory>${basedir}/src/main/docbook/en-US</directory> - <excludes> - <exclude>*.xml</exclude> - <exclude>**/*.xml</exclude> - <exclude>*.zargo</exclude> - <exclude>**/*.zargo</exclude> - </excludes> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> - <finalName>teiid_quick_start_example.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <xmlTransformerType>saxon</xmlTransformerType> - <docbookVersion>1.72.0</docbookVersion> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>false</useRelativeImageUris> - </options> - </configuration> - </plugin> - </plugins> - </build> -</project> Copied: tags/teiid-parent-7.2.0.CR1/documentation/quick-start-example/pom.xml (from rev 2692, trunk/documentation/quick-start-example/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/documentation/quick-start-example/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/documentation/quick-start-example/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>quick-start-example</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> + <packaging>jdocbook</packaging> + <name>Quick Start Guide</name> + <description>The Teiid Quick Start guide</description> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.2</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>net.sf.docbook</groupId> + <artifactId>docbook</artifactId> + <version>1.74.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>quick_start_example.xml</sourceDocumentName> + <imageResource> + <directory>${basedir}/src/main/docbook/en-US</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>**/*.xml</exclude> + <exclude>*.zargo</exclude> + <exclude>**/*.zargo</exclude> + </excludes> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <finalName>teiid_quick_start_example.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> + <docbookVersion>1.72.0</docbookVersion> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>false</useRelativeImageUris> + </options> + </configuration> + </plugin> + </plugins> + </build> +</project> Deleted: tags/teiid-parent-7.2.0.CR1/documentation/reference/pom.xml =================================================================== --- trunk/documentation/reference/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/documentation/reference/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>reference</artifactId> - <groupId>org.jboss.teiid.documentation</groupId> - <packaging>jdocbook</packaging> - <name>Teiid Reference</name> - <description>The Teiid reference manual</description> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.2</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook</artifactId> - <version>1.74.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>Reference.xml</sourceDocumentName> - <imageResource> - <directory>${basedir}/src/main/docbook/en-US</directory> - <excludes> - <exclude>*.xml</exclude> - <exclude>**/*.xml</exclude> - <exclude>*.zargo</exclude> - <exclude>**/*.zargo</exclude> - </excludes> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> - <finalName>teiid_reference.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xmlTransformerType>saxon</xmlTransformerType> - <docbookVersion>1.72.0</docbookVersion> - <xincludeSupported>true</xincludeSupported> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>false</useRelativeImageUris> - </options> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.2.0.CR1/documentation/reference/pom.xml (from rev 2692, trunk/documentation/reference/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/documentation/reference/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/documentation/reference/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>reference</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> + <packaging>jdocbook</packaging> + <name>Teiid Reference</name> + <description>The Teiid reference manual</description> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.2</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>net.sf.docbook</groupId> + <artifactId>docbook</artifactId> + <version>1.74.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>Reference.xml</sourceDocumentName> + <imageResource> + <directory>${basedir}/src/main/docbook/en-US</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>**/*.xml</exclude> + <exclude>*.zargo</exclude> + <exclude>**/*.zargo</exclude> + </excludes> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <finalName>teiid_reference.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xmlTransformerType>saxon</xmlTransformerType> + <docbookVersion>1.72.0</docbookVersion> + <xincludeSupported>true</xincludeSupported> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>false</useRelativeImageUris> + </options> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.2.0.CR1/engine/pom.xml =================================================================== --- trunk/engine/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/engine/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-engine</artifactId> - <name>Engine</name> - <description>Relational, procedural, and xml core engine.</description> - - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> - <version>2.4</version> - <executions> - <execution> - <id>javacc</id> - <goals> - <goal>javacc</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - </dependency> - - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs-spi</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>net.sourceforge.saxon</groupId> - <artifactId>saxon</artifactId> - </dependency> - - <dependency> - <groupId>net.sourceforge.saxon</groupId> - <classifier>dom</classifier> - <artifactId>saxon</artifactId> - </dependency> - - <dependency> - <groupId>com.googlecode.json-simple</groupId> - <artifactId>json-simple</artifactId> - </dependency> - - </dependencies> - -</project> \ No newline at end of file Copied: tags/teiid-parent-7.2.0.CR1/engine/pom.xml (from rev 2692, trunk/engine/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/engine/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/engine/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-engine</artifactId> + <name>Engine</name> + <description>Relational, procedural, and xml core engine.</description> + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javacc-maven-plugin</artifactId> + <version>2.4</version> + <executions> + <execution> + <id>javacc</id> + <goals> + <goal>javacc</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <type>test-jar</type> + </dependency> + + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs-spi</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + </dependency> + + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <classifier>dom</classifier> + <artifactId>saxon</artifactId> + </dependency> + + <dependency> + <groupId>com.googlecode.json-simple</groupId> + <artifactId>json-simple</artifactId> + </dependency> + + </dependencies> + +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.2.0.CR1/hibernate-dialect/pom.xml =================================================================== --- trunk/hibernate-dialect/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/hibernate-dialect/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-hibernate-dialect</artifactId> - <name>Hibernate Dialect</name> - <description>Teiid Hibernate Dialect</description> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>3.5.2-Final</version> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.2.0.CR1/hibernate-dialect/pom.xml (from rev 2692, trunk/hibernate-dialect/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/hibernate-dialect/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/hibernate-dialect/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-hibernate-dialect</artifactId> + <name>Hibernate Dialect</name> + <description>Teiid Hibernate Dialect</description> + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.5.2-Final</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.2.0.CR1/jboss-integration/pom.xml =================================================================== --- trunk/jboss-integration/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/jboss-integration/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-jboss-integration</artifactId> - <name>teiid-jboss-integration</name> - <description>JBoss specific integration layer for teiid</description> - - <dependencies> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-runtime</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-cache-jbosscache</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-reflect</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.man</groupId> - <artifactId>jboss-managed</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.integration</groupId> - <artifactId>jboss-profileservice-spi</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-connector</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-aop-mc-int</artifactId> - <version>2.0.6.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.security</groupId> - <artifactId>jbosssx</artifactId> - <version>2.0.3.SP1</version> - <scope>provided</scope> - </dependency> -  - <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.2.0.CR1/jboss-integration/pom.xml (from rev 2692, trunk/jboss-integration/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/jboss-integration/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/jboss-integration/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-jboss-integration</artifactId> + <name>teiid-jboss-integration</name> + <description>JBoss specific integration layer for teiid</description> + + <dependencies> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-runtime</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-cache-jbosscache</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-managed</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-profileservice-spi</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-connector</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-aop-mc-int</artifactId> + <version>2.0.6.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + <version>2.0.3.SP1</version> + <scope>provided</scope> + </dependency> +  + <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.2.0.CR1/metadata/pom.xml =================================================================== --- trunk/metadata/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/metadata/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-metadata</artifactId> - <name>Metadata</name> - <description>Provides vdb metadata from index files.</description> - - <dependencies> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.man</groupId> - <artifactId>jboss-managed</artifactId> - </dependency> - - </dependencies> - -</project> \ No newline at end of file Copied: tags/teiid-parent-7.2.0.CR1/metadata/pom.xml (from rev 2692, trunk/metadata/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/metadata/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/metadata/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-metadata</artifactId> + <name>Metadata</name> + <description>Provides vdb metadata from index files.</description> + + <dependencies> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + <type>test-jar</type> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-vfs</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-managed</artifactId> + </dependency> + + </dependencies> + +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.2.0.CR1/pom.xml =================================================================== --- trunk/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -1,493 +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.2.0.CR1-SNAPSHOT</version> - <description>Federated SQL and XML query engine.</description> - <properties> - <ant.version>1.7.0</ant.version> - <site.url>http://www.jboss.org/teiid</site.url> - </properties> - <scm> - <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/trunk</developerConnection> - </scm> - <licenses> - <license> - <name>GNU Lesser General Public License</name> - <url>http://www.gnu.org/licenses/lgpl.html</url> - <distribution>repo</distribution> - <comments>A business-friendly OSS license</comments> - </license> - </licenses> - <url>${site.url}</url> - <developers> - <developer> - <name>Steve Hawkins</name> - <id>steve</id> - <email>shawkins(a)redhat.com</email> - <organization>Red Hat</organization> - <roles> - <role>Project Lead</role> - </roles> - <timezone>-6</timezone> - </developer> - <developer> - <name>Ramesh Reddy</name> - <id>ramesh</id> - <email>rareddy(a)redhat.com</email> - <organization>Red Hat</organization> - <roles> - <role>Project Lead</role> - </roles> - <timezone>-6</timezone> - </developer> - <developer> - <name>Van Halbert</name> - <id>van</id> - <email>vhalbert(a)redhat.com</email> - <organization>Red Hat</organization> - <roles> - <role>Developer</role> - </roles> - <timezone>-6</timezone> - </developer> - <developer> - <name>Ted Jones</name> - <id>ted</id> - <email>tejones(a)redhat.com</email> - <organization>Red Hat</organization> - <roles> - <role>Developer</role> - </roles> - <timezone>-6</timezone> - </developer> - </developers> - <profiles> - <profile> -  - <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.10.GA</version> - </dependency> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <version>3.1.0.GA</version> - <exclusions> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.man</groupId> - <artifactId>jboss-managed</artifactId> - <version>2.1.0.SP1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.man</groupId> - <artifactId>jboss-metatype</artifactId> - <version>2.1.0.SP1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.integration</groupId> - <artifactId>jboss-profileservice-spi</artifactId> - <version>5.1.0.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - <version>2.1.2.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs-spi</artifactId> - <version>2.0.7.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - <version>2.0.7.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-connector</artifactId> - <version>5.1.0.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-reflect</artifactId> - <version>2.0.2.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.remoting</groupId> - <artifactId>jboss-remoting</artifactId> - <version>2.5.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>net.sourceforge.saxon</groupId> - <artifactId>saxon</artifactId> - <version>9.1.0.8</version> - </dependency> - <dependency> - <groupId>net.sourceforge.saxon</groupId> - <artifactId>saxon</artifactId> - <classifier>dom</classifier> - <version>9.1.0.8</version> - </dependency> - <dependency> - <groupId>org.jboss.netty</groupId> - <artifactId>netty</artifactId> - <version>3.2.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> - </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.2.0.CR1/pom.xml (from rev 2692, trunk/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -0,0 +1,493 @@ +<?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.2.0.CR1</version> + <description>Federated SQL and XML query engine.</description> + <properties> + <ant.version>1.7.0</ant.version> + <site.url>http://www.jboss.org/teiid</site.url> + </properties> + <scm> + <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-7.2.0.CR1</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-7.2.0.CR1</developerConnection> + </scm> + <licenses> + <license> + <name>GNU Lesser General Public License</name> + <url>http://www.gnu.org/licenses/lgpl.html</url> + <distribution>repo</distribution> + <comments>A business-friendly OSS license</comments> + </license> + </licenses> + <url>${site.url}</url> + <developers> + <developer> + <name>Steve Hawkins</name> + <id>steve</id> + <email>shawkins(a)redhat.com</email> + <organization>Red Hat</organization> + <roles> + <role>Project Lead</role> + </roles> + <timezone>-6</timezone> + </developer> + <developer> + <name>Ramesh Reddy</name> + <id>ramesh</id> + <email>rareddy(a)redhat.com</email> + <organization>Red Hat</organization> + <roles> + <role>Project Lead</role> + </roles> + <timezone>-6</timezone> + </developer> + <developer> + <name>Van Halbert</name> + <id>van</id> + <email>vhalbert(a)redhat.com</email> + <organization>Red Hat</organization> + <roles> + <role>Developer</role> + </roles> + <timezone>-6</timezone> + </developer> + <developer> + <name>Ted Jones</name> + <id>ted</id> + <email>tejones(a)redhat.com</email> + <organization>Red Hat</organization> + <roles> + <role>Developer</role> + </roles> + <timezone>-6</timezone> + </developer> + </developers> + <profiles> + <profile> +  + <id>release</id> + <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.10.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>3.1.0.GA</version> + <exclusions> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-managed</artifactId> + <version>2.1.0.SP1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-metatype</artifactId> + <version>2.1.0.SP1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-profileservice-spi</artifactId> + <version>5.1.0.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-vfs</artifactId> + <version>2.1.2.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs-spi</artifactId> + <version>2.0.7.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs</artifactId> + <version>2.0.7.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-connector</artifactId> + <version>5.1.0.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + <version>2.0.2.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + <version>2.5.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + <version>9.1.0.8</version> + </dependency> + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + <classifier>dom</classifier> + <version>9.1.0.8</version> + </dependency> + <dependency> + <groupId>org.jboss.netty</groupId> + <artifactId>netty</artifactId> + <version>3.2.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> + </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.2.0.CR1/runtime/pom.xml =================================================================== --- trunk/runtime/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/runtime/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-runtime</artifactId> - <name>Runtime Engine</name> - <description>Teiid Runtime Engine</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-metadata</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.netty</groupId> - <artifactId>netty</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs-spi</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.integration</groupId> - <artifactId>jboss-profileservice-spi</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.2.0.CR1/runtime/pom.xml (from rev 2692, trunk/runtime/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/runtime/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/runtime/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-runtime</artifactId> + <name>Runtime Engine</name> + <description>Teiid Runtime Engine</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-metadata</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.netty</groupId> + <artifactId>netty</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-vfs</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs-spi</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-profileservice-spi</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.2.0.CR1/runtime/src/main/java/org/teiid/deployers/SystemVDBDeployer.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/SystemVDBDeployer.java 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/runtime/src/main/java/org/teiid/deployers/SystemVDBDeployer.java 2010-10-29 18:44:50 UTC (rev 2693) @@ -1,57 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ -package org.teiid.deployers; - -import java.io.IOException; -import java.net.URISyntaxException; -import java.net.URL; - -import org.teiid.core.CoreConstants; -import org.teiid.core.TeiidRuntimeException; -import org.teiid.metadata.index.IndexMetadataFactory; -import org.teiid.metadata.index.RuntimeMetadataPlugin; -import org.teiid.runtime.RuntimePlugin; - - -public class SystemVDBDeployer { - private VDBRepository vdbRepository; - - - public void start() { - try { - URL url = Thread.currentThread().getContextClassLoader().getResource(CoreConstants.SYSTEM_VDB); - if (url == null) { - throw new TeiidRuntimeException(RuntimeMetadataPlugin.Util.getString("system_vdb_not_found")); //$NON-NLS-1$ - } - this.vdbRepository.setSystemStore(new IndexMetadataFactory(url).getMetadataStore(null)); - } catch (URISyntaxException e) { - throw new TeiidRuntimeException(e, RuntimePlugin.Util.getString("system_vdb_load_error")); //$NON-NLS-1$ - } catch (IOException e) { - throw new TeiidRuntimeException(e, RuntimePlugin.Util.getString("system_vdb_load_error")); //$NON-NLS-1$ - } - } - - public void setVDBRepository(VDBRepository repo) { - this.vdbRepository = repo; - } - -} Copied: tags/teiid-parent-7.2.0.CR1/runtime/src/main/java/org/teiid/deployers/SystemVDBDeployer.java (from rev 2691, trunk/runtime/src/main/java/org/teiid/deployers/SystemVDBDeployer.java) =================================================================== --- tags/teiid-parent-7.2.0.CR1/runtime/src/main/java/org/teiid/deployers/SystemVDBDeployer.java (rev 0) +++ tags/teiid-parent-7.2.0.CR1/runtime/src/main/java/org/teiid/deployers/SystemVDBDeployer.java 2010-10-29 18:44:50 UTC (rev 2693) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ +package org.teiid.deployers; + +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; + +import org.teiid.core.CoreConstants; +import org.teiid.core.TeiidRuntimeException; +import org.teiid.metadata.index.IndexMetadataFactory; +import org.teiid.metadata.index.RuntimeMetadataPlugin; +import org.teiid.runtime.RuntimePlugin; + + +public class SystemVDBDeployer { + private VDBRepository vdbRepository; + + + public void start() { + try { + URL url = Thread.currentThread().getContextClassLoader().getResource(CoreConstants.SYSTEM_VDB); + if (url == null) { + throw new TeiidRuntimeException(RuntimeMetadataPlugin.Util.getString("system_vdb_not_found")); //$NON-NLS-1$ + } + // uri conversion is only to remove the spaces in URL, note this only with above kind situation + URI uri = new URI(url.getProtocol(), url.getPath(), null); + this.vdbRepository.setSystemStore(new IndexMetadataFactory(uri.toURL()).getMetadataStore(null)); + } catch (URISyntaxException e) { + throw new TeiidRuntimeException(e, RuntimePlugin.Util.getString("system_vdb_load_error")); //$NON-NLS-1$ + } catch (IOException e) { + throw new TeiidRuntimeException(e, RuntimePlugin.Util.getString("system_vdb_load_error")); //$NON-NLS-1$ + } + } + + public void setVDBRepository(VDBRepository repo) { + this.vdbRepository = repo; + } + +} Deleted: tags/teiid-parent-7.2.0.CR1/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-10-29 18:44:50 UTC (rev 2693) @@ -1,363 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ -package org.teiid.deployers; - -import java.io.File; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.IdentityHashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Set; - -import org.jboss.deployers.spi.DeploymentException; -import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer; -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; -import org.jboss.util.threadpool.ThreadPool; -import org.teiid.adminapi.Model; -import org.teiid.adminapi.Translator; -import org.teiid.adminapi.VDB; -import org.teiid.adminapi.impl.ModelMetaData; -import org.teiid.adminapi.impl.SourceMappingMetadata; -import org.teiid.adminapi.impl.VDBMetaData; -import org.teiid.adminapi.impl.VDBTranslatorMetaData; -import org.teiid.core.util.FileUtils; -import org.teiid.dqp.internal.datamgr.ConnectorManager; -import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository; -import org.teiid.dqp.internal.datamgr.TranslatorRepository; -import org.teiid.logging.LogConstants; -import org.teiid.logging.LogManager; -import org.teiid.metadata.MetadataStore; -import org.teiid.metadata.index.IndexMetadataFactory; -import org.teiid.query.metadata.TransformationMetadata.Resource; -import org.teiid.runtime.RuntimePlugin; -import org.teiid.translator.ExecutionFactory; -import org.teiid.translator.TranslatorException; - - -public class VDBDeployer extends AbstractSimpleRealDeployer<VDBMetaData> { - private VDBRepository vdbRepository; - private TranslatorRepository translatorRepository; - private ObjectSerializer serializer; - private ContainerLifeCycleListener shutdownListener; - private ThreadPool threadPool; - - public VDBDeployer() { - super(VDBMetaData.class); - setInput(VDBMetaData.class); - setOutput(VDBMetaData.class); - setRelativeOrder(3001); // after the data sources - } - - @Override - public void deploy(DeploymentUnit unit, VDBMetaData deployment) throws DeploymentException { - if (this.vdbRepository.removeVDB(deployment.getName(), deployment.getVersion())) { - LogManager.logInfo(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.getString("redeploying_vdb", deployment)); //$NON-NLS-1$ - } - - TranslatorRepository repo = new TranslatorRepository(); - ConnectorManagerRepository cmr = new ConnectorManagerRepository(); - - boolean preview = deployment.isPreview(); - - if (!preview) { - List<String> errors = deployment.getValidityErrors(); - if (errors != null && !errors.isEmpty()) { - throw new DeploymentException(RuntimePlugin.Util.getString("validity_errors_in_vdb", deployment)); //$NON-NLS-1$ - } - } - - // get the metadata store of the VDB (this is build in parse stage) - MetadataStoreGroup store = unit.getAttachment(MetadataStoreGroup.class); - - // add required connector managers; if they are not already there - for (Translator t: deployment.getOverrideTranslators()) { - VDBTranslatorMetaData data = (VDBTranslatorMetaData)t; - - String type = data.getType(); - Translator parent = this.translatorRepository.getTranslatorMetaData(type); - if ( parent == null) { - throw new DeploymentException(RuntimePlugin.Util.getString("translator_type_not_found", unit.getName())); //$NON-NLS-1$ - } - - Set<String> keys = parent.getProperties().stringPropertyNames(); - for (String key:keys) { - if (data.getPropertyValue(key) == null && parent.getPropertyValue(key) != null) { - data.addProperty(key, parent.getPropertyValue(key)); - } - } - repo.addTranslatorMetadata(data.getName(), data); - } - createConnectorManagers(cmr, repo, deployment); - - // if store is null and vdb dynamic vdb then try to get the metadata - if (store == null && deployment.isDynamic()) { - store = new MetadataStoreGroup(); - buildDynamicMetadataStore((VFSDeploymentUnit)unit, deployment, store, cmr); - } - - // allow empty vdbs for enabling the preview functionality - if (preview && store == null) { - store = new MetadataStoreGroup(); - } - - if (store == null) { - LogManager.logError(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.getString("failed_matadata_load", deployment.getName(), deployment.getVersion())); //$NON-NLS-1$ - } - - // check if this is a VDB with index files, if there are then build the TransformationMetadata - UDFMetaData udf = unit.getAttachment(UDFMetaData.class); - - LinkedHashMap<String, Resource> visibilityMap = null; - IndexMetadataFactory indexFactory = unit.getAttachment(IndexMetadataFactory.class); - if (indexFactory != null) { - visibilityMap = indexFactory.getEntriesPlusVisibilities(); - } - - // add the metadata objects as attachments - deployment.removeAttachment(IndexMetadataFactory.class); - deployment.removeAttachment(UDFMetaData.class); - deployment.removeAttachment(MetadataStoreGroup.class); - - // add transformation metadata to the repository. - this.vdbRepository.addVDB(deployment, store, visibilityMap, udf, cmr); - - try { - saveMetadataStore((VFSDeploymentUnit)unit, deployment, store); - } catch (IOException e1) { - LogManager.logWarning(LogConstants.CTX_RUNTIME, e1, RuntimePlugin.Util.getString("vdb_save_failed", deployment.getName()+"."+deployment.getVersion())); //$NON-NLS-1$ //$NON-NLS-2$ - } - - boolean valid = true; - if (!preview) { - valid = validateSources(cmr, deployment); - - // Check if the VDB is fully configured. - if (valid) { - deployment.setStatus(VDB.Status.ACTIVE); - } else { - deployment.setStatus(VDB.Status.INACTIVE); - } - } - else { - deployment.setStatus(VDB.Status.ACTIVE); - } - LogManager.logInfo(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.getString("vdb_deployed",deployment, valid?"active":"inactive")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - private void createConnectorManagers(ConnectorManagerRepository cmr, TranslatorRepository repo, final VDBMetaData deployment) throws DeploymentException { - IdentityHashMap<Translator, ExecutionFactory<Object, Object>> map = new IdentityHashMap<Translator, ExecutionFactory<Object, Object>>(); - - for (Model model:deployment.getModels()) { - for (String source:model.getSourceNames()) { - if (cmr.getConnectorManager(source) != null) { - continue; - } - - String name = model.getSourceTranslatorName(source); - Translator translator = repo.getTranslatorMetaData(name); - if (translator == null) { - translator = this.translatorRepository.getTranslatorMetaData(name); - } - if (translator == null) { - throw new DeploymentException(RuntimePlugin.Util.getString("translator_not_found", deployment.getName(), deployment.getVersion(), name)); //$NON-NLS-1$ - } - - ExecutionFactory<Object, Object> ef = map.get(translator); - if ( ef == null) { - ef = TranslatorUtil.buildExecutionFactory(translator); - map.put(translator, ef); - } - - ConnectorManager cm = new ConnectorManager(name, model.getSourceConnectionJndiName(source)); - cm.setExecutionFactory(ef); - cmr.addConnectorManager(source, cm); - } - } - } - - private boolean validateSources(ConnectorManagerRepository cmr, VDBMetaData deployment) { - boolean valid = true; - for(Model m:deployment.getModels()) { - ModelMetaData model = (ModelMetaData)m; - List<SourceMappingMetadata> mappings = model.getSourceMappings(); - for (SourceMappingMetadata mapping:mappings) { - ConnectorManager cm = cmr.getConnectorManager(mapping.getName()); - String msg = cm.getStausMessage(); - if (msg != null && msg.length() > 0) { - valid = false; - model.addError(ModelMetaData.ValidationError.Severity.ERROR.name(), cm.getStausMessage()); - LogManager.logInfo(LogConstants.CTX_RUNTIME, cm.getStausMessage()); - } - } - - // in the dynamic case the metadata may be still loading. - if (!model.getErrors().isEmpty()) { - valid = false; - } - } - return valid; - } - - public void setVDBRepository(VDBRepository repo) { - this.vdbRepository = repo; - } - - @Override - public void undeploy(DeploymentUnit unit, VDBMetaData deployment) { - super.undeploy(unit, deployment); - - if (this.vdbRepository != null) { - this.vdbRepository.removeVDB(deployment.getName(), deployment.getVersion()); - } - - deployment.setRemoved(true); - - try { - deleteMetadataStore((VFSDeploymentUnit)unit, deployment); - } catch (IOException e) { - LogManager.logWarning(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.getString("vdb_delete_failed", e.getMessage())); //$NON-NLS-1$ - } - - LogManager.logInfo(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.getString("vdb_undeployed", deployment)); //$NON-NLS-1$ - } - - public void setObjectSerializer(ObjectSerializer serializer) { - this.serializer = serializer; - } - - private void saveMetadataStore(VFSDeploymentUnit unit, VDBMetaData vdb, MetadataStoreGroup store) throws IOException { - File cacheFileName = this.serializer.getAttachmentPath(unit, vdb.getName()+"_"+vdb.getVersion()); //$NON-NLS-1$ - if (!cacheFileName.exists()) { - this.serializer.saveAttachment(cacheFileName,store); - } - } - - private void deleteMetadataStore(VFSDeploymentUnit unit, VDBMetaData vdb) throws IOException { - if (!unit.getRoot().exists() || !shutdownListener.isShutdownInProgress()) { - File cacheFileName = this.serializer.getAttachmentPath(unit, vdb.getName()+"_"+vdb.getVersion()); //$NON-NLS-1$ - if (cacheFileName.exists()) { - FileUtils.removeDirectoryAndChildren(cacheFileName.getParentFile()); - } - } - } - - private void buildDynamicMetadataStore(final VFSDeploymentUnit unit, final VDBMetaData vdb, final MetadataStoreGroup vdbStore, final ConnectorManagerRepository cmr) throws DeploymentException { - - // make sure we are configured correctly first - for (final ModelMetaData model:vdb.getModelMetaDatas().values()) { - if (model.getSourceNames().isEmpty()) { - throw new DeploymentException(RuntimePlugin.Util.getString("fail_to_deploy", vdb.getName()+"-"+vdb.getVersion(), model.getName())); //$NON-NLS-1$ //$NON-NLS-2$ - } - - final boolean cache = "cached".equalsIgnoreCase(vdb.getPropertyValue("UseConnectorMetadata")); //$NON-NLS-1$ //$NON-NLS-2$ - final File cacheFile = buildCachedFileName(unit, vdb, model.getName()); - boolean loaded = false; - if (cache) { - MetadataStore store = this.serializer.loadSafe(cacheFile, MetadataStore.class); - if (store != null) { - vdbStore.addStore(store); - loaded = true; - } - } - - if (!loaded) { - String msg = RuntimePlugin.Util.getString("model_metadata_loading", vdb.getName()+"-"+vdb.getVersion(), model.getName(), SimpleDateFormat.getInstance().format(new Date())); //$NON-NLS-1$ //$NON-NLS-2$ - model.addError(ModelMetaData.ValidationError.Severity.ERROR.toString(), msg); - LogManager.logInfo(LogConstants.CTX_RUNTIME, msg); - threadPool.run(new Runnable() { - @Override - public void run() { - loadMetadata(vdb, model, cache, cacheFile, vdbStore, cmr); - } - }); - } - } - } - - private void loadMetadata(VDBMetaData vdb, ModelMetaData model, boolean cache, File cacheFile, MetadataStoreGroup vdbStore, ConnectorManagerRepository cmr) { - Exception exception = null; - - boolean loaded = false; - for (String sourceName: model.getSourceNames()) { - ConnectorManager cm = cmr.getConnectorManager(sourceName); - if (cm == null) { - continue; - } - try { - MetadataStore store = cm.getMetadata(model.getName(), this.vdbRepository.getBuiltinDatatypes(), model.getProperties()); - if (cache) { - this.serializer.saveAttachment(cacheFile, store); - } - vdbStore.addStore(store); - model.clearErrors(); - loaded = true; - break; - } catch (TranslatorException e) { - if (exception == null) { - exception = e; - } - } catch (IOException e) { - if (exception == null) { - exception = e; - } - } - } - - synchronized (this) { - if (!loaded) { - vdb.setStatus(VDB.Status.INACTIVE); - String msg = RuntimePlugin.Util.getString("failed_to_retrive_metadata", vdb.getName()+"-"+vdb.getVersion(), model.getName()); //$NON-NLS-1$ //$NON-NLS-2$ - model.addError(ModelMetaData.ValidationError.Severity.ERROR.toString(), msg); - if (exception != null) { - model.addError(ModelMetaData.ValidationError.Severity.ERROR.toString(), exception.getMessage()); - } - LogManager.logWarning(LogConstants.CTX_RUNTIME, msg); - } - else { - if (vdb.isValid()) { - this.vdbRepository.updateVDB(vdb.getName(), vdb.getVersion()); - vdb.setStatus(VDB.Status.ACTIVE); - LogManager.logInfo(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.getString("vdb_activated",vdb.getName(), vdb.getVersion())); //$NON-NLS-1$ - } - } - } - } - - private File buildCachedFileName(VFSDeploymentUnit unit, VDBMetaData vdb, String modelName) { - return this.serializer.getAttachmentPath(unit, vdb.getName()+"_"+vdb.getVersion()+"_"+modelName); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void setTranslatorRepository(TranslatorRepository repo) { - this.translatorRepository = repo; - } - - public void setContainerLifeCycleListener(ContainerLifeCycleListener listener) { - shutdownListener = listener; - } - - public void setThreadPool(ThreadPool pool) { - this.threadPool = pool; - } -} Copied: tags/teiid-parent-7.2.0.CR1/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java (from rev 2691, trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java) =================================================================== --- tags/teiid-parent-7.2.0.CR1/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java (rev 0) +++ tags/teiid-parent-7.2.0.CR1/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-10-29 18:44:50 UTC (rev 2693) @@ -0,0 +1,364 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ +package org.teiid.deployers; + +import java.io.File; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.IdentityHashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Set; + +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer; +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; +import org.jboss.util.threadpool.ThreadPool; +import org.teiid.adminapi.Model; +import org.teiid.adminapi.Translator; +import org.teiid.adminapi.VDB; +import org.teiid.adminapi.impl.ModelMetaData; +import org.teiid.adminapi.impl.SourceMappingMetadata; +import org.teiid.adminapi.impl.VDBMetaData; +import org.teiid.adminapi.impl.VDBTranslatorMetaData; +import org.teiid.adminapi.impl.ModelMetaData.ValidationError; +import org.teiid.core.util.FileUtils; +import org.teiid.dqp.internal.datamgr.ConnectorManager; +import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository; +import org.teiid.dqp.internal.datamgr.TranslatorRepository; +import org.teiid.logging.LogConstants; +import org.teiid.logging.LogManager; +import org.teiid.metadata.MetadataStore; +import org.teiid.metadata.index.IndexMetadataFactory; +import org.teiid.query.metadata.TransformationMetadata.Resource; +import org.teiid.runtime.RuntimePlugin; +import org.teiid.translator.ExecutionFactory; +import org.teiid.translator.TranslatorException; + + +public class VDBDeployer extends AbstractSimpleRealDeployer<VDBMetaData> { + private VDBRepository vdbRepository; + private TranslatorRepository translatorRepository; + private ObjectSerializer serializer; + private ContainerLifeCycleListener shutdownListener; + private ThreadPool threadPool; + + public VDBDeployer() { + super(VDBMetaData.class); + setInput(VDBMetaData.class); + setOutput(VDBMetaData.class); + setRelativeOrder(3001); // after the data sources + } + + @Override + public void deploy(DeploymentUnit unit, VDBMetaData deployment) throws DeploymentException { + if (this.vdbRepository.removeVDB(deployment.getName(), deployment.getVersion())) { + LogManager.logInfo(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.getString("redeploying_vdb", deployment)); //$NON-NLS-1$ + } + + TranslatorRepository repo = new TranslatorRepository(); + ConnectorManagerRepository cmr = new ConnectorManagerRepository(); + + boolean preview = deployment.isPreview(); + + if (!preview) { + List<String> errors = deployment.getValidityErrors(); + if (errors != null && !errors.isEmpty()) { + throw new DeploymentException(RuntimePlugin.Util.getString("validity_errors_in_vdb", deployment)); //$NON-NLS-1$ + } + } + + // get the metadata store of the VDB (this is build in parse stage) + MetadataStoreGroup store = unit.getAttachment(MetadataStoreGroup.class); + + // add required connector managers; if they are not already there + for (Translator t: deployment.getOverrideTranslators()) { + VDBTranslatorMetaData data = (VDBTranslatorMetaData)t; + + String type = data.getType(); + Translator parent = this.translatorRepository.getTranslatorMetaData(type); + if ( parent == null) { + throw new DeploymentException(RuntimePlugin.Util.getString("translator_type_not_found", unit.getName())); //$NON-NLS-1$ + } + + Set<String> keys = parent.getProperties().stringPropertyNames(); + for (String key:keys) { + if (data.getPropertyValue(key) == null && parent.getPropertyValue(key) != null) { + data.addProperty(key, parent.getPropertyValue(key)); + } + } + repo.addTranslatorMetadata(data.getName(), data); + } + createConnectorManagers(cmr, repo, deployment); + + // if store is null and vdb dynamic vdb then try to get the metadata + if (store == null && deployment.isDynamic()) { + store = new MetadataStoreGroup(); + buildDynamicMetadataStore((VFSDeploymentUnit)unit, deployment, store, cmr); + } + + // allow empty vdbs for enabling the preview functionality + if (preview && store == null) { + store = new MetadataStoreGroup(); + } + + if (store == null) { + LogManager.logError(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.getString("failed_matadata_load", deployment.getName(), deployment.getVersion())); //$NON-NLS-1$ + } + + // check if this is a VDB with index files, if there are then build the TransformationMetadata + UDFMetaData udf = unit.getAttachment(UDFMetaData.class); + + LinkedHashMap<String, Resource> visibilityMap = null; + IndexMetadataFactory indexFactory = unit.getAttachment(IndexMetadataFactory.class); + if (indexFactory != null) { + visibilityMap = indexFactory.getEntriesPlusVisibilities(); + } + + // add the metadata objects as attachments + deployment.removeAttachment(IndexMetadataFactory.class); + deployment.removeAttachment(UDFMetaData.class); + deployment.removeAttachment(MetadataStoreGroup.class); + + // add transformation metadata to the repository. + this.vdbRepository.addVDB(deployment, store, visibilityMap, udf, cmr); + + try { + saveMetadataStore((VFSDeploymentUnit)unit, deployment, store); + } catch (IOException e1) { + LogManager.logWarning(LogConstants.CTX_RUNTIME, e1, RuntimePlugin.Util.getString("vdb_save_failed", deployment.getName()+"."+deployment.getVersion())); //$NON-NLS-1$ //$NON-NLS-2$ + } + + boolean valid = true; + if (!preview) { + valid = validateSources(cmr, deployment); + + // Check if the VDB is fully configured. + if (valid) { + deployment.setStatus(VDB.Status.ACTIVE); + } else { + deployment.setStatus(VDB.Status.INACTIVE); + } + } + else { + deployment.setStatus(VDB.Status.ACTIVE); + } + LogManager.logInfo(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.getString("vdb_deployed",deployment, valid?"active":"inactive")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + private void createConnectorManagers(ConnectorManagerRepository cmr, TranslatorRepository repo, final VDBMetaData deployment) throws DeploymentException { + IdentityHashMap<Translator, ExecutionFactory<Object, Object>> map = new IdentityHashMap<Translator, ExecutionFactory<Object, Object>>(); + + for (Model model:deployment.getModels()) { + for (String source:model.getSourceNames()) { + if (cmr.getConnectorManager(source) != null) { + continue; + } + + String name = model.getSourceTranslatorName(source); + Translator translator = repo.getTranslatorMetaData(name); + if (translator == null) { + translator = this.translatorRepository.getTranslatorMetaData(name); + } + if (translator == null) { + throw new DeploymentException(RuntimePlugin.Util.getString("translator_not_found", deployment.getName(), deployment.getVersion(), name)); //$NON-NLS-1$ + } + + ExecutionFactory<Object, Object> ef = map.get(translator); + if ( ef == null) { + ef = TranslatorUtil.buildExecutionFactory(translator); + map.put(translator, ef); + } + + ConnectorManager cm = new ConnectorManager(name, model.getSourceConnectionJndiName(source)); + cm.setExecutionFactory(ef); + cmr.addConnectorManager(source, cm); + } + } + } + + private boolean validateSources(ConnectorManagerRepository cmr, VDBMetaData deployment) { + boolean valid = true; + for(Model m:deployment.getModels()) { + ModelMetaData model = (ModelMetaData)m; + List<SourceMappingMetadata> mappings = model.getSourceMappings(); + for (SourceMappingMetadata mapping:mappings) { + ConnectorManager cm = cmr.getConnectorManager(mapping.getName()); + String msg = cm.getStausMessage(); + if (msg != null && msg.length() > 0) { + valid = false; + model.addError(ModelMetaData.ValidationError.Severity.ERROR.name(), cm.getStausMessage()); + LogManager.logInfo(LogConstants.CTX_RUNTIME, cm.getStausMessage()); + } + } + + // in the dynamic case the metadata may be still loading. + if (!model.getErrors().isEmpty()) { + valid = false; + } + } + return valid; + } + + public void setVDBRepository(VDBRepository repo) { + this.vdbRepository = repo; + } + + @Override + public void undeploy(DeploymentUnit unit, VDBMetaData deployment) { + super.undeploy(unit, deployment); + + if (this.vdbRepository != null) { + this.vdbRepository.removeVDB(deployment.getName(), deployment.getVersion()); + } + + deployment.setRemoved(true); + + try { + deleteMetadataStore((VFSDeploymentUnit)unit, deployment); + } catch (IOException e) { + LogManager.logWarning(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.getString("vdb_delete_failed", e.getMessage())); //$NON-NLS-1$ + } + + LogManager.logInfo(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.getString("vdb_undeployed", deployment)); //$NON-NLS-1$ + } + + public void setObjectSerializer(ObjectSerializer serializer) { + this.serializer = serializer; + } + + private void saveMetadataStore(VFSDeploymentUnit unit, VDBMetaData vdb, MetadataStoreGroup store) throws IOException { + File cacheFileName = this.serializer.getAttachmentPath(unit, vdb.getName()+"_"+vdb.getVersion()); //$NON-NLS-1$ + if (!cacheFileName.exists()) { + this.serializer.saveAttachment(cacheFileName,store); + } + } + + private void deleteMetadataStore(VFSDeploymentUnit unit, VDBMetaData vdb) throws IOException { + if (!unit.getRoot().exists() || !shutdownListener.isShutdownInProgress()) { + File cacheFileName = this.serializer.getAttachmentPath(unit, vdb.getName()+"_"+vdb.getVersion()); //$NON-NLS-1$ + if (cacheFileName.exists()) { + FileUtils.removeDirectoryAndChildren(cacheFileName.getParentFile()); + } + } + } + + private void buildDynamicMetadataStore(final VFSDeploymentUnit unit, final VDBMetaData vdb, final MetadataStoreGroup vdbStore, final ConnectorManagerRepository cmr) throws DeploymentException { + + // make sure we are configured correctly first + for (final ModelMetaData model:vdb.getModelMetaDatas().values()) { + if (model.getSourceNames().isEmpty()) { + throw new DeploymentException(RuntimePlugin.Util.getString("fail_to_deploy", vdb.getName()+"-"+vdb.getVersion(), model.getName())); //$NON-NLS-1$ //$NON-NLS-2$ + } + + final boolean cache = "cached".equalsIgnoreCase(vdb.getPropertyValue("UseConnectorMetadata")); //$NON-NLS-1$ //$NON-NLS-2$ + final File cacheFile = buildCachedFileName(unit, vdb, model.getName()); + boolean loaded = false; + if (cache) { + MetadataStore store = this.serializer.loadSafe(cacheFile, MetadataStore.class); + if (store != null) { + vdbStore.addStore(store); + loaded = true; + } + } + + if (!loaded) { + String msg = RuntimePlugin.Util.getString("model_metadata_loading", vdb.getName()+"-"+vdb.getVersion(), model.getName(), SimpleDateFormat.getInstance().format(new Date())); //$NON-NLS-1$ //$NON-NLS-2$ + final ValidationError addedError = model.addError(ModelMetaData.ValidationError.Severity.ERROR.toString(), msg); + LogManager.logInfo(LogConstants.CTX_RUNTIME, msg); + threadPool.run(new Runnable() { + @Override + public void run() { + loadMetadata(vdb, model, cache, cacheFile, vdbStore, cmr, addedError); + } + }); + } + } + } + + private void loadMetadata(VDBMetaData vdb, ModelMetaData model, boolean cache, File cacheFile, MetadataStoreGroup vdbStore, ConnectorManagerRepository cmr, ValidationError addedError) { + Exception exception = null; + + boolean loaded = false; + for (String sourceName: model.getSourceNames()) { + ConnectorManager cm = cmr.getConnectorManager(sourceName); + if (cm == null) { + continue; + } + try { + MetadataStore store = cm.getMetadata(model.getName(), this.vdbRepository.getBuiltinDatatypes(), model.getProperties()); + if (cache) { + this.serializer.saveAttachment(cacheFile, store); + } + vdbStore.addStore(store); + model.removeError(addedError); + loaded = true; + break; + } catch (TranslatorException e) { + if (exception == null) { + exception = e; + } + } catch (IOException e) { + if (exception == null) { + exception = e; + } + } + } + + synchronized (this) { + if (!loaded) { + vdb.setStatus(VDB.Status.INACTIVE); + String msg = RuntimePlugin.Util.getString("failed_to_retrive_metadata", vdb.getName()+"-"+vdb.getVersion(), model.getName()); //$NON-NLS-1$ //$NON-NLS-2$ + model.addError(ModelMetaData.ValidationError.Severity.ERROR.toString(), msg); + if (exception != null) { + model.addError(ModelMetaData.ValidationError.Severity.ERROR.toString(), exception.getMessage()); + } + LogManager.logWarning(LogConstants.CTX_RUNTIME, msg); + } + else { + if (vdb.isValid()) { + this.vdbRepository.updateVDB(vdb.getName(), vdb.getVersion()); + vdb.setStatus(VDB.Status.ACTIVE); + LogManager.logInfo(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.getString("vdb_activated",vdb.getName(), vdb.getVersion())); //$NON-NLS-1$ + } + } + } + } + + private File buildCachedFileName(VFSDeploymentUnit unit, VDBMetaData vdb, String modelName) { + return this.serializer.getAttachmentPath(unit, vdb.getName()+"_"+vdb.getVersion()+"_"+modelName); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void setTranslatorRepository(TranslatorRepository repo) { + this.translatorRepository = repo; + } + + public void setContainerLifeCycleListener(ContainerLifeCycleListener listener) { + shutdownListener = listener; + } + + public void setThreadPool(ThreadPool pool) { + this.threadPool = pool; + } +} Deleted: tags/teiid-parent-7.2.0.CR1/test-integration/common/pom.xml =================================================================== --- trunk/test-integration/common/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/test-integration/common/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -1,13 +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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>test-integration-common</artifactId> - <name>Common Integration Tests</name> - <description>Common Integration tests that do not require external dependencies</description> - -</project> \ No newline at end of file Copied: tags/teiid-parent-7.2.0.CR1/test-integration/common/pom.xml (from rev 2692, trunk/test-integration/common/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/test-integration/common/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/test-integration/common/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-test-integration</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>test-integration-common</artifactId> + <name>Common Integration Tests</name> + <description>Common Integration tests that do not require external dependencies</description> + +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.2.0.CR1/test-integration/db/pom.xml =================================================================== --- trunk/test-integration/db/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/test-integration/db/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>test-integration-db</artifactId> - - <name>DB Dependent Integration Tests</name> - <groupId>org.jboss.teiid.teiid-test-integration</groupId> - <description>Integration tests that require external database dependencies </description> - <dependencies> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - </dependency> - - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <type>test-jar</type> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - <scope>compile</scope> - </dependency> - - - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - <type>test-jar</type> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>test-integration-common</artifactId> - <type>test-jar</type> - <scope>compile</scope> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>1.7.0</version> - </dependency> - - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-launcher</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>ant-contrib</groupId> - <artifactId>ant-contrib</artifactId> - <version>1.0b3</version> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - - </dependency> - - <dependency> - <groupId>ant-contrib</groupId> - <artifactId>cpptasks</artifactId> - <version>1.0b3</version> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> - - -  - - <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.2.0.CR1/test-integration/db/pom.xml (from rev 2692, trunk/test-integration/db/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/test-integration/db/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/test-integration/db/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>test-integration-db</artifactId> + + <name>DB Dependent Integration Tests</name> + <groupId>org.jboss.teiid.teiid-test-integration</groupId> + <description>Integration tests that require external database dependencies </description> + <dependencies> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + </dependency> + + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <type>test-jar</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + <scope>compile</scope> + </dependency> + + + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + <type>test-jar</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>test-integration-common</artifactId> + <type>test-jar</type> + <scope>compile</scope> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.7.0</version> + </dependency> + + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-launcher</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>ant-contrib</artifactId> + <version>1.0b3</version> + <exclusions> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + + </dependency> + + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>cpptasks</artifactId> + <version>1.0b3</version> + <exclusions> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + </dependency> + + +  + + <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.2.0.CR1/test-integration/pom.xml =================================================================== --- trunk/test-integration/pom.xml 2010-10-29 17:30:50 UTC (rev 2690) +++ tags/teiid-parent-7.2.0.CR1/test-integration/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-test-integration</artifactId> - <packaging>pom</packaging> - <name>Integration Tests</name> - <description>Integration tests spanning server/embedded/connectors.</description> - - <properties> - <derby.version>10.2.1.6</derby.version> - <mysql.connector.version>5.1.5</mysql.connector.version> - <postgresql.version>8.3-603.jdbc3</postgresql.version> - - <apache.ant.version>1.7.0</apache.ant.version> - </properties> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-metadata</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-metadata</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>translator-jdbc</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-adminshell</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-runtime</artifactId> - </dependency> - -  - <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.2.0.CR1/test-integration/pom.xml (from rev 2692, trunk/test-integration/pom.xml) =================================================================== --- tags/teiid-parent-7.2.0.CR1/test-integration/pom.xml (rev 0) +++ tags/teiid-parent-7.2.0.CR1/test-integration/pom.xml 2010-10-29 18:44:50 UTC (rev 2693) @@ -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.2.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-test-integration</artifactId> + <packaging>pom</packaging> + <name>Integration Tests</name> + <description>Integration tests spanning server/embedded/connectors.</description> + + <properties> + <derby.version>10.2.1.6</derby.version> + <mysql.connector.version>5.1.5</mysql.connector.version> + <postgresql.version>8.3-603.jdbc3</postgresql.version> + + <apache.ant.version>1.7.0</apache.ant.version> + </properties> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-metadata</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-metadata</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>translator-jdbc</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-adminshell</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-runtime</artifactId> + </dependency> + +  + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <version>${derby.version}</version> + + </dependency> + + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs-spi</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs</artifactId> + <scope>provided</scope> + </dependency> + + </dependencies> + + <modules> + <module>common</module> + <module>db</module> + </modules> +</project> \ No newline at end of file

14 years, 1 month

1
0
0 / 0

teiid SVN: r2692 - in trunk: adminshell and 35 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-10-29 14:43:19 -0400 (Fri, 29 Oct 2010) New Revision: 2692 Modified: trunk/adminshell/pom.xml trunk/api/pom.xml trunk/build/pom.xml trunk/cache-jbosscache/pom.xml trunk/client/pom.xml trunk/common-core/pom.xml trunk/connectors/connector-file/pom.xml trunk/connectors/connector-ldap/pom.xml trunk/connectors/connector-salesforce/pom.xml trunk/connectors/connector-ws/pom.xml trunk/connectors/pom.xml trunk/connectors/salesforce-api/pom.xml trunk/connectors/sandbox/pom.xml trunk/connectors/sandbox/translator-yahoo/pom.xml trunk/connectors/translator-file/pom.xml trunk/connectors/translator-jdbc/pom.xml trunk/connectors/translator-ldap/pom.xml trunk/connectors/translator-loopback/pom.xml trunk/connectors/translator-salesforce/pom.xml trunk/connectors/translator-ws/pom.xml trunk/console/pom.xml trunk/documentation/admin-guide/pom.xml trunk/documentation/caching-guide/pom.xml trunk/documentation/client-developers-guide/pom.xml trunk/documentation/developer-guide/pom.xml trunk/documentation/pom.xml trunk/documentation/quick-start-example/pom.xml trunk/documentation/reference/pom.xml trunk/engine/pom.xml trunk/hibernate-dialect/pom.xml trunk/jboss-integration/pom.xml trunk/metadata/pom.xml trunk/pom.xml trunk/runtime/pom.xml trunk/test-integration/common/pom.xml trunk/test-integration/db/pom.xml trunk/test-integration/pom.xml Log: [maven-release-plugin] prepare release teiid-parent-7.2.0.CR1 Modified: trunk/adminshell/pom.xml =================================================================== --- trunk/adminshell/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/adminshell/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-adminshell</artifactId> Modified: trunk/api/pom.xml =================================================================== --- trunk/api/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/api/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-api</artifactId> Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/build/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid</artifactId> Modified: trunk/cache-jbosscache/pom.xml =================================================================== --- trunk/cache-jbosscache/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/cache-jbosscache/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-cache-jbosscache</artifactId> Modified: trunk/client/pom.xml =================================================================== --- trunk/client/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/client/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-client</artifactId> Modified: trunk/common-core/pom.xml =================================================================== --- trunk/common-core/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/common-core/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-common-core</artifactId> Modified: trunk/connectors/connector-file/pom.xml =================================================================== --- trunk/connectors/connector-file/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/connectors/connector-file/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-file</artifactId> Modified: trunk/connectors/connector-ldap/pom.xml =================================================================== --- trunk/connectors/connector-ldap/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/connectors/connector-ldap/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ldap</artifactId> Modified: trunk/connectors/connector-salesforce/pom.xml =================================================================== --- trunk/connectors/connector-salesforce/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/connectors/connector-salesforce/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-salesforce</artifactId> Modified: trunk/connectors/connector-ws/pom.xml =================================================================== --- trunk/connectors/connector-ws/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/connectors/connector-ws/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ws</artifactId> Modified: trunk/connectors/pom.xml =================================================================== --- trunk/connectors/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/connectors/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/connectors/salesforce-api/pom.xml =================================================================== --- trunk/connectors/salesforce-api/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/connectors/salesforce-api/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>salesforce-api</artifactId> Modified: trunk/connectors/sandbox/pom.xml =================================================================== --- trunk/connectors/sandbox/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/connectors/sandbox/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid.connectors</groupId> Modified: trunk/connectors/sandbox/translator-yahoo/pom.xml =================================================================== --- trunk/connectors/sandbox/translator-yahoo/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/connectors/sandbox/translator-yahoo/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-yahoo</artifactId> Modified: trunk/connectors/translator-file/pom.xml =================================================================== --- trunk/connectors/translator-file/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/connectors/translator-file/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-file</artifactId> Modified: trunk/connectors/translator-jdbc/pom.xml =================================================================== --- trunk/connectors/translator-jdbc/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/connectors/translator-jdbc/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-jdbc</artifactId> Modified: trunk/connectors/translator-ldap/pom.xml =================================================================== --- trunk/connectors/translator-ldap/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/connectors/translator-ldap/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ldap</artifactId> Modified: trunk/connectors/translator-loopback/pom.xml =================================================================== --- trunk/connectors/translator-loopback/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/connectors/translator-loopback/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-loopback</artifactId> Modified: trunk/connectors/translator-salesforce/pom.xml =================================================================== --- trunk/connectors/translator-salesforce/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/connectors/translator-salesforce/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-salesforce</artifactId> Modified: trunk/connectors/translator-ws/pom.xml =================================================================== --- trunk/connectors/translator-ws/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/connectors/translator-ws/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ws</artifactId> Modified: trunk/console/pom.xml =================================================================== --- trunk/console/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/console/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/documentation/admin-guide/pom.xml =================================================================== --- trunk/documentation/admin-guide/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/documentation/admin-guide/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>admin-guide</artifactId> Modified: trunk/documentation/caching-guide/pom.xml =================================================================== --- trunk/documentation/caching-guide/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/documentation/caching-guide/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>caching-guide</artifactId> Modified: trunk/documentation/client-developers-guide/pom.xml =================================================================== --- trunk/documentation/client-developers-guide/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/documentation/client-developers-guide/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>client-developers-guide</artifactId> Modified: trunk/documentation/developer-guide/pom.xml =================================================================== --- trunk/documentation/developer-guide/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/documentation/developer-guide/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>developer-guide</artifactId> Modified: trunk/documentation/pom.xml =================================================================== --- trunk/documentation/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/documentation/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/documentation/quick-start-example/pom.xml =================================================================== --- trunk/documentation/quick-start-example/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/documentation/quick-start-example/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>quick-start-example</artifactId> Modified: trunk/documentation/reference/pom.xml =================================================================== --- trunk/documentation/reference/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/documentation/reference/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>reference</artifactId> Modified: trunk/engine/pom.xml =================================================================== --- trunk/engine/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/engine/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-engine</artifactId> Modified: trunk/hibernate-dialect/pom.xml =================================================================== --- trunk/hibernate-dialect/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/hibernate-dialect/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-hibernate-dialect</artifactId> Modified: trunk/jboss-integration/pom.xml =================================================================== --- trunk/jboss-integration/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/jboss-integration/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/metadata/pom.xml =================================================================== --- trunk/metadata/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/metadata/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-metadata</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -5,15 +5,15 @@ <artifactId>teiid-parent</artifactId> <packaging>pom</packaging> <name>Teiid</name> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> <description>Federated SQL and XML query engine.</description> <properties> <ant.version>1.7.0</ant.version> <site.url>http://www.jboss.org/teiid</site.url> </properties> <scm> - <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/trunk</developerConnection> + <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-7.2.0.CR1</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-7.2.0.CR1</developerConnection> </scm> <licenses> <license> Modified: trunk/runtime/pom.xml =================================================================== --- trunk/runtime/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/runtime/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/test-integration/common/pom.xml =================================================================== --- trunk/test-integration/common/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/test-integration/common/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>test-integration-common</artifactId> Modified: trunk/test-integration/db/pom.xml =================================================================== --- trunk/test-integration/db/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/test-integration/db/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -9,7 +9,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/test-integration/pom.xml =================================================================== --- trunk/test-integration/pom.xml 2010-10-29 18:14:44 UTC (rev 2691) +++ trunk/test-integration/pom.xml 2010-10-29 18:43:19 UTC (rev 2692) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.CR1-SNAPSHOT</version> + <version>7.2.0.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-test-integration</artifactId>

14 years, 1 month

1
0
0 / 0

teiid SVN: r2691 - in trunk: client/src/main/java/org/teiid/adminapi/impl and 1 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-10-29 14:14:44 -0400 (Fri, 29 Oct 2010) New Revision: 2691 Modified: trunk/client/src/main/java/org/teiid/adminapi/AdminFactory.java trunk/client/src/main/java/org/teiid/adminapi/impl/ModelMetaData.java trunk/runtime/src/main/java/org/teiid/deployers/SystemVDBDeployer.java trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java Log: forward merge of 7.1.1 Modified: trunk/client/src/main/java/org/teiid/adminapi/AdminFactory.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/AdminFactory.java 2010-10-29 17:30:50 UTC (rev 2690) +++ trunk/client/src/main/java/org/teiid/adminapi/AdminFactory.java 2010-10-29 18:14:44 UTC (rev 2691) @@ -28,7 +28,6 @@ import java.lang.reflect.Proxy; import java.util.Properties; -import org.teiid.client.util.ExceptionUtil; import org.teiid.core.util.PropertiesUtils; import org.teiid.jdbc.JDBCPlugin; import org.teiid.net.CommunicationException; @@ -75,9 +74,6 @@ try { return method.invoke(getTarget(), args); } catch (InvocationTargetException e) { - if (ExceptionUtil.getExceptionOfType(e, CommunicationException.class) != null) { - this.admin = null; - } throw e.getTargetException(); } } Modified: trunk/client/src/main/java/org/teiid/adminapi/impl/ModelMetaData.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/impl/ModelMetaData.java 2010-10-29 17:30:50 UTC (rev 2690) +++ trunk/client/src/main/java/org/teiid/adminapi/impl/ModelMetaData.java 2010-10-29 18:14:44 UTC (rev 2691) @@ -227,13 +227,22 @@ return list; } - public void addError(String severity, String message) { + public ValidationError addError(String severity, String message) { if (this.errors == null) { this.errors = new ArrayList<ValidationError>(); } - this.errors.add(new ValidationError(severity, message)); + ValidationError ve = new ValidationError(severity, message); + this.errors.add(ve); + return ve; } + public boolean removeError(ValidationError remove) { + if (this.errors == null) { + return false; + } + return this.errors.remove(remove); + } + public void clearErrors() { this.errors.clear(); } @@ -290,5 +299,27 @@ public void setPath(String path) { this.path = path; } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ValidationError other = (ValidationError) obj; + if (severity == null) { + if (other.severity != null) + return false; + } else if (!severity.equals(other.severity)) + return false; + if (value == null) { + if (other.value != null) + return false; + } else if (!value.equals(other.value)) + return false; + return true; + } } } Modified: trunk/runtime/src/main/java/org/teiid/deployers/SystemVDBDeployer.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/SystemVDBDeployer.java 2010-10-29 17:30:50 UTC (rev 2690) +++ trunk/runtime/src/main/java/org/teiid/deployers/SystemVDBDeployer.java 2010-10-29 18:14:44 UTC (rev 2691) @@ -22,6 +22,7 @@ package org.teiid.deployers; import java.io.IOException; +import java.net.URI; import java.net.URISyntaxException; import java.net.URL; @@ -42,7 +43,9 @@ if (url == null) { throw new TeiidRuntimeException(RuntimeMetadataPlugin.Util.getString("system_vdb_not_found")); //$NON-NLS-1$ } - this.vdbRepository.setSystemStore(new IndexMetadataFactory(url).getMetadataStore(null)); + // uri conversion is only to remove the spaces in URL, note this only with above kind situation + URI uri = new URI(url.getProtocol(), url.getPath(), null); + this.vdbRepository.setSystemStore(new IndexMetadataFactory(uri.toURL()).getMetadataStore(null)); } catch (URISyntaxException e) { throw new TeiidRuntimeException(e, RuntimePlugin.Util.getString("system_vdb_load_error")); //$NON-NLS-1$ } catch (IOException e) { Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-10-29 17:30:50 UTC (rev 2690) +++ trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-10-29 18:14:44 UTC (rev 2691) @@ -42,6 +42,7 @@ import org.teiid.adminapi.impl.SourceMappingMetadata; import org.teiid.adminapi.impl.VDBMetaData; import org.teiid.adminapi.impl.VDBTranslatorMetaData; +import org.teiid.adminapi.impl.ModelMetaData.ValidationError; import org.teiid.core.util.FileUtils; import org.teiid.dqp.internal.datamgr.ConnectorManager; import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository; @@ -284,19 +285,19 @@ if (!loaded) { String msg = RuntimePlugin.Util.getString("model_metadata_loading", vdb.getName()+"-"+vdb.getVersion(), model.getName(), SimpleDateFormat.getInstance().format(new Date())); //$NON-NLS-1$ //$NON-NLS-2$ - model.addError(ModelMetaData.ValidationError.Severity.ERROR.toString(), msg); + final ValidationError addedError = model.addError(ModelMetaData.ValidationError.Severity.ERROR.toString(), msg); LogManager.logInfo(LogConstants.CTX_RUNTIME, msg); threadPool.run(new Runnable() { @Override public void run() { - loadMetadata(vdb, model, cache, cacheFile, vdbStore, cmr); + loadMetadata(vdb, model, cache, cacheFile, vdbStore, cmr, addedError); } }); } } } - private void loadMetadata(VDBMetaData vdb, ModelMetaData model, boolean cache, File cacheFile, MetadataStoreGroup vdbStore, ConnectorManagerRepository cmr) { + private void loadMetadata(VDBMetaData vdb, ModelMetaData model, boolean cache, File cacheFile, MetadataStoreGroup vdbStore, ConnectorManagerRepository cmr, ValidationError addedError) { Exception exception = null; boolean loaded = false; @@ -311,7 +312,7 @@ this.serializer.saveAttachment(cacheFile, store); } vdbStore.addStore(store); - model.clearErrors(); + model.removeError(addedError); loaded = true; break; } catch (TranslatorException e) {

14 years, 1 month

1
0
0 / 0

teiid SVN: r2690 - in trunk: documentation/reference/src/main/docbook/en-US/content and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-10-29 13:30:50 -0400 (Fri, 29 Oct 2010) New Revision: 2690 Modified: trunk/build/kits/jboss-container/teiid-releasenotes.html trunk/documentation/reference/src/main/docbook/en-US/content/sql_support.xml Log: TEIID-962 refinements to textagg. Modified: trunk/build/kits/jboss-container/teiid-releasenotes.html =================================================================== --- trunk/build/kits/jboss-container/teiid-releasenotes.html 2010-10-29 17:21:21 UTC (rev 2689) +++ trunk/build/kits/jboss-container/teiid-releasenotes.html 2010-10-29 17:30:50 UTC (rev 2690) @@ -42,9 +42,8 @@ <LI><B>Improved clustering support</B> - see the Admin Guide chapter on clustering. <LI><B>IPv6 support</B> - Teiid can started using IPv6 bind address and can be used with JDBC connection. <LI><B>SESSION_ID</B> - A new system function "SESSION_ID" is added to the system function library. - <LI><B>Assignment Syntax Improvements<B> - Teiid's procedure syntax for assignments was clarified so that the assignment value must be a proper expression. INSERT/UPDATE/DELETE update counts must be obtained from VARIABLES.ROWCOUNT, scalar values must be obtained via a scalar subquery. - <LI><B>TEXTAGG</B> - SQL support for Text aggregation. Using this function expression values can be aggregated into a single line of text with delimiter and header, that can be optionally saved to a text file. - The parser will continue to accept the old syntax and convert the query into the proper form. + <LI><B>Assignment Syntax Improvements<B> - Teiid's procedure syntax for assignments was clarified so that the assignment value must be a proper expression. INSERT/UPDATE/DELETE update counts must be obtained from VARIABLES.ROWCOUNT, scalar values must be obtained via a scalar subquery. The parser will continue to accept the old syntax and convert the query into the proper form. + <LI><B>TEXTAGG</B> - SQL support for Text aggregation. Using this function expression values can be aggregated into a CSV BLOB with configurable delimiter, header, and encoding. The result can be optionally saved to a text file. </UL> <h2><a name="Compatibility">Compatibility Issues</a></h2> Modified: trunk/documentation/reference/src/main/docbook/en-US/content/sql_support.xml =================================================================== --- trunk/documentation/reference/src/main/docbook/en-US/content/sql_support.xml 2010-10-29 17:21:21 UTC (rev 2689) +++ trunk/documentation/reference/src/main/docbook/en-US/content/sql_support.xml 2010-10-29 17:30:50 UTC (rev 2690) @@ -238,10 +238,12 @@ <para>STDDEV_SAMP(x) – sample standar deviation (excluding null) logically equals SQRT(VAR_SAMP(x))</para> </listitem> <listitem> - <para>TEXTAGG((expression [as name], ... [DELIMITER char] [QUOTE char] [HEADER] - <link linkend="orderby_clause">[ORDER BY ...]</link>) – Text concatination of all expressions in a group (excluding null). - When DELIMITER is not specified, by default comma(,) is used as delimiter. Use QUOTE, to quote the each expression value with - provided character. If HEADER is specified, the result contains the header row as first line. This aggregation returns a Clob. + <para>TEXTAGG(FOR (expression [as name], ... [DELIMITER char] [QUOTE char] [HEADER] [ENCODING id] + <link linkend="orderby_clause">[ORDER BY ...]</link>) – CSV text aggregation of all expressions in each row of a group. + When DELIMITER is not specified, by default comma(,) is used as delimiter. Double quotes(") is the default quote character. + Use QUOTE to specify a differnt value. All non-null values will be quoted. + If HEADER is specified, the result contains the header row as the first line - the header line will be present even if there are no rows in a group. + This aggregation returns a blob. </para> </listitem> <listitem>

14 years, 1 month

1
0
0 / 0

teiid SVN: r2689 - in trunk: connectors/translator-file/src/main/java/org/teiid/translator/file and 12 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-10-29 13:21:21 -0400 (Fri, 29 Oct 2010) New Revision: 2689 Modified: trunk/api/src/main/java/org/teiid/language/SQLConstants.java trunk/connectors/translator-file/src/main/java/org/teiid/translator/file/FileExecutionFactory.java trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java trunk/engine/src/main/java/org/teiid/query/function/aggregate/TextAgg.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java trunk/engine/src/main/java/org/teiid/query/sql/symbol/DerivedColumn.java trunk/engine/src/main/java/org/teiid/query/sql/symbol/TextLine.java trunk/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj trunk/engine/src/main/resources/org/teiid/query/i18n.properties trunk/engine/src/test/java/org/teiid/query/parser/TestParser.java trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java trunk/engine/src/test/java/org/teiid/query/validator/TestValidator.java trunk/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java Log: TEIID-962 refinements to textagg. added the for keyword so that textagg can be non-reserved. also changed to directly output a blob value and expanded the validation. Modified: trunk/api/src/main/java/org/teiid/language/SQLConstants.java =================================================================== --- trunk/api/src/main/java/org/teiid/language/SQLConstants.java 2010-10-28 21:21:51 UTC (rev 2688) +++ trunk/api/src/main/java/org/teiid/language/SQLConstants.java 2010-10-29 17:21:21 UTC (rev 2689) @@ -98,6 +98,9 @@ public static final String LAST = "LAST"; //$NON-NLS-1$ public static final String KEY = "KEY"; //$NON-NLS-1$ + + public static final String ENCODING = "ENCODING"; //$NON-NLS-1$ + public static final String TEXTAGG = "TEXTAGG"; //$NON-NLS-1$ } public interface Reserved { @@ -319,7 +322,6 @@ public static final String SYSTEM_USER = "SYSTEM_USER"; //$NON-NLS-1$ public static final String TABLE = "TABLE"; //$NON-NLS-1$ public static final String TEMPORARY = "TEMPORARY"; //$NON-NLS-1$ - public static final String TEXTAGG = "TEXTAGG"; //$NON-NLS-1$ public static final String THEN = "THEN"; //$NON-NLS-1$ public static final String TIME = "TIME"; //$NON-NLS-1$ public static final String TIMESTAMP = "TIMESTAMP"; //$NON-NLS-1$ Modified: trunk/connectors/translator-file/src/main/java/org/teiid/translator/file/FileExecutionFactory.java =================================================================== --- trunk/connectors/translator-file/src/main/java/org/teiid/translator/file/FileExecutionFactory.java 2010-10-28 21:21:51 UTC (rev 2688) +++ trunk/connectors/translator-file/src/main/java/org/teiid/translator/file/FileExecutionFactory.java 2010-10-29 17:21:21 UTC (rev 2689) @@ -109,7 +109,7 @@ Object value = null; if (isText) { ClobImpl clob = new ClobImpl(isf, -1); - clob.setEncoding(encoding); + clob.setEncoding(encoding.name()); value = new ClobType(clob); } else { value = new BlobType(new BlobImpl(isf)); @@ -131,15 +131,15 @@ public static final String GETFILES = "getFiles"; //$NON-NLS-1$ public static final String SAVEFILE = "saveFile"; //$NON-NLS-1$ - private String encoding = Charset.defaultCharset().name(); + private Charset encoding = Charset.defaultCharset(); @TranslatorProperty(display="File Encoding",advanced=true) public String getEncoding() { - return encoding; + return encoding.name(); } public void setEncoding(String encoding) { - this.encoding = encoding; + this.encoding = Charset.forName(encoding); } //@Override @@ -161,7 +161,7 @@ if (file instanceof SQLXML) { is = ((SQLXML)file).getBinaryStream(); } else if (file instanceof Clob) { - is = new ReaderInputStream(((Clob)file).getCharacterStream(), Charset.forName(encoding)); + is = new ReaderInputStream(((Clob)file).getCharacterStream(), encoding); } else if (file instanceof Blob) { is = ((Blob)file).getBinaryStream(); } else { Modified: trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java 2010-10-28 21:21:51 UTC (rev 2688) +++ trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java 2010-10-29 17:21:21 UTC (rev 2689) @@ -30,6 +30,7 @@ import java.sql.SQLException; import java.sql.SQLXML; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; @@ -649,7 +650,7 @@ } else if (expression instanceof Criteria) { return evaluate((Criteria)expression, tuple); } else if (expression instanceof TextLine){ - return evaluateTextForest(tuple, (TextLine)expression); + return evaluateTextLine(tuple, (TextLine)expression); } else if (expression instanceof XMLElement){ return evaluateXMLElement(tuple, (XMLElement)expression); } else if (expression instanceof XMLForest){ @@ -813,11 +814,19 @@ return new ClobType(new ClobImpl(isf, -1)); } - private Object evaluateTextForest(List<?> tuple, TextLine function) throws ExpressionEvaluationException, BlockedException, TeiidComponentException, FunctionExecutionException { + private Object evaluateTextLine(List<?> tuple, TextLine function) throws ExpressionEvaluationException, BlockedException, TeiidComponentException, FunctionExecutionException { List<DerivedColumn> args = function.getExpressions(); Evaluator.NameValuePair<Object>[] nameValuePairs = getNameValuePairs(tuple, args, true); - - return TextLine.evaluate(nameValuePairs, function.getDelimiter(), function.getQuote()); + + try { + return TextLine.evaluate(Arrays.asList(nameValuePairs), new TextLine.ValueExtractor<NameValuePair<Object>>() { + public Object getValue(NameValuePair<Object> t) { + return t.value; + } + }, function.getDelimiter(), function.getQuote()); + } catch (TransformationException e) { + throw new ExpressionEvaluationException(e, e.getMessage()); + } } private Object evaluateXMLForest(List<?> tuple, XMLForest function) Modified: trunk/engine/src/main/java/org/teiid/query/function/aggregate/TextAgg.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/function/aggregate/TextAgg.java 2010-10-28 21:21:51 UTC (rev 2688) +++ trunk/engine/src/main/java/org/teiid/query/function/aggregate/TextAgg.java 2010-10-29 17:21:21 UTC (rev 2689) @@ -25,18 +25,21 @@ import java.io.IOException; import java.io.Writer; import java.sql.SQLException; +import java.util.Arrays; import java.util.List; -import javax.sql.rowset.serial.SerialClob; +import javax.sql.rowset.serial.SerialBlob; import org.teiid.common.buffer.FileStore; import org.teiid.common.buffer.FileStore.FileStoreOutputStream; import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidProcessingException; -import org.teiid.core.types.ClobImpl; -import org.teiid.core.types.ClobType; +import org.teiid.core.types.BlobImpl; +import org.teiid.core.types.BlobType; import org.teiid.core.types.Streamable; import org.teiid.query.processor.xml.XMLUtil.FileStoreInputStreamFactory; +import org.teiid.query.sql.symbol.DerivedColumn; +import org.teiid.query.sql.symbol.ElementSymbol; import org.teiid.query.sql.symbol.TextLine; import org.teiid.query.util.CommandContext; @@ -54,13 +57,20 @@ this.textLine = textLine; } - private FileStoreInputStreamFactory buildResult(CommandContext context, TextLine textLine) throws TeiidProcessingException { + private FileStoreInputStreamFactory buildResult() throws TeiidProcessingException { try { FileStore fs = context.getBufferManager().createFileStore("textagg"); //$NON-NLS-1$ - FileStoreInputStreamFactory fisf = new FileStoreInputStreamFactory(fs, Streamable.ENCODING); + FileStoreInputStreamFactory fisf = new FileStoreInputStreamFactory(fs, textLine.getEncoding()==null?Streamable.ENCODING:textLine.getEncoding()); Writer w = fisf.getWriter(); if (textLine.isIncludeHeader()) { - w.write(TextLine.getHeader(textLine.getExpressions(), textLine.getDelimiter(), textLine.getQuote())); + w.write(TextLine.evaluate(textLine.getExpressions(), new TextLine.ValueExtractor<DerivedColumn>() { + public Object getValue(DerivedColumn t) { + if (t.getAlias() == null && t.getExpression() instanceof ElementSymbol) { + return ((ElementSymbol)t.getExpression()).getShortName(); + } + return t.getAlias(); + } + }, textLine.getDelimiter(), textLine.getQuote())); } w.close(); return fisf; @@ -81,7 +91,7 @@ public void addInputDirect(Object input, List<?> tuple) throws TeiidComponentException, TeiidProcessingException { try { if (this.result == null) { - this.result = buildResult(this.context, this.textLine); + this.result = buildResult(); } String in = (String)input; Writer w = result.getWriter(); @@ -97,7 +107,7 @@ */ public Object getResult() throws TeiidProcessingException{ if (this.result == null) { - this.result = buildResult(this.context, this.textLine); + this.result = buildResult(); } try { @@ -105,11 +115,9 @@ fs.close(); if (fs.bytesWritten()) { - return new ClobType(new ClobImpl(result, -1)); + return new BlobType(new BlobImpl(result)); } - // fun convert bytes to string to char array!! - String msg = new String(fs.getBuffer(),0, fs.getCount(), Streamable.ENCODING); - return new ClobType(new SerialClob(msg.toCharArray())); + return new BlobType(new SerialBlob(Arrays.copyOf(fs.getBuffer(), fs.getCount()))); } catch (IOException e) { throw new TeiidProcessingException(e); } catch (SQLException e) { Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java 2010-10-28 21:21:51 UTC (rev 2688) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java 2010-10-29 17:21:21 UTC (rev 2689) @@ -119,7 +119,7 @@ @Override public void visit(TextLine obj) { - markInvalid(obj, "Pushdown of TextForest not allowed"); //$NON-NLS-1$ + markInvalid(obj, "Pushdown of TextLine not allowed"); //$NON-NLS-1$ } @Override Modified: trunk/engine/src/main/java/org/teiid/query/sql/symbol/DerivedColumn.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/sql/symbol/DerivedColumn.java 2010-10-28 21:21:51 UTC (rev 2688) +++ trunk/engine/src/main/java/org/teiid/query/sql/symbol/DerivedColumn.java 2010-10-29 17:21:21 UTC (rev 2689) @@ -24,6 +24,7 @@ import org.teiid.core.util.EquivalenceUtil; import org.teiid.core.util.HashCodeUtil; +import org.teiid.query.function.source.XMLSystemFunctions; import org.teiid.query.sql.LanguageObject; import org.teiid.query.sql.LanguageVisitor; import org.teiid.query.sql.visitor.SQLStringVisitor; Modified: trunk/engine/src/main/java/org/teiid/query/sql/symbol/TextLine.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/sql/symbol/TextLine.java 2010-10-28 21:21:51 UTC (rev 2688) +++ trunk/engine/src/main/java/org/teiid/query/sql/symbol/TextLine.java 2010-10-29 17:21:21 UTC (rev 2689) @@ -21,23 +21,30 @@ */ package org.teiid.query.sql.symbol; -import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import org.teiid.core.types.DataTypeManager; +import org.teiid.core.types.TransformationException; import org.teiid.core.util.EquivalenceUtil; import org.teiid.core.util.HashCodeUtil; -import org.teiid.query.eval.Evaluator; +import org.teiid.core.util.StringUtil; +import org.teiid.query.sql.LanguageObject; import org.teiid.query.sql.LanguageVisitor; import org.teiid.query.sql.visitor.SQLStringVisitor; +/** + * Represents the only allowable expression for the textagg aggregate. + * This is a Teiid specific construct. + */ public class TextLine implements Expression { - public static String nl = System.getProperty("line.separator"); //$NON-NLS-1$ + public static final String nl = System.getProperty("line.separator"); //$NON-NLS-1$ - private Character delimiter = null; - private Character quote = null; + private Character delimiter; + private Character quote; private boolean includeHeader; private List<DerivedColumn> expressions; + private String encoding; public Character getDelimiter() { return delimiter; @@ -46,6 +53,14 @@ public void setDelimiter(Character delimiter) { this.delimiter = delimiter; } + + public String getEncoding() { + return encoding; + } + + public void setEncoding(String encoding) { + this.encoding = encoding; + } public Character getQuote() { return quote; @@ -73,7 +88,7 @@ @Override public Class<?> getType() { - return DataTypeManager.DefaultDataClasses.CLOB; + return DataTypeManager.DefaultDataClasses.BLOB; } @Override @@ -94,24 +109,11 @@ @Override public TextLine clone() { TextLine clone = new TextLine(); - - if (this.expressions != null && !this.expressions.isEmpty()) { - List<DerivedColumn> list = new ArrayList<DerivedColumn>(); - for (DerivedColumn expr:this.expressions) { - list.add(expr.clone()); - } - clone.expressions = list; - } - - if (this.delimiter != null) { - clone.delimiter = new Character(this.delimiter); - } - - if (this.quote != null) { - clone.quote = new Character(this.quote); - } - + clone.expressions = LanguageObject.Util.deepClone(this.expressions, DerivedColumn.class); + clone.delimiter = this.delimiter; + clone.quote = this.quote; clone.includeHeader = this.includeHeader; + clone.encoding = this.encoding; return clone; } @@ -127,7 +129,8 @@ return EquivalenceUtil.areEqual(this.expressions, other.expressions) && EquivalenceUtil.areEqual(this.delimiter, other.delimiter) && EquivalenceUtil.areEqual(this.quote, other.quote) - && this.includeHeader == other.includeHeader; + && this.includeHeader == other.includeHeader + && EquivalenceUtil.areEqual(this.encoding, other.encoding); } @Override @@ -140,57 +143,37 @@ return SQLStringVisitor.getSQLString(this); } - public static String evaluate(final Evaluator.NameValuePair[] values, Character delimeter, Character quote) { - + public static interface ValueExtractor<T> { + Object getValue(T t); + } + + public static <T> String evaluate(final List<T> values, ValueExtractor<T> valueExtractor, Character delimeter, Character quote) throws TransformationException { if (delimeter == null) { delimeter = new Character(','); } - + String quoteStr = null; + if (quote == null) { + quoteStr = "\""; //$NON-NLS-1$ + } else { + quoteStr = String.valueOf(quote); + } + String doubleQuote = quoteStr + quoteStr; StringBuilder sb = new StringBuilder(); - for (int i = 0; i < values.length; i++) { - if (values[i].value != null) { - addQuote(quote, sb); - sb.append(values[i].value); - addQuote(quote, sb); + for (Iterator<T> iterator = values.iterator(); iterator.hasNext();) { + T t = iterator.next(); + String text = DataTypeManager.transformValue(valueExtractor.getValue(t), DataTypeManager.DefaultDataClasses.STRING); + if (text == null) { + continue; } - if (i < values.length-1) { + sb.append(quoteStr); + sb.append(StringUtil.replaceAll(text, quoteStr, doubleQuote)); + sb.append(quoteStr); + if (iterator.hasNext()) { sb.append(delimeter); } } sb.append(nl); - return sb.toString(); } - - public static String getHeader(List<DerivedColumn> args, Character delimeter, Character quote) { - - if (delimeter == null) { - delimeter = new Character(','); - } - - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < args.size(); i++) { - DerivedColumn symbol = args.get(i); - String name = symbol.getAlias(); - Expression ex = symbol.getExpression(); - if (name == null && ex instanceof ElementSymbol) { - name = ((ElementSymbol)ex).getShortName(); - } - addQuote(quote, sb); - sb.append(name); - addQuote(quote, sb); - - if (i < args.size()-1) { - sb.append(delimeter); - } - } - sb.append(nl); - return sb.toString(); - } - private static void addQuote(Character quote, StringBuilder sb) { - if (quote != null) { - sb.append(quote); - } - } } Modified: trunk/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java 2010-10-28 21:21:51 UTC (rev 2688) +++ trunk/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java 2010-10-29 17:21:21 UTC (rev 2689) @@ -1595,8 +1595,8 @@ @Override public void visit( TextLine obj ) { - append("TEXTLINE"); //$NON-NLS-1$ - append("("); //$NON-NLS-1$ + append(FOR); + append(SPACE); registerNodes(obj.getExpressions(), 0); if (obj.getDelimiter() != null) { @@ -1615,8 +1615,12 @@ append(SPACE); append(NonReserved.HEADER); } - - append(")"); //$NON-NLS-1$ + if (obj.getEncoding() != null) { + append(SPACE); + append(NonReserved.ENCODING); + append(SPACE); + outputDisplayName(obj.getEncoding()); + } } @Override Modified: trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java 2010-10-28 21:21:51 UTC (rev 2688) +++ trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java 2010-10-29 17:21:21 UTC (rev 2689) @@ -22,6 +22,7 @@ package org.teiid.query.validator; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; @@ -124,6 +125,7 @@ import org.teiid.query.sql.symbol.XMLNamespaces; import org.teiid.query.sql.symbol.XMLParse; import org.teiid.query.sql.symbol.XMLQuery; +import org.teiid.query.sql.symbol.AggregateSymbol.Type; import org.teiid.query.sql.util.SymbolMap; import org.teiid.query.sql.visitor.AggregateSymbolCollectorVisitor; import org.teiid.query.sql.visitor.CommandCollectorVisitor; @@ -1241,17 +1243,27 @@ } @Override - public void visit(TextLine obj) { - validateDerivedColumnNames(obj, obj.getExpressions()); - for (DerivedColumn dc : obj.getExpressions()) { - if (dc.getAlias() == null) { - continue; - } - validateQName(obj, dc.getAlias()); + public void visit(AggregateSymbol obj) { + if (obj.getAggregateFunction() != Type.TEXTAGG) { + return; + } + TextLine tl = (TextLine)obj.getExpression(); + if (tl.isIncludeHeader()) { + validateDerivedColumnNames(obj, tl.getExpressions()); + } + for (DerivedColumn dc : tl.getExpressions()) { validateXMLContentTypes(dc.getExpression(), obj); } + validateTextOptions(obj, tl.getDelimiter(), tl.getQuote()); + if (tl.getEncoding() != null) { + try { + Charset.forName(tl.getEncoding()); + } catch (IllegalArgumentException e) { + handleValidationError(QueryPlugin.Util.getString("ValidationVisitor.invalid_encoding", tl.getEncoding()), obj); //$NON-NLS-1$ + } + } } - + private String[] validateQName(LanguageObject obj, String name) { try { return Name11Checker.getInstance().getQNameParts(name); @@ -1401,31 +1413,34 @@ handleValidationError(QueryPlugin.Util.getString("ValidationVisitor.text_table_width"), obj); //$NON-NLS-1$ } } else { - delimiter = obj.getDelimiter(); - if (delimiter == null) { - delimiter = ','; - } + if (obj.getHeader() != null && obj.getHeader() < 0) { + handleValidationError(QueryPlugin.Util.getString("ValidationVisitor.text_table_negative"), obj); //$NON-NLS-1$ + } + delimiter = obj.getDelimiter(); + quote = obj.getQuote(); + validateTextOptions(obj, delimiter, quote); } if (obj.getSkip() != null && obj.getSkip() < 0) { handleValidationError(QueryPlugin.Util.getString("ValidationVisitor.text_table_negative"), obj); //$NON-NLS-1$ } - if (!widthSet) { - if (obj.getHeader() != null && obj.getHeader() < 0) { - handleValidationError(QueryPlugin.Util.getString("ValidationVisitor.text_table_negative"), obj); //$NON-NLS-1$ - } - quote = obj.getQuote(); - if (quote == null) { - quote = '"'; - } - if (EquivalenceUtil.areEqual(quote, delimiter)) { - handleValidationError(QueryPlugin.Util.getString("ValidationVisitor.text_table_delimiter"), obj); //$NON-NLS-1$ - } - if (EquivalenceUtil.areEqual(quote, '\n') - || EquivalenceUtil.areEqual(delimiter, '\n')) { - handleValidationError(QueryPlugin.Util.getString("ValidationVisitor.text_table_newline"), obj); //$NON-NLS-1$ - } + } + + private void validateTextOptions(LanguageObject obj, Character delimiter, + Character quote) { + if (quote == null) { + quote = '"'; + } + if (delimiter == null) { + delimiter = ','; } - } + if (EquivalenceUtil.areEqual(quote, delimiter)) { + handleValidationError(QueryPlugin.Util.getString("ValidationVisitor.text_table_delimiter"), obj); //$NON-NLS-1$ + } + if (EquivalenceUtil.areEqual(quote, '\n') + || EquivalenceUtil.areEqual(delimiter, '\n')) { + handleValidationError(QueryPlugin.Util.getString("ValidationVisitor.text_table_newline"), obj); //$NON-NLS-1$ + } + } @Override public void visit(XMLParse obj) { Modified: trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj =================================================================== --- trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj 2010-10-28 21:21:51 UTC (rev 2688) +++ trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj 2010-10-29 17:21:21 UTC (rev 2689) @@ -260,7 +260,6 @@ | <SYSTEM_USER: "system_user"> | <TABLE: "table"> | <TEMPORARY: "temporary"> -| <TEXTAGG: "textagg"> | <THEN: "then"> | <TIMEZONE_HOUR: "timezone_hour"> | <TIMEZONE_MINUTE: "timezone_minute"> @@ -1795,13 +1794,14 @@ DerivedColumn expression = null; Character delimiter = null; Character quote = null; - Integer header = null; + boolean header = false; List<DerivedColumn> expressions = new ArrayList<DerivedColumn>(); OrderBy orderBy = null; + String encoding = null; } { - <TEXTAGG> <LPAREN> - expression = derivedColumn(info) + nonReserved("TEXTAGG") <LPAREN> + <FOR> expression = derivedColumn(info) { expressions.add(expression); } @@ -1821,16 +1821,13 @@ ] [ LOOKAHEAD(<ID>, { "header".equalsIgnoreCase(getToken(1).image) }) <ID> - [ - header = intVal() - ] - { - if (header == null) { - header = 1; - } - } + { header = true; } ] [ + LOOKAHEAD(<ID>, { "encoding".equalsIgnoreCase(getToken(1).image) }) + ( <ID> encoding = id() ) + ] + [ orderBy = orderby(info) ] <RPAREN> @@ -1842,9 +1839,9 @@ TextLine tf = new TextLine(); tf.setDelimiter(delimiter); tf.setQuote(quote); - tf.setIncludeHeader(header!=null); + tf.setIncludeHeader(header); tf.setExpressions(expressions); - + tf.setEncoding(encoding); String name = generateFunctionName(info, "TEXTAGG"); AggregateSymbol agg = new AggregateSymbol(name, "TEXTAGG", false, tf); agg.setOrderBy(orderBy); @@ -3199,6 +3196,8 @@ <RBRACE> ) | + LOOKAHEAD(<ID> <LPAREN> <FOR>) (expression=textAgg(info)) + | // Aggregate function LOOKAHEAD(<ID>, {matchesAny(getToken(1).image, "count", "min", "max", "sum", "avg", "every", "STDDEV_POP", "STDDEV_SAMP", "VAR_SAMP", "VAR_POP") != null}) (expression=aggregateSymbol(info)) | @@ -3208,8 +3207,6 @@ | (expression=xmlAgg(info)) | - (expression=textAgg(info)) - | // Function LOOKAHEAD(2) (expression=function(info)) | Modified: trunk/engine/src/main/resources/org/teiid/query/i18n.properties =================================================================== --- trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2010-10-28 21:21:51 UTC (rev 2688) +++ trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2010-10-29 17:21:21 UTC (rev 2689) @@ -187,13 +187,14 @@ ERR.015.012.0025 = Command must project at least one symbol ERR.015.012.0026 = Expressions of type OBJECT, CLOB, BLOB, or XML cannot be used in SELECT DISTINCT, ORDER BY, GROUP BY, KEYS, or non-all set queries: [{0}] ERR.015.012.0027 = Expressions of type OBJECT, CLOB, BLOB, or XML cannot be used in comparison: {0}. -ValidationVisitor.expression_requires_name = Non-column expressions require a name in XMLATTRIBUTES, XMLFOREST, or QUERYSTRING +ValidationVisitor.expression_requires_name = Non-column expressions require a name in XMLATTRIBUTES, XMLFOREST, QUERYSTRING, or TEXTAGG with HEADER ValidationVisitor.invalid_lookup_key=Expressions of type OBJECT, CLOB, BLOB, or XML cannot be used as LOOKUP key columns: {0}. ValidationVisitor.limit_not_valid_for_xml=The limit clause cannot be used on an XML document query. ValidationVisitor.translated_or=Translated user criteria must not contain OR criteria ValidationVisitor.union_insert = Select into is not allowed under a set operation: {0}. ValidationVisitor.multisource_insert = A multi-source table, {0}, cannot be used in an INSERT with query expression or SELECT INTO statement. ValidationVisitor.virtual_update_subquery = Subqueries are not allowed in the criteria for a virtual UPDATE/DELETE: {0} +ValidationVisitor.invalid_encoding = Invalid encoding: {0}. ERR.015.012.0029 = INSERT, UPDATE, and DELETE not allowed on XML documents ERR.015.012.0030 = Commands used in stored procedure language not allowed on XML documents ERR.015.012.0031 = Queries against XML documents can not have a GROUP By clause @@ -688,13 +689,13 @@ ValidationVisitor.text_table_invalid_width=For a fixed width text table, all columns must have width set. ValidationVisitor.text_table_width=Fixed width text tables should not have DELIMITER, QUOTE, ESCAPE, or HEADER specified. ValidationVisitor.text_table_negative=Text table WIDTH, HEADER, or SKIP values must not be negative. -ValidationVisitor.text_table_delimiter=Text table DELIMITER cannot be the same as the QUOTE or ESCAPE characters. -ValidationVisitor.text_table_newline=Text table DELIMITER, QUOTE, and ESCAPE characters cannot be the new line character. +ValidationVisitor.text_table_delimiter=Text DELIMITER cannot be the same as the QUOTE or ESCAPE characters. +ValidationVisitor.text_table_newline=Text DELIMITER, QUOTE, and ESCAPE characters cannot be the new line character. ValidationVisitor.xml_namespaces=At most only one NO DEFAULT or DEFAULT namespace may be specified. ValidationVisitor.xml_namespaces_reserved=The namespaces xmlns and xml are reserved. ValidationVisitor.xml_namespaces_null_uri=The null uri, or empty string, is not allowed as the uri value. ValidationVisitor.xml_attributes_reserved=The namespace xmlns is reserved. -ValidationVisitor.xml_content_type=The expression "{0}" is of OBJECT or BLOB type, which cannot be used as an XML content value. +ValidationVisitor.xml_content_type=The expression "{0}" is of OBJECT or BLOB type, which cannot be used as an XML or TEXT content value. ValidationVisitor.xml_invalid_qname=The qname "{0}" is invalid. ValidationVisitor.context_item_type=XMLTABLE or XMLQUERY PASSING context item must be an XML value. ValidationVisitor.passing_requires_name=XMLTABLE or XMLQUERY PASSING clause can only contain at most 1 unnamed item. Modified: trunk/engine/src/test/java/org/teiid/query/parser/TestParser.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/parser/TestParser.java 2010-10-28 21:21:51 UTC (rev 2688) +++ trunk/engine/src/test/java/org/teiid/query/parser/TestParser.java 2010-10-29 17:21:21 UTC (rev 2689) @@ -40,6 +40,7 @@ import org.teiid.client.metadata.ParameterInfo; import org.teiid.core.TeiidException; import org.teiid.core.types.DataTypeManager; +import org.teiid.language.SQLConstants.NonReserved; import org.teiid.language.SQLConstants.Reserved; import org.teiid.language.SortSpecification.NullOrdering; import org.teiid.query.sql.lang.BetweenCriteria; @@ -6725,29 +6726,16 @@ tf.setDelimiter(new Character(',')); tf.setIncludeHeader(true); - AggregateSymbol as = new AggregateSymbol("foo", Reserved.TEXTAGG, false, tf); + AggregateSymbol as = new AggregateSymbol("foo", NonReserved.TEXTAGG, false, tf); as.setOrderBy(new OrderBy(Arrays.asList(new ElementSymbol("e2")))); Query query = new Query(); query.setSelect(new Select(Arrays.asList(as))); - String sql = "SELECT TextAgg(e1 as col1, e2 as col2 delimiter ',' header order by e2)"; //$NON-NLS-1$ - helpTest(sql, "SELECT TEXTAGG(TEXTLINE(e1 AS col1, e2 AS col2 DELIMITER ',' HEADER) ORDER BY e2)", query); + String sql = "SELECT TextAgg(FOR e1 as col1, e2 as col2 delimiter ',' header order by e2)"; //$NON-NLS-1$ + helpTest(sql, "SELECT TEXTAGG(FOR e1 AS col1, e2 AS col2 DELIMITER ',' HEADER ORDER BY e2)", query); } -// @Test public void testTextForrest() throws Exception { -// List<DerivedColumn> expressions = new ArrayList<DerivedColumn>(); -// expressions.add(new DerivedColumn(null, new Constant(1))); -// expressions.add(new DerivedColumn("col2", new ElementSymbol("e2"))); -// -// TextForest tf = new TextForest(); -// tf.setExpressions(expressions); -// tf.setIncludeHeader(true); -// -// String sql = "textforest(1, e2 as col2 HEADER)"; //$NON-NLS-1$ -// helpTestExpression(sql, "TEXTFOREST(1, e2 AS col2 HEADER)", tf); -// } - @Test public void testNestedTable() throws Exception { String sql = "SELECT * from TABLE(exec foo()) as x"; //$NON-NLS-1$ Query query = new Query(); Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java 2010-10-28 21:21:51 UTC (rev 2688) +++ trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java 2010-10-29 17:21:21 UTC (rev 2689) @@ -239,7 +239,7 @@ caps.setCapabilitySupport(Capability.QUERY_AGGREGATES_MAX, true); capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$ - ProcessorPlan plan = helpPlan("select convert(textagg(pm1.g1.e1, pm1.g1.e2 header order by e2), string) as x from pm1.g1", metadata, null, capFinder, //$NON-NLS-1$ + ProcessorPlan plan = helpPlan("select convert(to_chars(textagg(for pm1.g1.e1, pm1.g1.e2 header order by e2), 'UTF-8'), string) as x from pm1.g1", metadata, null, capFinder, //$NON-NLS-1$ new String[] { "SELECT g_0.e1, g_0.e2 FROM pm1.g1 AS g_0" }, ComparisonMode.EXACT_COMMAND_STRING); //$NON-NLS-1$ HardcodedDataManager hdm = new HardcodedDataManager(); @@ -248,7 +248,7 @@ String nl = System.getProperty("line.separator"); ArrayList list = new ArrayList(); - list.add("e1,e2"+nl+"b,1"+nl+"z,2"+nl); + list.add("\"e1\",\"e2\""+nl+"\"b\",\"1\""+nl+"\"z\",\"2\""+nl); List[] expected = new List[] { list, }; Modified: trunk/engine/src/test/java/org/teiid/query/validator/TestValidator.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/validator/TestValidator.java 2010-10-28 21:21:51 UTC (rev 2688) +++ trunk/engine/src/test/java/org/teiid/query/validator/TestValidator.java 2010-10-29 17:21:21 UTC (rev 2689) @@ -2083,5 +2083,13 @@ models.add("pm1"); helpValidate("insert into pm1.g1 select * from pm1.g1", new String[] {"pm1.g1"}, new MultiSourceMetadataWrapper(FakeMetadataFactory.example1(), models)); //$NON-NLS-1$ } + + @Test public void testTextAggEncoding() throws Exception { + helpValidate("select textagg(for e1 encoding abc) from pm1.g1", new String[] {"TEXTAGG(FOR e1 ENCODING abc)"}, FakeMetadataFactory.example1Cached()); //$NON-NLS-1$ + } + + @Test public void testTextAggHeader() throws Exception { + helpValidate("select textagg(for e1 || 1 HEADER) from pm1.g1", new String[] {"TEXTAGG(FOR (e1 || 1) HEADER)"}, FakeMetadataFactory.example1Cached()); //$NON-NLS-1$ + } } Modified: trunk/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java =================================================================== --- trunk/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java 2010-10-28 21:21:51 UTC (rev 2688) +++ trunk/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java 2010-10-29 17:21:21 UTC (rev 2689) @@ -42,7 +42,7 @@ assertEquals(1, names.size()); //ensure that datatypes are set - Table t = (Table)tm.getGroupID(names.iterator().next()); + Table t = tm.getGroupID(names.iterator().next()); assertNotNull(t.getColumns().get(0).getDatatype()); }

14 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

teiid-commits October 2010