teiid SVN: r3968 - tags.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2012-04-03 13:03:12 -0400 (Tue, 03 Apr 2012)
New Revision: 3968
Added:
tags/teiid-parent-8.0.0.Beta2/
Log:
[maven-release-plugin] copy for tag teiid-parent-8.0.0.Beta2
12 years, 6 months
- 1
- 0
teiid SVN: r3967 - in trunk: admin and 30 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2012-04-03 13:03:04 -0400 (Tue, 03 Apr 2012)
New Revision: 3967
Modified:
trunk/admin/pom.xml
trunk/adminshell/pom.xml
trunk/api/pom.xml
trunk/build/pom.xml
trunk/client-jdk15/pom.xml
trunk/client/pom.xml
trunk/common-core/pom.xml
trunk/connectors/connector-file/pom.xml
trunk/connectors/connector-ldap/pom.xml
trunk/connectors/connector-salesforce/pom.xml
trunk/connectors/connector-ws/pom.xml
trunk/connectors/pom.xml
trunk/connectors/salesforce-api/pom.xml
trunk/connectors/sandbox/pom.xml
trunk/connectors/sandbox/translator-yahoo/pom.xml
trunk/connectors/translator-file/pom.xml
trunk/connectors/translator-hive/pom.xml
trunk/connectors/translator-jdbc/pom.xml
trunk/connectors/translator-ldap/pom.xml
trunk/connectors/translator-loopback/pom.xml
trunk/connectors/translator-olap/pom.xml
trunk/connectors/translator-salesforce/pom.xml
trunk/connectors/translator-ws/pom.xml
trunk/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-8.0.0.Beta2
Modified: trunk/admin/pom.xml
===================================================================
--- trunk/admin/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/admin/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-admin</artifactId>
Modified: trunk/adminshell/pom.xml
===================================================================
--- trunk/adminshell/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/adminshell/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: trunk/api/pom.xml
===================================================================
--- trunk/api/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/api/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-api</artifactId>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/build/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid</artifactId>
Modified: trunk/client/pom.xml
===================================================================
--- trunk/client/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/client/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
Modified: trunk/client-jdk15/pom.xml
===================================================================
--- trunk/client-jdk15/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/client-jdk15/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client-jdk15</artifactId>
Modified: trunk/common-core/pom.xml
===================================================================
--- trunk/common-core/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/common-core/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</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 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/connectors/connector-file/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-file</artifactId>
Modified: trunk/connectors/connector-ldap/pom.xml
===================================================================
--- trunk/connectors/connector-ldap/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/connectors/connector-ldap/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ldap</artifactId>
Modified: trunk/connectors/connector-salesforce/pom.xml
===================================================================
--- trunk/connectors/connector-salesforce/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/connectors/connector-salesforce/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-salesforce</artifactId>
Modified: trunk/connectors/connector-ws/pom.xml
===================================================================
--- trunk/connectors/connector-ws/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/connectors/connector-ws/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ws</artifactId>
Modified: trunk/connectors/pom.xml
===================================================================
--- trunk/connectors/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/connectors/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</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 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/connectors/salesforce-api/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>salesforce-api</artifactId>
Modified: trunk/connectors/sandbox/pom.xml
===================================================================
--- trunk/connectors/sandbox/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/connectors/sandbox/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</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 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/connectors/sandbox/translator-yahoo/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-yahoo</artifactId>
Modified: trunk/connectors/translator-file/pom.xml
===================================================================
--- trunk/connectors/translator-file/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/connectors/translator-file/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-file</artifactId>
Modified: trunk/connectors/translator-hive/pom.xml
===================================================================
--- trunk/connectors/translator-hive/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/connectors/translator-hive/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-hive</artifactId>
Modified: trunk/connectors/translator-jdbc/pom.xml
===================================================================
--- trunk/connectors/translator-jdbc/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/connectors/translator-jdbc/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-jdbc</artifactId>
Modified: trunk/connectors/translator-ldap/pom.xml
===================================================================
--- trunk/connectors/translator-ldap/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/connectors/translator-ldap/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ldap</artifactId>
Modified: trunk/connectors/translator-loopback/pom.xml
===================================================================
--- trunk/connectors/translator-loopback/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/connectors/translator-loopback/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-loopback</artifactId>
Modified: trunk/connectors/translator-olap/pom.xml
===================================================================
--- trunk/connectors/translator-olap/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/connectors/translator-olap/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-olap</artifactId>
Modified: trunk/connectors/translator-salesforce/pom.xml
===================================================================
--- trunk/connectors/translator-salesforce/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/connectors/translator-salesforce/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-salesforce</artifactId>
Modified: trunk/connectors/translator-ws/pom.xml
===================================================================
--- trunk/connectors/translator-ws/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/connectors/translator-ws/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ws</artifactId>
Modified: trunk/engine/pom.xml
===================================================================
--- trunk/engine/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/engine/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-engine</artifactId>
Modified: trunk/hibernate-dialect/pom.xml
===================================================================
--- trunk/hibernate-dialect/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/hibernate-dialect/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-hibernate-dialect</artifactId>
Modified: trunk/jboss-integration/pom.xml
===================================================================
--- trunk/jboss-integration/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/jboss-integration/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/metadata/pom.xml
===================================================================
--- trunk/metadata/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/metadata/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -10,7 +10,7 @@
<artifactId>teiid-parent</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
<description>Federated SQL and XML query engine.</description>
<properties>
<ant.version>1.7.0</ant.version>
@@ -37,9 +37,9 @@
<version.junit>4.10</version.junit>
</properties>
<scm>
- <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/trunk</developerConnection>
- <url>http://anonsvn.jboss.org/repos/teiid/trunk</url>
+ <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-8.0.0.Beta2</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-8.0.0.Beta2</developerConnection>
+ <url>http://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-8.0.0.Beta2</url>
</scm>
<licenses>
<license>
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/runtime/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</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 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/test-integration/common/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</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 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/test-integration/db/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -9,7 +9,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/test-integration/pom.xml
===================================================================
--- trunk/test-integration/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
+++ trunk/test-integration/pom.xml 2012-04-03 17:03:04 UTC (rev 3967)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2-SNAPSHOT</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
12 years, 6 months
- 1
- 0
teiid SVN: r3966 - in trunk: admin and 30 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2012-04-03 12:49:57 -0400 (Tue, 03 Apr 2012)
New Revision: 3966
Modified:
trunk/admin/pom.xml
trunk/adminshell/pom.xml
trunk/api/pom.xml
trunk/build/pom.xml
trunk/client-jdk15/pom.xml
trunk/client/pom.xml
trunk/common-core/pom.xml
trunk/connectors/connector-file/pom.xml
trunk/connectors/connector-ldap/pom.xml
trunk/connectors/connector-salesforce/pom.xml
trunk/connectors/connector-ws/pom.xml
trunk/connectors/pom.xml
trunk/connectors/salesforce-api/pom.xml
trunk/connectors/sandbox/pom.xml
trunk/connectors/sandbox/translator-yahoo/pom.xml
trunk/connectors/translator-file/pom.xml
trunk/connectors/translator-hive/pom.xml
trunk/connectors/translator-jdbc/pom.xml
trunk/connectors/translator-ldap/pom.xml
trunk/connectors/translator-loopback/pom.xml
trunk/connectors/translator-olap/pom.xml
trunk/connectors/translator-salesforce/pom.xml
trunk/connectors/translator-ws/pom.xml
trunk/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:
misc: fixing version to have SNAPSHOT
Modified: trunk/admin/pom.xml
===================================================================
--- trunk/admin/pom.xml 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/admin/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-admin</artifactId>
Modified: trunk/adminshell/pom.xml
===================================================================
--- trunk/adminshell/pom.xml 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/adminshell/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: trunk/api/pom.xml
===================================================================
--- trunk/api/pom.xml 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/api/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-api</artifactId>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/build/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid</artifactId>
Modified: trunk/client/pom.xml
===================================================================
--- trunk/client/pom.xml 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/client/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
Modified: trunk/client-jdk15/pom.xml
===================================================================
--- trunk/client-jdk15/pom.xml 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/client-jdk15/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client-jdk15</artifactId>
Modified: trunk/common-core/pom.xml
===================================================================
--- trunk/common-core/pom.xml 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/common-core/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-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 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/connectors/connector-file/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-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 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/connectors/connector-ldap/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-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 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/connectors/connector-salesforce/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-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 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/connectors/connector-ws/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ws</artifactId>
Modified: trunk/connectors/pom.xml
===================================================================
--- trunk/connectors/pom.xml 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/connectors/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-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 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/connectors/salesforce-api/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>salesforce-api</artifactId>
Modified: trunk/connectors/sandbox/pom.xml
===================================================================
--- trunk/connectors/sandbox/pom.xml 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/connectors/sandbox/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-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 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/connectors/sandbox/translator-yahoo/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-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 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/connectors/translator-file/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-file</artifactId>
Modified: trunk/connectors/translator-hive/pom.xml
===================================================================
--- trunk/connectors/translator-hive/pom.xml 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/connectors/translator-hive/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-hive</artifactId>
Modified: trunk/connectors/translator-jdbc/pom.xml
===================================================================
--- trunk/connectors/translator-jdbc/pom.xml 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/connectors/translator-jdbc/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-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 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/connectors/translator-ldap/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-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 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/connectors/translator-loopback/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-loopback</artifactId>
Modified: trunk/connectors/translator-olap/pom.xml
===================================================================
--- trunk/connectors/translator-olap/pom.xml 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/connectors/translator-olap/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-olap</artifactId>
Modified: trunk/connectors/translator-salesforce/pom.xml
===================================================================
--- trunk/connectors/translator-salesforce/pom.xml 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/connectors/translator-salesforce/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-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 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/connectors/translator-ws/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ws</artifactId>
Modified: trunk/engine/pom.xml
===================================================================
--- trunk/engine/pom.xml 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/engine/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-engine</artifactId>
Modified: trunk/hibernate-dialect/pom.xml
===================================================================
--- trunk/hibernate-dialect/pom.xml 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/hibernate-dialect/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-hibernate-dialect</artifactId>
Modified: trunk/jboss-integration/pom.xml
===================================================================
--- trunk/jboss-integration/pom.xml 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/jboss-integration/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/metadata/pom.xml
===================================================================
--- trunk/metadata/pom.xml 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/metadata/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -10,7 +10,7 @@
<artifactId>teiid-parent</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-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 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/runtime/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-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 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/test-integration/common/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-integration-common</artifactId>
Modified: trunk/test-integration/db/pom.xml
===================================================================
--- trunk/test-integration/db/pom.xml 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/test-integration/db/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -9,7 +9,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/test-integration/pom.xml
===================================================================
--- trunk/test-integration/pom.xml 2012-04-03 09:04:40 UTC (rev 3965)
+++ trunk/test-integration/pom.xml 2012-04-03 16:49:57 UTC (rev 3966)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta2</version>
+ <version>8.0.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
12 years, 6 months
- 1
- 0
teiid SVN: r3965 - in branches/7.7.x/engine/src/main/java/org/teiid/query: xquery/saxon and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-04-03 05:04:40 -0400 (Tue, 03 Apr 2012)
New Revision: 3965
Modified:
branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational/RelationalNode.java
branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java
branches/7.7.x/engine/src/main/java/org/teiid/query/xquery/saxon/XQueryEvaluator.java
Log:
TEIID-1987 fix to expose underlying exception
Modified: branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational/RelationalNode.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational/RelationalNode.java 2012-04-03 03:44:41 UTC (rev 3964)
+++ branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational/RelationalNode.java 2012-04-03 09:04:40 UTC (rev 3965)
@@ -37,6 +37,7 @@
import org.teiid.common.buffer.TupleBuffer;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
+import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.util.Assertion;
import org.teiid.logging.LogManager;
import org.teiid.logging.MessageLevel;
@@ -623,4 +624,18 @@
return null;
}
+ public static void unwrapException(TeiidRuntimeException e)
+ throws TeiidComponentException, TeiidProcessingException {
+ if (e == null) {
+ return;
+ }
+ if (e.getCause() instanceof TeiidComponentException) {
+ throw (TeiidComponentException)e.getCause();
+ }
+ if (e.getCause() instanceof TeiidProcessingException) {
+ throw (TeiidProcessingException)e.getCause();
+ }
+ throw e;
+ }
+
}
\ No newline at end of file
Modified: branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java 2012-04-03 03:44:41 UTC (rev 3964)
+++ branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java 2012-04-03 09:04:40 UTC (rev 3965)
@@ -244,20 +244,6 @@
}
}
- private void unwrapException(TeiidRuntimeException e)
- throws TeiidComponentException, TeiidProcessingException {
- if (e == null) {
- return;
- }
- if (e.getCause() instanceof TeiidComponentException) {
- throw (TeiidComponentException)e.getCause();
- }
- if (e.getCause() instanceof TeiidProcessingException) {
- throw (TeiidProcessingException)e.getCause();
- }
- throw e;
- }
-
private List<?> processRow() throws ExpressionEvaluationException, BlockedException,
TeiidComponentException, TeiidProcessingException {
List<Object> tuple = new ArrayList<Object>(projectedColumns.size());
Modified: branches/7.7.x/engine/src/main/java/org/teiid/query/xquery/saxon/XQueryEvaluator.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/query/xquery/saxon/XQueryEvaluator.java 2012-04-03 03:44:41 UTC (rev 3964)
+++ branches/7.7.x/engine/src/main/java/org/teiid/query/xquery/saxon/XQueryEvaluator.java 2012-04-03 09:04:40 UTC (rev 3965)
@@ -46,12 +46,15 @@
import nux.xom.xquery.StreamingPathFilter;
import nux.xom.xquery.StreamingTransform;
+import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
+import org.teiid.core.TeiidRuntimeException;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
import org.teiid.logging.MessageLevel;
import org.teiid.query.QueryPlugin;
import org.teiid.query.function.source.XMLSystemFunctions;
+import org.teiid.query.processor.relational.RelationalNode;
import org.teiid.query.util.CommandContext;
import org.teiid.query.xquery.saxon.SaxonXQueryExpression.RowProcessor;
@@ -69,7 +72,7 @@
}
};
- public static SaxonXQueryExpression.Result evaluateXQuery(final SaxonXQueryExpression xquery, Object context, Map<String, Object> parameterValues, final RowProcessor processor, CommandContext commandContext) throws TeiidProcessingException {
+ public static SaxonXQueryExpression.Result evaluateXQuery(final SaxonXQueryExpression xquery, Object context, Map<String, Object> parameterValues, final RowProcessor processor, CommandContext commandContext) throws TeiidProcessingException, TeiidComponentException {
DynamicQueryContext dynamicContext = new DynamicQueryContext(xquery.config);
SaxonXQueryExpression.Result result = new SaxonXQueryExpression.Result();
@@ -121,6 +124,9 @@
builder.build(FAKE_IS);
return result;
} catch (ParsingException e) {
+ if (e.getCause() instanceof TeiidRuntimeException) {
+ RelationalNode.unwrapException((TeiidRuntimeException)e.getCause());
+ }
throw new TeiidProcessingException(e, QueryPlugin.Util.getString("SaxonXQueryExpression.bad_context")); //$NON-NLS-1$
} catch (IOException e) {
throw new TeiidProcessingException(e, QueryPlugin.Util.getString("SaxonXQueryExpression.bad_context")); //$NON-NLS-1$
12 years, 6 months
- 1
- 0
teiid SVN: r3962 - in trunk: test-integration/common/src/test/java/org/teiid/arquillian and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2012-04-02 15:12:16 -0400 (Mon, 02 Apr 2012)
New Revision: 3962
Modified:
trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java
trunk/test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestDeployment.java
trunk/test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestDynamicViewDefinition.java
Log:
TEIID-1981: fixing the admin api methods
Modified: trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java 2012-04-02 16:16:52 UTC (rev 3961)
+++ trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java 2012-04-02 19:12:16 UTC (rev 3962)
@@ -160,7 +160,8 @@
}
private class AdminImpl implements Admin{
- private static final String JAVA_CONTEXT = "java:/";
+ private static final String CLASS_NAME = "class-name";
+ private static final String JAVA_CONTEXT = "java:/";
private ModelControllerClient connection;
private boolean domainMode = false;
@@ -215,6 +216,10 @@
builder.addNode("connection-definitions", deploymentName); //$NON-NLS-1$ //$NON-NLS-2$
builder.setOperationName("add");
builder.addProperty("jndi-name", addJavaContext(deploymentName));
+ builder.addProperty("enabled", "true");
+ if (properties.getProperty(CLASS_NAME) != null) {
+ builder.addProperty(CLASS_NAME, properties.getProperty(CLASS_NAME));
+ }
request = builder.buildRequest();
} catch (OperationFormatException e) {
throw new IllegalStateException("Failed to build operation", e); //$NON-NLS-1$
@@ -226,6 +231,9 @@
Enumeration keys = properties.propertyNames();
while (keys.hasMoreElements()) {
String key = (String)keys.nextElement();
+ if (key.equals(CLASS_NAME)) {
+ continue;
+ }
addConfigProperty(deploymentName, key, properties.getProperty(key));
}
@@ -323,7 +331,7 @@
driverList.addAll(drivers);
}
} catch (Exception e) {
- throw new AdminProcessingException(e);
+ throw new AdminProcessingException(e.getMessage(), e);
}
}
else {
@@ -434,7 +442,7 @@
throw new AdminProcessingException(AdminPlugin.Event.TEIID70006, Util.getFailureDescription(outcome));
}
} catch (IOException e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70007, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70007, e, e.getMessage());
}
}
@@ -508,7 +516,7 @@
}
return true;
} catch (IOException e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70009, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70009, e, e.getMessage());
}
}
@@ -518,7 +526,7 @@
try {
request = buildUndeployRequest(deployedName);
} catch (OperationFormatException e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70010, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70010, e, e.getMessage());
}
execute(request);
}
@@ -609,9 +617,9 @@
}
return composite;
} catch (OperationFormatException e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70011, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70011, e, e.getMessage());
} catch (IOException e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70012, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70012, e, e.getMessage());
}
}
@@ -624,7 +632,7 @@
return getDomainAwareList(outcome, VDBMetadataMapper.CacheStatisticsMetadataMapper.INSTANCE);
}
} catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70013, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70013, e, e.getMessage());
}
return null;
}
@@ -642,7 +650,7 @@
return Util.getList(outcome);
}
} catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70014, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70014, e, e.getMessage());
}
return Collections.emptyList();
}
@@ -655,7 +663,7 @@
return Util.getList(outcome);
}
} catch (IOException e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70015, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70015, e, e.getMessage());
}
return Collections.emptyList();
@@ -762,7 +770,7 @@
return getDomainAwareList(outcome, VDBMetadataMapper.WorkerPoolStatisticsMetadataMapper.INSTANCE);
}
} catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70020, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70020, e, e.getMessage());
}
}
return null;
@@ -781,7 +789,7 @@
throw new AdminProcessingException(AdminPlugin.Event.TEIID70021, Util.getFailureDescription(outcome));
}
} catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70022, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70022, e, e.getMessage());
}
}
@@ -795,7 +803,7 @@
return getDomainAwareList(outcome, RequestMetadataMapper.INSTANCE);
}
} catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70023, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70023, e, e.getMessage());
}
}
return Collections.emptyList();
@@ -811,7 +819,7 @@
return getDomainAwareList(outcome, RequestMetadataMapper.INSTANCE);
}
} catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70024, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70024, e, e.getMessage());
}
}
return Collections.emptyList();
@@ -827,7 +835,7 @@
return getDomainAwareList(outcome, SessionMetadataMapper.INSTANCE);
}
} catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70025, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70025, e, e.getMessage());
}
}
return Collections.emptyList();
@@ -863,7 +871,7 @@
}
result = outcome.get("result");
} catch (IOException e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70027, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70027, e, e.getMessage());
}
}
else {
@@ -994,7 +1002,7 @@
return getDomainAwareList(outcome, TransactionMetadataMapper.INSTANCE);
}
} catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70028, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70028, e, e.getMessage());
}
}
return Collections.emptyList();
@@ -1012,7 +1020,7 @@
throw new AdminProcessingException(AdminPlugin.Event.TEIID70029, Util.getFailureDescription(outcome));
}
} catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70030, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70030, e, e.getMessage());
}
}
@@ -1028,7 +1036,7 @@
throw new AdminProcessingException(AdminPlugin.Event.TEIID70031, Util.getFailureDescription(outcome));
}
} catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70032, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70032, e, e.getMessage());
}
}
@@ -1042,15 +1050,21 @@
ModelNode outcome = this.connection.execute(request);
if (Util.isSuccess(outcome)) {
if (outcome.hasDefined("result")) {
- List<VDBTranslatorMetaData> list = getDomainAwareList(outcome, VDBMetadataMapper.VDBTranslatorMetaDataMapper.INSTANCE);
- if (list != null && !list.isEmpty()) {
- return list.get(0);
+ if (this.domainMode) {
+ List<VDBTranslatorMetaData> list = getDomainAwareList(outcome, VDBMetadataMapper.VDBTranslatorMetaDataMapper.INSTANCE);
+ if (list != null && !list.isEmpty()) {
+ return list.get(0);
+ }
}
+ else {
+ ModelNode result = outcome.get("result");
+ return VDBMetadataMapper.VDBTranslatorMetaDataMapper.INSTANCE.unwrap(result);
+ }
}
}
} catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70033, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70033, e, e.getMessage());
}
return null;
}
@@ -1064,7 +1078,7 @@
return getDomainAwareList(outcome, VDBMetadataMapper.VDBTranslatorMetaDataMapper.INSTANCE);
}
} catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70034, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70034, e, e.getMessage());
}
return Collections.emptyList();
@@ -1157,13 +1171,21 @@
try {
ModelNode outcome = this.connection.execute(request);
if (Util.isSuccess(outcome)) {
- List<VDBMetaData> list = getDomainAwareList(outcome, VDBMetadataMapper.INSTANCE);
- if (list != null && !list.isEmpty()) {
- return list.get(0);
+ if (this.domainMode) {
+ List<VDBMetaData> list = getDomainAwareList(outcome, VDBMetadataMapper.INSTANCE);
+ if (list != null && !list.isEmpty()) {
+ return list.get(0);
+ }
}
+ else {
+ if (outcome.hasDefined("result")) {
+ ModelNode result = outcome.get("result");
+ return VDBMetadataMapper.INSTANCE.unwrap(result);
+ }
+ }
}
} catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70035, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70035, e, e.getMessage());
}
return null;
}
@@ -1177,7 +1199,7 @@
return getDomainAwareList(outcome, VDBMetadataMapper.INSTANCE);
}
} catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70036, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70036, e, e.getMessage());
}
return Collections.emptyList();
@@ -1198,7 +1220,7 @@
throw new AdminProcessingException(AdminPlugin.Event.TEIID70037, Util.getFailureDescription(outcome));
}
} catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70038, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70038, e, e.getMessage());
}
}
@@ -1215,7 +1237,7 @@
throw new AdminProcessingException(AdminPlugin.Event.TEIID70039, Util.getFailureDescription(outcome));
}
} catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70040, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70040, e, e.getMessage());
}
}
@@ -1232,7 +1254,7 @@
throw new AdminProcessingException(AdminPlugin.Event.TEIID70041, Util.getFailureDescription(outcome));
}
} catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70042, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70042, e, e.getMessage());
}
}
@@ -1255,7 +1277,7 @@
throw new AdminProcessingException(AdminPlugin.Event.TEIID70043, Util.getFailureDescription(outcome));
}
} catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70044, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70044, e, e.getMessage());
}
}
@@ -1271,7 +1293,7 @@
throw new AdminProcessingException(AdminPlugin.Event.TEIID70045, Util.getFailureDescription(outcome));
}
} catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70046, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70046, e, e.getMessage());
}
}
@@ -1291,7 +1313,7 @@
throw new AdminProcessingException(AdminPlugin.Event.TEIID70047, Util.getFailureDescription(outcome));
}
} catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70048, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70048, e, e.getMessage());
}
}
@@ -1304,7 +1326,7 @@
throw new AdminProcessingException(AdminPlugin.Event.TEIID70049, Util.getFailureDescription(outcome));
}
} catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70050, e);
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70050, e, e.getMessage());
}
}
}
Modified: trunk/test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestDeployment.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestDeployment.java 2012-04-02 16:16:52 UTC (rev 3961)
+++ trunk/test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestDeployment.java 2012-04-02 19:12:16 UTC (rev 3962)
@@ -320,10 +320,11 @@
@Test
public void getDatasourceTemplateNames() throws Exception {
- String[] array = {"teiid-connector-file.rar", "teiid-local", "teiid-connector-salesforce.rar", "teiid-connector-ldap.rar", "teiid-connector-ws.rar", "h2"};
+ String[] array = {"teiid-connector-file.rar", "teiid-local", "teiid", "teiid-connector-salesforce.rar", "teiid-connector-ldap.rar", "teiid-connector-ws.rar", "h2"};
try {
deployVdb();
Set<String> templates = admin.getDataSourceTemplateNames();
+ System.out.println(templates);
assertArrayEquals(array, templates.toArray(new String[templates.size()]));
} finally {
undeploy();
Modified: trunk/test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestDynamicViewDefinition.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestDynamicViewDefinition.java 2012-04-02 16:16:52 UTC (rev 3961)
+++ trunk/test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestDynamicViewDefinition.java 2012-04-02 19:12:16 UTC (rev 3962)
@@ -10,11 +10,9 @@
import org.junit.runner.RunWith;
import org.teiid.adminapi.Admin;
import org.teiid.adminapi.AdminFactory;
-import org.teiid.adminapi.VDB;
import org.teiid.core.util.UnitTestUtil;
import org.teiid.jdbc.AbstractMMQueryTestCase;
import org.teiid.jdbc.TeiidDriver;
-import org.teiid.jdbc.TestMMDatabaseMetaData;
@RunWith(Arquillian.class)
@SuppressWarnings("nls")
@@ -40,20 +38,11 @@
Properties props = new Properties();
props.setProperty("ParentDirectory", "../docs/teiid/examples/dynamicvdb-portfolio/data");
props.setProperty("AllowParentPaths", "true");
+ props.setProperty("class-name", "org.teiid.resource.adapter.file.FileManagedConnectionFactory");
admin.createDataSource("marketdata-file", "teiid-connector-file.rar", props);
- int count = 0;
- while (count < 10) {
- VDB vdb = admin.getVDB("dynamic", 1);
- if (vdb == null || vdb.getStatus() != VDB.Status.ACTIVE) {
- Thread.sleep(500);
- count++;
- }
- else {
- break;
- }
- }
+ Thread.sleep(3000);
this.internalConnection = TeiidDriver.getInstance().connect("jdbc:teiid:dynamic@mm://localhost:31000;user=user;password=user", null);
@@ -61,6 +50,8 @@
//TestMMDatabaseMetaData.compareResultSet("TestDymamicImportedMetaData/columns", this.internalResultSet);
admin.undeploy("dynamicview-vdb.xml");
+
+ admin.deleteDataSource("marketdata-file");
}
}
12 years, 6 months
- 1
- 0
teiid SVN: r3961 - trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2012-04-02 12:16:52 -0400 (Mon, 02 Apr 2012)
New Revision: 3961
Modified:
trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/SalesForceExecutionFactory.java
Log:
TEIID-1984: Added "GetUpdated" and "GetDeleted" procedures based upon the metadata defined through Designer based SF source model to Dynamic VDB metadata.
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/SalesForceExecutionFactory.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/SalesForceExecutionFactory.java 2012-04-02 03:41:32 UTC (rev 3960)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/SalesForceExecutionFactory.java 2012-04-02 16:16:52 UTC (rev 3961)
@@ -35,7 +35,10 @@
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
import org.teiid.metadata.MetadataFactory;
+import org.teiid.metadata.Procedure;
+import org.teiid.metadata.ProcedureParameter;
import org.teiid.metadata.RuntimeMetadata;
+import org.teiid.metadata.ProcedureParameter.Type;
import org.teiid.translator.ExecutionContext;
import org.teiid.translator.ExecutionFactory;
import org.teiid.translator.ProcedureExecution;
@@ -43,6 +46,7 @@
import org.teiid.translator.Translator;
import org.teiid.translator.TranslatorException;
import org.teiid.translator.TranslatorProperty;
+import org.teiid.translator.TypeFacility;
import org.teiid.translator.UpdateExecution;
import org.teiid.translator.salesforce.execution.DeleteExecutionImpl;
import org.teiid.translator.salesforce.execution.InsertExecutionImpl;
@@ -113,6 +117,34 @@
public void getMetadata(MetadataFactory metadataFactory, SalesforceConnection connection) throws TranslatorException {
MetadataProcessor processor = new MetadataProcessor(connection,metadataFactory, this);
processor.processMetadata();
+
+ Procedure p1 = metadataFactory.addProcedure("GetUpdated"); //$NON-NLS-1$
+ p1.setAnnotation("Gets the updated objects"); //$NON-NLS-1$
+ ProcedureParameter param = metadataFactory.addProcedureParameter("ObjectName", TypeFacility.RUNTIME_NAMES.STRING, Type.In, p1); //$NON-NLS-1$
+ param.setAnnotation("ObjectName"); //$NON-NLS-1$
+ param = metadataFactory.addProcedureParameter("StartDate", TypeFacility.RUNTIME_NAMES.TIMESTAMP, Type.In, p1); //$NON-NLS-1$
+ param.setAnnotation("Start Time"); //$NON-NLS-1$
+ param = metadataFactory.addProcedureParameter("EndDate", TypeFacility.RUNTIME_NAMES.TIMESTAMP, Type.In, p1); //$NON-NLS-1$
+ param.setAnnotation("End Time"); //$NON-NLS-1$
+ param = metadataFactory.addProcedureParameter("LatestDateCovered", TypeFacility.RUNTIME_NAMES.TIMESTAMP, Type.In, p1); //$NON-NLS-1$
+ param.setAnnotation("Latest Date Covered"); //$NON-NLS-1$
+ metadataFactory.addProcedureResultSetColumn("ID", TypeFacility.RUNTIME_NAMES.STRING, p1); //$NON-NLS-1$
+
+
+ Procedure p2 = metadataFactory.addProcedure("GetDeleted"); //$NON-NLS-1$
+ p2.setAnnotation("Gets the deleted objects"); //$NON-NLS-1$
+ param = metadataFactory.addProcedureParameter("ObjectName", TypeFacility.RUNTIME_NAMES.STRING, Type.In, p2); //$NON-NLS-1$
+ param.setAnnotation("ObjectName"); //$NON-NLS-1$
+ param = metadataFactory.addProcedureParameter("StartDate", TypeFacility.RUNTIME_NAMES.TIMESTAMP, Type.In, p2); //$NON-NLS-1$
+ param.setAnnotation("Start Time"); //$NON-NLS-1$
+ param = metadataFactory.addProcedureParameter("EndDate", TypeFacility.RUNTIME_NAMES.TIMESTAMP, Type.In, p2); //$NON-NLS-1$
+ param.setAnnotation("End Time"); //$NON-NLS-1$
+ param = metadataFactory.addProcedureParameter("EarliestDateAvailable", TypeFacility.RUNTIME_NAMES.TIMESTAMP, Type.In, p2); //$NON-NLS-1$
+ param.setAnnotation("Earliest Date Available"); //$NON-NLS-1$
+ param = metadataFactory.addProcedureParameter("LatestDateCovered", TypeFacility.RUNTIME_NAMES.TIMESTAMP, Type.In, p2); //$NON-NLS-1$
+ param.setAnnotation("Latest Date Covered"); //$NON-NLS-1$
+ metadataFactory.addProcedureResultSetColumn("ID", TypeFacility.RUNTIME_NAMES.STRING, p2); //$NON-NLS-1$
+ metadataFactory.addProcedureResultSetColumn("DeletedDate", TypeFacility.RUNTIME_NAMES.TIMESTAMP, p2); //$NON-NLS-1$
}
@Override
12 years, 6 months
- 1
- 0