teiid SVN: r2564 - in branches/7.1.x: adminshell and 35 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2010-09-13 21:43:36 -0400 (Mon, 13 Sep 2010)
New Revision: 2564
Modified:
branches/7.1.x/adminshell/pom.xml
branches/7.1.x/api/pom.xml
branches/7.1.x/build/pom.xml
branches/7.1.x/cache-jbosscache/pom.xml
branches/7.1.x/client/pom.xml
branches/7.1.x/common-core/pom.xml
branches/7.1.x/connectors/connector-file/pom.xml
branches/7.1.x/connectors/connector-ldap/pom.xml
branches/7.1.x/connectors/connector-salesforce/pom.xml
branches/7.1.x/connectors/connector-ws/pom.xml
branches/7.1.x/connectors/pom.xml
branches/7.1.x/connectors/salesforce-api/pom.xml
branches/7.1.x/connectors/sandbox/pom.xml
branches/7.1.x/connectors/sandbox/translator-yahoo/pom.xml
branches/7.1.x/connectors/translator-file/pom.xml
branches/7.1.x/connectors/translator-jdbc/pom.xml
branches/7.1.x/connectors/translator-ldap/pom.xml
branches/7.1.x/connectors/translator-loopback/pom.xml
branches/7.1.x/connectors/translator-salesforce/pom.xml
branches/7.1.x/connectors/translator-ws/pom.xml
branches/7.1.x/console/pom.xml
branches/7.1.x/documentation/admin-guide/pom.xml
branches/7.1.x/documentation/caching-guide/pom.xml
branches/7.1.x/documentation/client-developers-guide/pom.xml
branches/7.1.x/documentation/developer-guide/pom.xml
branches/7.1.x/documentation/pom.xml
branches/7.1.x/documentation/quick-start-example/pom.xml
branches/7.1.x/documentation/reference/pom.xml
branches/7.1.x/engine/pom.xml
branches/7.1.x/hibernate-dialect/pom.xml
branches/7.1.x/jboss-integration/pom.xml
branches/7.1.x/metadata/pom.xml
branches/7.1.x/pom.xml
branches/7.1.x/runtime/pom.xml
branches/7.1.x/test-integration/common/pom.xml
branches/7.1.x/test-integration/db/pom.xml
branches/7.1.x/test-integration/pom.xml
Log:
removing alpha designation
Modified: branches/7.1.x/adminshell/pom.xml
===================================================================
--- branches/7.1.x/adminshell/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/adminshell/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: branches/7.1.x/api/pom.xml
===================================================================
--- branches/7.1.x/api/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/api/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-api</artifactId>
Modified: branches/7.1.x/build/pom.xml
===================================================================
--- branches/7.1.x/build/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/build/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1/version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>build</artifactId>
Modified: branches/7.1.x/cache-jbosscache/pom.xml
===================================================================
--- branches/7.1.x/cache-jbosscache/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/cache-jbosscache/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-cache-jbosscache</artifactId>
Modified: branches/7.1.x/client/pom.xml
===================================================================
--- branches/7.1.x/client/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/client/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
Modified: branches/7.1.x/common-core/pom.xml
===================================================================
--- branches/7.1.x/common-core/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/common-core/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-common-core</artifactId>
Modified: branches/7.1.x/connectors/connector-file/pom.xml
===================================================================
--- branches/7.1.x/connectors/connector-file/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/connectors/connector-file/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-file</artifactId>
Modified: branches/7.1.x/connectors/connector-ldap/pom.xml
===================================================================
--- branches/7.1.x/connectors/connector-ldap/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/connectors/connector-ldap/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ldap</artifactId>
Modified: branches/7.1.x/connectors/connector-salesforce/pom.xml
===================================================================
--- branches/7.1.x/connectors/connector-salesforce/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/connectors/connector-salesforce/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-salesforce</artifactId>
Modified: branches/7.1.x/connectors/connector-ws/pom.xml
===================================================================
--- branches/7.1.x/connectors/connector-ws/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/connectors/connector-ws/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ws</artifactId>
Modified: branches/7.1.x/connectors/pom.xml
===================================================================
--- branches/7.1.x/connectors/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/connectors/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.1.x/connectors/salesforce-api/pom.xml
===================================================================
--- branches/7.1.x/connectors/salesforce-api/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/connectors/salesforce-api/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>salesforce-api</artifactId>
Modified: branches/7.1.x/connectors/sandbox/pom.xml
===================================================================
--- branches/7.1.x/connectors/sandbox/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/connectors/sandbox/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
Modified: branches/7.1.x/connectors/sandbox/translator-yahoo/pom.xml
===================================================================
--- branches/7.1.x/connectors/sandbox/translator-yahoo/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/connectors/sandbox/translator-yahoo/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-yahoo</artifactId>
Modified: branches/7.1.x/connectors/translator-file/pom.xml
===================================================================
--- branches/7.1.x/connectors/translator-file/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/connectors/translator-file/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-file</artifactId>
Modified: branches/7.1.x/connectors/translator-jdbc/pom.xml
===================================================================
--- branches/7.1.x/connectors/translator-jdbc/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/connectors/translator-jdbc/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-jdbc</artifactId>
Modified: branches/7.1.x/connectors/translator-ldap/pom.xml
===================================================================
--- branches/7.1.x/connectors/translator-ldap/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/connectors/translator-ldap/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ldap</artifactId>
Modified: branches/7.1.x/connectors/translator-loopback/pom.xml
===================================================================
--- branches/7.1.x/connectors/translator-loopback/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/connectors/translator-loopback/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-loopback</artifactId>
Modified: branches/7.1.x/connectors/translator-salesforce/pom.xml
===================================================================
--- branches/7.1.x/connectors/translator-salesforce/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/connectors/translator-salesforce/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-salesforce</artifactId>
Modified: branches/7.1.x/connectors/translator-ws/pom.xml
===================================================================
--- branches/7.1.x/connectors/translator-ws/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/connectors/translator-ws/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ws</artifactId>
Modified: branches/7.1.x/console/pom.xml
===================================================================
--- branches/7.1.x/console/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/console/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/7.1.x/documentation/admin-guide/pom.xml
===================================================================
--- branches/7.1.x/documentation/admin-guide/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/documentation/admin-guide/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1/version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>admin-guide</artifactId>
Modified: branches/7.1.x/documentation/caching-guide/pom.xml
===================================================================
--- branches/7.1.x/documentation/caching-guide/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/documentation/caching-guide/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>caching-guide</artifactId>
Modified: branches/7.1.x/documentation/client-developers-guide/pom.xml
===================================================================
--- branches/7.1.x/documentation/client-developers-guide/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/documentation/client-developers-guide/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1/version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>client-developers-guide</artifactId>
Modified: branches/7.1.x/documentation/developer-guide/pom.xml
===================================================================
--- branches/7.1.x/documentation/developer-guide/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/documentation/developer-guide/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1/version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>developer-guide</artifactId>
Modified: branches/7.1.x/documentation/pom.xml
===================================================================
--- branches/7.1.x/documentation/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/documentation/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version> </parent>
+ <version>7.1.1/version> </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
Modified: branches/7.1.x/documentation/quick-start-example/pom.xml
===================================================================
--- branches/7.1.x/documentation/quick-start-example/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/documentation/quick-start-example/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1/version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>quick-start-example</artifactId>
Modified: branches/7.1.x/documentation/reference/pom.xml
===================================================================
--- branches/7.1.x/documentation/reference/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/documentation/reference/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1/version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>reference</artifactId>
Modified: branches/7.1.x/engine/pom.xml
===================================================================
--- branches/7.1.x/engine/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/engine/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-engine</artifactId>
Modified: branches/7.1.x/hibernate-dialect/pom.xml
===================================================================
--- branches/7.1.x/hibernate-dialect/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/hibernate-dialect/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-hibernate-dialect</artifactId>
Modified: branches/7.1.x/jboss-integration/pom.xml
===================================================================
--- branches/7.1.x/jboss-integration/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/jboss-integration/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -2,13 +2,12 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
<artifactId>teiid-jboss-integration</artifactId>
<name>teiid-jboss-integration</name>
- <version>7.1.1.Alpha1</version>
<description>JBoss specific integration layer for teiid</description>
<dependencies>
Modified: branches/7.1.x/metadata/pom.xml
===================================================================
--- branches/7.1.x/metadata/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/metadata/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: branches/7.1.x/pom.xml
===================================================================
--- branches/7.1.x/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -5,15 +5,15 @@
<artifactId>teiid</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
<description>Federated SQL and XML query engine.</description>
<properties>
<ant.version>1.7.0</ant.version>
<site.url>http://www.jboss.org/teiid</site.url>
</properties>
<scm>
- <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/teiid-7.1.1.Alpha1</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-7.1.1.Alpha1</developerConnection>
+ <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/teiid-7.1.x</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-7.1.x</developerConnection>
</scm>
<licenses>
<license>
Modified: branches/7.1.x/runtime/pom.xml
===================================================================
--- branches/7.1.x/runtime/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/runtime/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.1.x/test-integration/common/pom.xml
===================================================================
--- branches/7.1.x/test-integration/common/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/test-integration/common/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-integration-common</artifactId>
Modified: branches/7.1.x/test-integration/db/pom.xml
===================================================================
--- branches/7.1.x/test-integration/db/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/test-integration/db/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -9,7 +9,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -19,8 +19,6 @@
<groupId>org.jboss.teiid.teiid-test-integration</groupId>
<description>Integration tests that require external database dependencies </description>
- <version>7.1.1.Alpha1</version>
-
<dependencies>
<dependency>
Modified: branches/7.1.x/test-integration/pom.xml
===================================================================
--- branches/7.1.x/test-integration/pom.xml 2010-09-13 21:30:51 UTC (rev 2563)
+++ branches/7.1.x/test-integration/pom.xml 2010-09-14 01:43:36 UTC (rev 2564)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.Alpha1</version>
+ <version>7.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
14 years, 3 months
teiid SVN: r2563 - in branches/7.1.x/connectors/translator-jdbc/src: test/java/org/teiid/translator/jdbc/modeshape and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: vhalbert(a)redhat.com
Date: 2010-09-13 17:30:51 -0400 (Mon, 13 Sep 2010)
New Revision: 2563
Modified:
branches/7.1.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/modeshape/ModeShapeExecutionFactory.java
branches/7.1.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/modeshape/TestModeShapeSqlTranslator.java
branches/7.1.x/connectors/translator-jdbc/src/test/resources/ModeShape.vdb
Log:
TEIID-1106 - When importing via Designer using the ModeShape jdbc driver, the name-in-source value will result in having tic marks surround it because the value contains a special character (i.e., nt:base becomes 'nt:base'). Therefore, these changes remove the tic marks before pushing the query to ModeShape.
Modified: branches/7.1.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/modeshape/ModeShapeExecutionFactory.java
===================================================================
--- branches/7.1.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/modeshape/ModeShapeExecutionFactory.java 2010-09-13 19:14:47 UTC (rev 2562)
+++ branches/7.1.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/modeshape/ModeShapeExecutionFactory.java 2010-09-13 21:30:51 UTC (rev 2563)
@@ -35,12 +35,14 @@
import org.teiid.language.LanguageObject;
import org.teiid.language.Literal;
import org.teiid.language.NamedTable;
+import org.teiid.translator.SourceSystemFunctions;
import org.teiid.translator.ExecutionContext;
import org.teiid.translator.Translator;
import org.teiid.translator.TranslatorException;
import org.teiid.translator.jdbc.ConvertModifier;
import org.teiid.translator.jdbc.FunctionModifier;
import org.teiid.translator.jdbc.JDBCExecutionFactory;
+import org.teiid.translator.jdbc.SQLConversionVisitor;
@@ -76,10 +78,7 @@
return objs;
}
} );
-
-
-
-
+
//add in type conversion
ConvertModifier convertModifier = new ConvertModifier();
@@ -126,31 +125,58 @@
return null;
}
}, FunctionModifier.BOOLEAN);
+
+ registerFunctionModifier(SourceSystemFunctions.CONVERT, convertModifier);
}
+ /**
+ * Create the {@link SQLConversionVisitor} that will perform translation. Typical custom
+ * JDBC connectors will not need to create custom conversion visitors, rather implementors
+ * should override existing {@link JDBCExecutionFactory} methods.
+ * @return the {@link SQLConversionVisitor}
+ */
+ public SQLConversionVisitor getSQLConversionVisitor() {
+ return new SQLConversionVisitor(this);
+ }
+
@Override
public List<?> translate(LanguageObject obj, ExecutionContext context) {
- if (obj instanceof NamedTable) {
-
- NamedTable nt = (NamedTable) obj;
- List<String> ntlist = new ArrayList<String>(1);
-
- ntlist.add("[" + nt.getMetadataObject().getNameInSource() + "]"); //$NON-NLS-1$ //$NON-NLS-2$
- return ntlist;
- }
-
- if (obj instanceof ColumnReference) {
- ColumnReference elem = (ColumnReference) obj;
- List<String> ntlist = new ArrayList<String>(1);
- ntlist.add("[" + elem.getMetadataObject().getNameInSource() + "]"); //$NON-NLS-1$ //$NON-NLS-2$
- return ntlist;
-
- }
-
- return super.translate(obj, context);
- }
+ if (obj instanceof NamedTable) {
+ NamedTable nt = (NamedTable) obj;
+ List<String> ntlist = new ArrayList<String>(1);
+ ntlist.add("[" + trimTics(nt.getMetadataObject().getNameInSource()) + "]"); //$NON-NLS-1$ //$NON-NLS-2$
+ return ntlist;
+ }
+
+ if (obj instanceof ColumnReference) {
+ ColumnReference elem = (ColumnReference) obj;
+ List<String> ntlist = new ArrayList<String>(1);
+ ntlist.add("[" + trimTics(elem.getMetadataObject().getNameInSource()) + "]"); //$NON-NLS-1$ //$NON-NLS-2$
+ return ntlist;
+ }
+
+ return super.translate(obj, context);
+ }
+
+ /**
+ * Because the Teiid Designer Import from JDBC adds tic's to a nameInSource that has special characters,
+ * they have to be removed when building the sql syntax
+ * @param name
+ * @return
+ */
+ private String trimTics(String name) {
+ String rtn = name;
+ if (rtn.startsWith("'")) {
+ rtn = rtn.substring(1);
+ }
+
+ if (rtn.endsWith("'")) {
+ rtn = rtn.substring(0, rtn.indexOf("'"));
+ }
+ return rtn;
+ }
@Override
public String translateLiteralBoolean(Boolean booleanValue) {
@@ -182,13 +208,13 @@
@Override
public List<String> getSupportedFunctions() {
- List<String> supportedFunctions = new ArrayList<String>();
- supportedFunctions.addAll(super.getSupportedFunctions());
- supportedFunctions.add("PATH"); //$NON-NLS-1$
- supportedFunctions.add("NAME"); //$NON-NLS-1$
- supportedFunctions.add("ISCHILDNODE"); //$NON-NLS-1$
-
- return supportedFunctions;
+ List<String> supportedFunctions = new ArrayList<String>();
+ supportedFunctions.addAll(super.getSupportedFunctions());
+ supportedFunctions.add("PATH"); //$NON-NLS-1$
+ supportedFunctions.add("NAME"); //$NON-NLS-1$
+ supportedFunctions.add("ISCHILDNODE"); //$NON-NLS-1$
+
+ return supportedFunctions;
}
Modified: branches/7.1.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/modeshape/TestModeShapeSqlTranslator.java
===================================================================
--- branches/7.1.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/modeshape/TestModeShapeSqlTranslator.java 2010-09-13 19:14:47 UTC (rev 2562)
+++ branches/7.1.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/modeshape/TestModeShapeSqlTranslator.java 2010-09-13 21:30:51 UTC (rev 2563)
@@ -64,61 +64,81 @@
tc.translateCommand(obj);
assertEquals("Did not get correct sql", expectedOutput, tc.getSql()); //$NON-NLS-1$
}
-
+
@Test
- public void testSimpleSelect() throws Exception {
- String input = "select Model from Car"; //$NON-NLS-1$
- String output = "SELECT [car:Model] FROM [car:Car]"; //$NON-NLS-1$
+ public void testSelectAllFromBase() throws Exception {
+ String input = "select * from nt_base"; //$NON-NLS-1$
+ String output = "SELECT [jcr:mixinTypes] FROM [nt:base]"; //$NON-NLS-1$
// FakeTranslationFactory.getInstance().getExampleTranslationUtility(),
helpTestVisitor(new TranslationUtility(MODESHAPE_VDB), input, output);
}
-
+
@Test
- public void testWhereClause() throws Exception {
+ public void testSelectColumnFromBase() throws Exception {
+ String input = "select jcr_mixinTypes from nt_base"; //$NON-NLS-1$
+ String output = "SELECT [jcr:mixinTypes] FROM [nt:base]"; //$NON-NLS-1$
- String input = "select Model from Car WHERE Make = 'Honda'"; //$NON-NLS-1$
- String output = "SELECT [car:Model] FROM [car:Car] WHERE [car:Make] = 'Honda'"; //$NON-NLS-1$
-
// FakeTranslationFactory.getInstance().getExampleTranslationUtility(),
helpTestVisitor(new TranslationUtility(MODESHAPE_VDB), input, output);
- }
+ }
+//
+// @Test
+// public void testSimpleSelect() throws Exception {
+// String input = "select Model from Car"; //$NON-NLS-1$
+// String output = "SELECT [car:Model] FROM [car:Car]"; //$NON-NLS-1$
+//
+// // FakeTranslationFactory.getInstance().getExampleTranslationUtility(),
+// helpTestVisitor(new TranslationUtility(MODESHAPE_VDB), input, output);
+//
+// }
+//
+// @Test
+// public void testWhereClause() throws Exception {
+//
+// String input = "select Model from Car WHERE Make = 'Honda'"; //$NON-NLS-1$
+// String output = "SELECT [car:Model] FROM [car:Car] WHERE [car:Make] = 'Honda'"; //$NON-NLS-1$
+//
+// // FakeTranslationFactory.getInstance().getExampleTranslationUtility(),
+// helpTestVisitor(new TranslationUtility(MODESHAPE_VDB), input, output);
+//
+// }
+//
+// @Test
+// public void testOrderBy() throws Exception {
+//
+// String input = "select Model from Car ORDER BY Make"; //$NON-NLS-1$
+// String output = "SELECT [car:Model] FROM [car:Car] ORDER BY [car:Make]"; //$NON-NLS-1$
+//
+// // FakeTranslationFactory.getInstance().getExampleTranslationUtility(),
+// helpTestVisitor(new TranslationUtility(MODESHAPE_VDB), input, output);
+//
+// }
+//
+// @Ignore
+// @Test
+// public void testUsingAlias() throws Exception {
+//
+// String input = "select c.Model from Car As c"; //$NON-NLS-1$
+// String output = "SELECT c.[car:Model] FROM [car:Car] As c"; //$NON-NLS-1$
+//
+// // FakeTranslationFactory.getInstance().getExampleTranslationUtility(),
+// helpTestVisitor(new TranslationUtility(MODESHAPE_VDB), input, output);
+//
+// }
+//
+// @Ignore
+// @Test
+// public void testUsingNameFunction() throws Exception {
+//
+// String input = "select Model from Car as car WHERE PATH('car') LIKE '%/Hybrid/%'"; //$NON-NLS-1$
+// String output = "SELECT [car:Model] FROM [car:Car] WHERE PATH(car:Car) LIKE '%/Hybrid/%'"; //$NON-NLS-1$
+//
+// // FakeTranslationFactory.getInstance().getExampleTranslationUtility(),
+// helpTestVisitor(new TranslationUtility(MODESHAPE_VDB), input, output);
+//
+// }
- @Test
- public void testOrderBy() throws Exception {
-
- String input = "select Model from Car ORDER BY Make"; //$NON-NLS-1$
- String output = "SELECT [car:Model] FROM [car:Car] ORDER BY [car:Make]"; //$NON-NLS-1$
-
- // FakeTranslationFactory.getInstance().getExampleTranslationUtility(),
- helpTestVisitor(new TranslationUtility(MODESHAPE_VDB), input, output);
-
- }
-
- @Ignore
- @Test
- public void testUsingAlias() throws Exception {
-
- String input = "select c.Model from Car As c"; //$NON-NLS-1$
- String output = "SELECT c.[car:Model] FROM [car:Car] As c"; //$NON-NLS-1$
-
- // FakeTranslationFactory.getInstance().getExampleTranslationUtility(),
- helpTestVisitor(new TranslationUtility(MODESHAPE_VDB), input, output);
-
- }
-
- @Ignore
- @Test
- public void testUsingNameFunction() throws Exception {
-
- String input = "select Model from Car as car WHERE PATH('car') LIKE '%/Hybrid/%'"; //$NON-NLS-1$
- String output = "SELECT [car:Model] FROM [car:Car] WHERE PATH(car:Car) LIKE '%/Hybrid/%'"; //$NON-NLS-1$
-
- // FakeTranslationFactory.getInstance().getExampleTranslationUtility(),
- helpTestVisitor(new TranslationUtility(MODESHAPE_VDB), input, output);
-
- }
-
}
Modified: branches/7.1.x/connectors/translator-jdbc/src/test/resources/ModeShape.vdb
===================================================================
(Binary files differ)
14 years, 3 months
teiid SVN: r2562 - branches/7.1.x/runtime/src/test/java/org/teiid/dqp/service/buffer.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2010-09-13 15:14:47 -0400 (Mon, 13 Sep 2010)
New Revision: 2562
Modified:
branches/7.1.x/runtime/src/test/java/org/teiid/dqp/service/buffer/TestLocalBufferService.java
Log:
TEIID-1257 removing directory creation from setter method
Modified: branches/7.1.x/runtime/src/test/java/org/teiid/dqp/service/buffer/TestLocalBufferService.java
===================================================================
--- branches/7.1.x/runtime/src/test/java/org/teiid/dqp/service/buffer/TestLocalBufferService.java 2010-09-13 17:53:46 UTC (rev 2561)
+++ branches/7.1.x/runtime/src/test/java/org/teiid/dqp/service/buffer/TestLocalBufferService.java 2010-09-13 19:14:47 UTC (rev 2562)
@@ -22,31 +22,19 @@
package org.teiid.dqp.service.buffer;
+import static org.junit.Assert.*;
+
+import org.junit.Test;
import org.teiid.common.buffer.impl.BufferManagerImpl;
import org.teiid.common.buffer.impl.FileStorageManager;
import org.teiid.core.util.UnitTestUtil;
import org.teiid.services.BufferServiceImpl;
-import junit.framework.TestCase;
-
@SuppressWarnings("nls")
-public class TestLocalBufferService extends TestCase {
+public class TestLocalBufferService {
- public TestLocalBufferService(String name) {
- super(name);
- }
-
- public void testMissingRequiredProperties() throws Exception {
+ @Test public void testCheckMemPropertyGotSet() throws Exception {
BufferServiceImpl svc = new BufferServiceImpl();
- svc.setDiskDirectory(UnitTestUtil.getTestScratchPath()+"/teiid");
-
- // These are defaults if none of the properties are set.
- assertTrue(svc.getBufferDirectory().isDirectory() && svc.getBufferDirectory().exists());
- assertTrue(svc.isUseDisk());
- }
-
- public void testCheckMemPropertyGotSet() throws Exception {
- BufferServiceImpl svc = new BufferServiceImpl();
svc.setDiskDirectory(UnitTestUtil.getTestScratchPath()+"/teiid/1");
svc.setUseDisk(true);
@@ -61,7 +49,7 @@
assertTrue(((FileStorageManager)mgr.getStorageManager()).getDirectory().endsWith(svc.getBufferDirectory().getName()));
}
- public void testCheckMemPropertyGotSet2() throws Exception {
+ @Test public void testCheckMemPropertyGotSet2() throws Exception {
BufferServiceImpl svc = new BufferServiceImpl();
svc.setDiskDirectory(UnitTestUtil.getTestScratchPath()+"/teiid/1");
svc.setUseDisk(false);
14 years, 3 months
teiid SVN: r2561 - branches/7.1.x/build/kits/jboss-container.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2010-09-13 13:53:46 -0400 (Mon, 13 Sep 2010)
New Revision: 2561
Modified:
branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html
Log:
TEIID-1256 update to purge on add and to update the docs.
Modified: branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html 2010-09-13 16:58:31 UTC (rev 2560)
+++ branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html 2010-09-13 17:53:46 UTC (rev 2561)
@@ -40,6 +40,7 @@
</ul>
<h4>from 7.1</h4>
<ul>
+ <li>Overwriting an existing VDB will cause old connections to be terminated. Production systems should rely on VDB versioning.
<li>The jdbc:metamatrix JDBC URL prefix is no longer accepted. Use jdbc:teiid instead.
<li>Model visibility no longer restricts access to tables and procedures. Setting visible to false will only hide entries from system tables. Data roles should be used to restrict data access.
</ul>
14 years, 3 months
teiid SVN: r2560 - in branches/7.1.x: jboss-integration/src/main/java/org/teiid/jboss/deployers and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2010-09-13 12:58:31 -0400 (Mon, 13 Sep 2010)
New Revision: 2560
Modified:
branches/7.1.x/documentation/admin-guide/src/main/docbook/en-US/content/vdb-deployment.xml
branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java
Log:
TEIID-1256 update to purge on add and to update the docs.
Modified: branches/7.1.x/documentation/admin-guide/src/main/docbook/en-US/content/vdb-deployment.xml
===================================================================
--- branches/7.1.x/documentation/admin-guide/src/main/docbook/en-US/content/vdb-deployment.xml 2010-09-13 16:55:45 UTC (rev 2559)
+++ branches/7.1.x/documentation/admin-guide/src/main/docbook/en-US/content/vdb-deployment.xml 2010-09-13 16:58:31 UTC (rev 2560)
@@ -13,6 +13,10 @@
<title>Deploying a VDB</title>
<para>Once you have a "VDB" built it can be deployed in Teiid runtime in different ways.</para>
+ <warning><para>If <link linkend="vdb-versioning">VDB versioning</link> is not used to give distinct version numbers, overwriting a VDB of the same name
+ will terminate all connections to the old VDB. It is recommended that VDB versioning be used for production systems.
+ </para></warning>
+
<section>
<title>Direct File Deployment</title>
<para>Copy the VDB file into the "<jboss-install>/server/<profile>/deploy" directory.
@@ -47,7 +51,7 @@
deploy a VDB use this method. This method is preferable for OEM users, who are trying to extend the
Teiid's capabilities through their applications.</para>
</section>
-
+
</section>
<section>
Modified: branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java
===================================================================
--- branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java 2010-09-13 16:55:45 UTC (rev 2559)
+++ branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java 2010-09-13 16:58:31 UTC (rev 2560)
@@ -145,7 +145,11 @@
}
}
}
-
+ /*
+ * having only a single clientserviceregistry means that the admin and jdbc ports are functionally equivalent.
+ * this is an undocuemented feature. Designer integration relies on this to use the same port
+ * for admin and preview logic.
+ */
this.csr.registerClientService(ILogon.class, logon, LogConstants.CTX_SECURITY);
this.csr.registerClientService(DQP.class, proxyService(DQP.class, this.dqpCore, LogConstants.CTX_DQP), LogConstants.CTX_DQP);
this.csr.registerClientService(Admin.class, proxyService(Admin.class, admin, LogConstants.CTX_ADMIN_API), LogConstants.CTX_ADMIN_API);
@@ -188,12 +192,12 @@
this.vdbRepository.addListener(new VDBLifeCycleListener() {
@Override
- public void added(String name, int version) {
+ public void removed(String name, int version) {
}
@Override
- public void removed(String name, int version) {
+ public void added(String name, int version) {
// terminate all the previous sessions
try {
Collection<SessionMetadata> sessions = sessionService.getActiveSessions();
14 years, 3 months
teiid SVN: r2559 - in branches/7.1.x: client/src/main/java/org/teiid/adminapi and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2010-09-13 12:55:45 -0400 (Mon, 13 Sep 2010)
New Revision: 2559
Modified:
branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java
branches/7.1.x/client/src/main/java/org/teiid/adminapi/Admin.java
branches/7.1.x/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java
Log:
TEIID-1231 adding the ability to set any authenticated through admin api
Modified: branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java
===================================================================
--- branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java 2010-09-10 20:43:42 UTC (rev 2558)
+++ branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java 2010-09-13 16:55:45 UTC (rev 2559)
@@ -108,12 +108,12 @@
p = props;
}
- @Doc(text = "Adds a role to the specified policy")
+ @Doc(text = "Adds a mapped role to the specified data role")
public static void addDataRoleMapping(
@Doc(text = "vdb name") String vdbName,
@Doc(text = "vdb version") int vdbVersion,
- @Doc(text = "policy name") String policyName,
- @Doc(text = "role") String role) throws AdminException {
+ @Doc(text = "dataRole name") String policyName,
+ @Doc(text = "mapped role name") String role) throws AdminException {
getAdmin().addDataRoleMapping(vdbName, vdbVersion, policyName, role);
}
@@ -237,16 +237,25 @@
return getAdmin().getCacheStats(identifier);
}
- @Doc(text = "Remove a role for the data policy")
+ @Doc(text = "Remove a mapped role for the data role")
public static void removeDataRoleMapping(
@Doc(text = "vdb name") String vdbName,
@Doc(text = "vdb version") int vdbVersion,
- @Doc(text = "policy name") String policyName,
- @Doc(text = "role name") String role) throws AdminException {
+ @Doc(text = "dataRole name") String policyName,
+ @Doc(text = "mapped role name") String role) throws AdminException {
getAdmin()
.removeDataRoleMapping(vdbName, vdbVersion, policyName, role);
}
+ @Doc(text = "Set the any authenticated flag for the data role")
+ public static void setAnyAuthenticatedForDataRole(
+ @Doc(text = "vdb name")String vdbName,
+ @Doc(text = "vdb version")int vdbVersion,
+ @Doc(text = "dataRole name")String dataRole,
+ @Doc(text = "any authenticated") boolean anyAuthenticated) throws AdminException {
+ getAdmin().setAnyAuthenticatedForDataRole(vdbName, vdbVersion, dataRole, anyAuthenticated);
+ }
+
@Doc(text = "Set a runtime property")
public static void setRuntimeProperty(
@Doc(text = "name") String propertyName,
Modified: branches/7.1.x/client/src/main/java/org/teiid/adminapi/Admin.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/adminapi/Admin.java 2010-09-10 20:43:42 UTC (rev 2558)
+++ branches/7.1.x/client/src/main/java/org/teiid/adminapi/Admin.java 2010-09-13 16:55:45 UTC (rev 2559)
@@ -234,21 +234,30 @@
*
* @param vdbName
* @param vdbVersion
- * @param policyName
- * @param role
+ * @param dataRole
+ * @param mappedRoleName
*/
- void addDataRoleMapping(String vdbName, int vdbVersion, String policyName, String role) throws AdminException;
+ void addDataRoleMapping(String vdbName, int vdbVersion, String dataRole, String mappedRoleName) throws AdminException;
/**
- * Assign a Role name to the Data Role in a given VDB
+ * Remove a Role name to the Data Role in a given VDB
*
* @param vdbName
* @param vdbVersion
- * @param policyName
- * @param role
+ * @param dataRole
+ * @param mappedRoleName
*/
- void removeDataRoleMapping(String vdbName, int vdbVersion, String policyName, String role) throws AdminException;
+ void removeDataRoleMapping(String vdbName, int vdbVersion, String dataRole, String mappedRoleName) throws AdminException;
+ /**
+ * Set the any authenticated flag on the Data Role in a given VDB
+ *
+ * @param vdbName
+ * @param vdbVersion
+ * @param dataRole
+ * @param anyAuthenticated
+ */
+ void setAnyAuthenticatedForDataRole(String vdbName, int vdbVersion, String dataRole, boolean anyAuthenticated) throws AdminException;
/**
* Merge the Source VDB into Target VDB. Both Source and Target VDBs must be present for this method to
Modified: branches/7.1.x/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java
===================================================================
--- branches/7.1.x/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java 2010-09-10 20:43:42 UTC (rev 2558)
+++ branches/7.1.x/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java 2010-09-13 16:55:45 UTC (rev 2559)
@@ -544,29 +544,34 @@
throw new AdminProcessingException(IntegrationPlugin.Util.getString("policy_not_found", policyName, vdbName, vdbVersion)); //$NON-NLS-1$
}
- ManagedProperty mappedRoleNames = managedPolicy.getProperty("mappedRoleNames");//$NON-NLS-1$
- CollectionValueSupport roleCollection = (CollectionValueSupport)mappedRoleNames.getValue();
- ArrayList<MetaValue> modifiedRoleNames = new ArrayList<MetaValue>();
- if (roleCollection != null) {
- MetaValue[] roleNames = roleCollection.getElements();
- for (MetaValue mv:roleNames) {
- String existing = (String)((SimpleValueSupport)mv).getValue();
- if (!existing.equals(role)) {
- modifiedRoleNames.add(mv);
- }
+ if (role != null) {
+ ManagedProperty mappedRoleNames = managedPolicy.getProperty("mappedRoleNames");//$NON-NLS-1$
+ CollectionValueSupport roleCollection = (CollectionValueSupport)mappedRoleNames.getValue();
+ ArrayList<MetaValue> modifiedRoleNames = new ArrayList<MetaValue>();
+ if (roleCollection != null) {
+ MetaValue[] roleNames = roleCollection.getElements();
+ for (MetaValue mv:roleNames) {
+ String existing = (String)((SimpleValueSupport)mv).getValue();
+ if (!existing.equals(role)) {
+ modifiedRoleNames.add(mv);
+ }
+ }
}
- }
- else {
- roleCollection = new CollectionValueSupport(new CollectionMetaType("java.util.List", SimpleMetaType.STRING)); //$NON-NLS-1$
- mappedRoleNames.setValue(roleCollection);
- }
-
- if (add) {
- modifiedRoleNames.add(ManagedUtil.wrap(SimpleMetaType.STRING, role));
- }
-
- roleCollection.setElements(modifiedRoleNames.toArray(new MetaValue[modifiedRoleNames.size()]));
-
+ else {
+ roleCollection = new CollectionValueSupport(new CollectionMetaType("java.util.List", SimpleMetaType.STRING)); //$NON-NLS-1$
+ mappedRoleNames.setValue(roleCollection);
+ }
+
+ if (add) {
+ modifiedRoleNames.add(ManagedUtil.wrap(SimpleMetaType.STRING, role));
+ }
+
+ roleCollection.setElements(modifiedRoleNames.toArray(new MetaValue[modifiedRoleNames.size()]));
+ } else {
+ ManagedProperty anyAuthenticated = managedPolicy.getProperty("anyAuthenticated");//$NON-NLS-1$
+ anyAuthenticated.setValue(SimpleValueSupport.wrap(add));
+ }
+
try {
getView().updateComponent(mc);
} catch (Exception e) {
@@ -584,6 +589,12 @@
public void removeDataRoleMapping(String vdbName, int vdbVersion, String policyName, String role) throws AdminException{
manageRoleToDataPolicy(vdbName, vdbVersion, policyName, role, false);
}
+
+ @Override
+ public void setAnyAuthenticatedForDataRole(String vdbName, int vdbVersion,
+ String dataRole, boolean anyAuthenticated) throws AdminException {
+ manageRoleToDataPolicy(vdbName, vdbVersion, dataRole, null, anyAuthenticated);
+ }
@Override
public void mergeVDBs(String sourceVDBName, int sourceVDBVersion, String targetVDBName, int targetVDBVersion) throws AdminException {
14 years, 3 months
teiid SVN: r2558 - branches/7.1.x/runtime/src/main/java/org/teiid/services.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2010-09-10 16:43:42 -0400 (Fri, 10 Sep 2010)
New Revision: 2558
Modified:
branches/7.1.x/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java
Log:
TEIID-1257 removing directory creation from setter method
Modified: branches/7.1.x/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java
===================================================================
--- branches/7.1.x/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java 2010-09-10 20:18:13 UTC (rev 2557)
+++ branches/7.1.x/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java 2010-09-10 20:43:42 UTC (rev 2558)
@@ -38,6 +38,8 @@
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.util.FileUtils;
import org.teiid.dqp.service.BufferService;
+import org.teiid.logging.LogConstants;
+import org.teiid.logging.LogManager;
import org.teiid.runtime.RuntimePlugin;
@@ -76,7 +78,10 @@
public void start(){
try {
-
+ LogManager.logDetail(LogConstants.CTX_DQP, "Starting BufferManager using", bufferDir); //$NON-NLS-1$
+ if (!bufferDir.exists()) {
+ this.bufferDir.mkdirs();
+ }
// Construct and initialize the buffer manager
this.bufferMgr = new BufferManagerImpl();
this.bufferMgr.setConnectorBatchSize(Integer.valueOf(connectorBatchSize));
@@ -88,6 +93,9 @@
// If necessary, add disk storage manager
if(useDisk) {
+ // start the file storage manager in clean state
+ // wise FileStorageManager is smart enough to clean up after itself
+ cleanDirectory(bufferDir);
// Get the properties for FileStorageManager and create.
fsm = new FileStorageManager();
fsm.setStorageDirectory(bufferDir.getCanonicalPath());
@@ -96,10 +104,6 @@
fsm.setMaxBufferSpace(maxBufferSpace*MB);
fsm.initialize();
this.bufferMgr.setStorageManager(fsm);
-
- // start the file storage manager in clean state
- // wise FileStorageManager is smart enough to clen up after itself
- cleanDirectory(bufferDir);
} else {
this.bufferMgr.setStorageManager(new MemoryStorageManager());
}
@@ -112,6 +116,7 @@
}
public void stop() {
+ LogManager.logDetail(LogConstants.CTX_DQP, "Stopping BufferManager using", bufferDir); //$NON-NLS-1$
bufferMgr.shutdown();
// Delete the buffer directory
@@ -131,9 +136,6 @@
public void setDiskDirectory(String dir) {
this.bufferDir = new File(dir, "buffer"); //$NON-NLS-1$
- if (!bufferDir.exists()) {
- this.bufferDir.mkdirs();
- }
}
public void setProcessorBatchSize(int size) {
14 years, 3 months
teiid SVN: r2557 - in branches/7.1.x: engine/src/main/java/org/teiid/cache and 3 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-09-10 16:18:13 -0400 (Fri, 10 Sep 2010)
New Revision: 2557
Modified:
branches/7.1.x/cache-jbosscache/src/main/java/org/teiid/cache/jboss/JBossCache.java
branches/7.1.x/engine/src/main/java/org/teiid/cache/Cache.java
branches/7.1.x/engine/src/main/java/org/teiid/cache/DefaultCache.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/SessionAwareCache.java
branches/7.1.x/engine/src/test/java/org/teiid/dqp/internal/process/TestSessionAwareCache.java
branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java
Log:
TEIID-1256: Only removing the caches that are of the VDB that is being un-deployed.
Modified: branches/7.1.x/cache-jbosscache/src/main/java/org/teiid/cache/jboss/JBossCache.java
===================================================================
--- branches/7.1.x/cache-jbosscache/src/main/java/org/teiid/cache/jboss/JBossCache.java 2010-09-10 19:34:56 UTC (rev 2556)
+++ branches/7.1.x/cache-jbosscache/src/main/java/org/teiid/cache/jboss/JBossCache.java 2010-09-10 20:18:13 UTC (rev 2557)
@@ -128,4 +128,15 @@
void setCacheConfiguration(CacheConfiguration config) {
this.config = config;
}
+
+ @Override
+ public Set<K> keys() {
+ HashSet keys = new HashSet();
+ Node<K, V> node = getRootNode();
+ Set<Node<K, V>> children = node.getChildren();
+ for (Node<K, V> child:children) {
+ keys.addAll(child.getData().keySet());
+ }
+ return keys;
+ }
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/cache/Cache.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/cache/Cache.java 2010-09-10 19:34:56 UTC (rev 2556)
+++ branches/7.1.x/engine/src/main/java/org/teiid/cache/Cache.java 2010-09-10 20:18:13 UTC (rev 2557)
@@ -22,6 +22,8 @@
package org.teiid.cache;
+import java.util.Set;
+
/**
* Abstraction over cache providers
*/
@@ -94,4 +96,10 @@
* @return
*/
String getName();
+
+ /**
+ * Return all the keys
+ * @return
+ */
+ Set<K> keys();
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/cache/DefaultCache.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/cache/DefaultCache.java 2010-09-10 19:34:56 UTC (rev 2556)
+++ branches/7.1.x/engine/src/main/java/org/teiid/cache/DefaultCache.java 2010-09-10 20:18:13 UTC (rev 2557)
@@ -217,5 +217,10 @@
public String getName() {
return name;
}
+
+ @Override
+ public Set<K> keys() {
+ return map.keySet();
+ }
}
\ No newline at end of file
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2010-09-10 19:34:56 UTC (rev 2556)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2010-09-10 20:18:13 UTC (rev 2557)
@@ -555,6 +555,18 @@
}
}
+ private void clearPlanCache(String vdbName, int version){
+ LogManager.logInfo(LogConstants.CTX_DQP, QueryPlugin.Util.getString("DQPCore.Clearing_prepared_plan_cache")); //$NON-NLS-1$
+ this.prepPlanCache.clearForVDB(vdbName, version);
+ }
+
+ private void clearResultSetCache(String vdbName, int version) {
+ //clear cache in server
+ if(rsCache != null){
+ rsCache.clearForVDB(vdbName, version);
+ }
+ }
+
public CacheStatisticsMetadata getCacheStatistics(String cacheType) {
if (cacheType.equalsIgnoreCase(Admin.Cache.PREPARED_PLAN_CACHE.toString())) {
return buildCacheStats(Admin.Cache.PREPARED_PLAN_CACHE.toString(), this.prepPlanCache);
@@ -592,6 +604,18 @@
break;
}
}
+
+ public void clearCache(String cacheType, String vdbName, int version) {
+ Admin.Cache cache = Admin.Cache.valueOf(cacheType);
+ switch (cache) {
+ case PREPARED_PLAN_CACHE:
+ clearPlanCache(vdbName, version);
+ break;
+ case QUERY_SERVICE_RESULT_SET_CACHE:
+ clearResultSetCache(vdbName, version);
+ break;
+ }
+ }
public Collection<org.teiid.adminapi.Transaction> getTransactions() {
return this.transactionService.getTransactions();
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-09-10 19:34:56 UTC (rev 2556)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/SessionAwareCache.java 2010-09-10 20:18:13 UTC (rev 2557)
@@ -25,6 +25,7 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import org.teiid.cache.Cachable;
@@ -174,6 +175,20 @@
this.distributedCache.clear();
}
+ public void clearForVDB(String vdbName, int version) {
+ clearCache(this.localCache, vdbName, version);
+ clearCache(this.distributedCache, vdbName, version);
+ }
+
+ private void clearCache(Cache<CacheID, T> cache, String vdbName, int version) {
+ Set<CacheID> keys = cache.keys();
+ for (CacheID key:keys) {
+ if (key.vdbInfo.getName().equalsIgnoreCase(vdbName) && key.vdbInfo.getVersion() == version) {
+ cache.remove(key);
+ }
+ }
+ }
+
public static class CacheID implements Serializable {
private static final long serialVersionUID = 8261905111156764744L;
private String sql;
Modified: branches/7.1.x/engine/src/test/java/org/teiid/dqp/internal/process/TestSessionAwareCache.java
===================================================================
--- branches/7.1.x/engine/src/test/java/org/teiid/dqp/internal/process/TestSessionAwareCache.java 2010-09-10 19:34:56 UTC (rev 2556)
+++ branches/7.1.x/engine/src/test/java/org/teiid/dqp/internal/process/TestSessionAwareCache.java 2010-09-10 20:18:13 UTC (rev 2557)
@@ -111,6 +111,29 @@
assertTrue(result==c);
}
+
+ @Test
+ public void testVDBRemoval() {
+
+ SessionAwareCache<Cachable> cache = new SessionAwareCache<Cachable>();
+
+ CacheID id = new CacheID(buildWorkContext(), new ParseInfo(), "SELECT * FROM FOO");
+
+ Cachable result = Mockito.mock(Cachable.class);
+ Mockito.stub(result.prepare((Cache)anyObject(), (BufferManager)anyObject())).toReturn(true);
+ Mockito.stub(result.restore((Cache)anyObject(), (BufferManager)anyObject())).toReturn(true);
+
+ id = new CacheID(buildWorkContext(), new ParseInfo(), "SELECT * FROM FOO");
+ cache.put(id, FunctionMethod.VDB_DETERMINISTIC, result, null);
+
+ Object c = cache.get(id);
+
+ assertTrue(result==c);
+
+ cache.clearForVDB("vdb-name", 1);
+
+ assertNull(cache.get(id));
+ }
public static DQPWorkContext buildWorkContext() {
Modified: branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java
===================================================================
--- branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java 2010-09-10 19:34:56 UTC (rev 2556)
+++ branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java 2010-09-10 20:18:13 UTC (rev 2557)
@@ -206,10 +206,9 @@
//ignore
}
- // dump the caches. TODO:It would have nice if only removed this VDB
- // specific cache, but based on JBoss cache structure it is hard to just get keys
- dqpCore.clearCache(Cache.PREPARED_PLAN_CACHE.toString());
- dqpCore.clearCache(Cache.QUERY_SERVICE_RESULT_SET_CACHE.toString());
+ // dump the caches.
+ dqpCore.clearCache(Cache.PREPARED_PLAN_CACHE.toString(), name, version);
+ dqpCore.clearCache(Cache.QUERY_SERVICE_RESULT_SET_CACHE.toString(), name, version);
}
});
}
14 years, 3 months
