teiid SVN: r4262 - branches/7.7.x/build.
by teiid-commits＠lists.jboss.org
Author: van.halbert
Date: 2012-07-24 10:23:05 -0400 (Tue, 24 Jul 2012)
New Revision: 4262
Modified:
branches/7.7.x/build/pom.xml
Log:
https://bugzilla.redhat.com/show_bug.cgi?id=842422 - fix the pom to attach the client-jdk15 jar to maven repo
Modified: branches/7.7.x/build/pom.xml
===================================================================
--- branches/7.7.x/build/pom.xml 2012-07-24 14:02:03 UTC (rev 4261)
+++ branches/7.7.x/build/pom.xml 2012-07-24 14:23:05 UTC (rev 4262)
@@ -129,7 +129,30 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/teiid-7.7.1-client-jdk15.jar</file>
+ <type>jar</type>
+ <classifier>client-jdk15</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
11 years, 9 months
teiid SVN: r4261 - in branches/7.4.x/engine/src: test/java/org/teiid/query/processor and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: jolee
Date: 2012-07-24 10:02:03 -0400 (Tue, 24 Jul 2012)
New Revision: 4261
Modified:
branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java
branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java
Log:
TEIID-2112 backport: using the local timezone for saxon calendarvalues, consistent handling of local timezone on xsd:date, xsd:datetime, and xsd:time values that have no timezone specified.
Modified: branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java
===================================================================
--- branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java 2012-07-24 01:39:54 UTC (rev 4260)
+++ branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java 2012-07-24 14:02:03 UTC (rev 4261)
@@ -23,10 +23,14 @@
package org.teiid.query.processor.relational;
import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
import java.util.Collections;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.TimeZone;
import net.sf.saxon.om.Item;
import net.sf.saxon.om.NodeInfo;
@@ -37,6 +41,7 @@
import net.sf.saxon.type.BuiltInAtomicType;
import net.sf.saxon.type.ConversionResult;
import net.sf.saxon.value.AtomicValue;
+import net.sf.saxon.value.CalendarValue;
import net.sf.saxon.value.StringValue;
import net.sf.saxon.value.Value;
@@ -51,6 +56,7 @@
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.types.XMLType;
+import org.teiid.core.util.TimestampWithTimezone;
import org.teiid.query.QueryPlugin;
import org.teiid.query.function.FunctionDescriptor;
import org.teiid.query.sql.lang.XMLTable;
@@ -222,14 +228,14 @@
}
Object value = colItem;
if (value instanceof AtomicValue) {
- value = Value.convertToJava(colItem);
+ value = getValue((AtomicValue)colItem);
} else if (value instanceof Item) {
Item i = (Item)value;
BuiltInAtomicType bat = typeMapping.get(proColumn.getSymbol().getType());
if (bat != null) {
ConversionResult cr = StringValue.convertStringToBuiltInType(i.getStringValueCS(), bat, null);
value = cr.asAtomic();
- value = Value.convertToJava((AtomicValue)value);
+ value = getValue((AtomicValue)value);
if (value instanceof Item) {
value = ((Item)value).getStringValue();
}
@@ -247,6 +253,19 @@
item = null;
return tuple;
}
+
+ private Object getValue(AtomicValue value) throws XPathException {
+ if (value instanceof CalendarValue) {
+ CalendarValue cv = (CalendarValue)value;
+ if (!cv.hasTimezone()) {
+ Calendar cal = cv.getCalendar();
+ Date d = cal.getTime();
+ cal.setTimeZone(getContext().getServerTimeZone());
+ return TimestampWithTimezone.createTimestamp(d, TimeZone.getTimeZone("GMT"), cal);
+ }
+ }
+ return Value.convertToJava(value);
+ }
@Override
public boolean hasFinalBuffer() {
Modified: branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java
===================================================================
--- branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java 2012-07-24 01:39:54 UTC (rev 4260)
+++ branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java 2012-07-24 14:02:03 UTC (rev 4261)
@@ -193,6 +193,16 @@
process(sql, expected);
}
+ @Test public void testXmlTableDateTime() throws Exception {
+ String sql = "select * from xmltable('/a' passing convert('<a dt=\"2011-11-17T07:38:49\" dtz=\"2011-11-17T07:38:49Z\" t=\"13:23:14\" d=\"2010-04-05\" />', xml) columns x timestamp path '@dt', x1 timestamp path '@dtz', y date path '@d', z time path '@t') as x"; //$NON-NLS-1$
+
+ List<?>[] expected = new List<?>[] {
+ Arrays.asList(TimestampUtil.createTimestamp(111, 10, 17, 7, 38, 49, 0), TimestampUtil.createTimestamp(111, 10, 17, 1, 38, 49, 0), TimestampUtil.createDate(110, 3, 5), TimestampUtil.createTime(13, 23, 14))
+ };
+
+ process(sql, expected);
+ }
+
@Test public void testXmlTableInView() throws Exception {
String sql = "select * from g1"; //$NON-NLS-1$
11 years, 9 months
teiid SVN: r4260 - in trunk/engine/src: test/java/org/teiid/query/processor and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-07-23 21:39:54 -0400 (Mon, 23 Jul 2012)
New Revision: 4260
Modified:
trunk/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java
trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java
Log:
TEIID-2112 using the local timezone for saxon calendarvalues
Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java 2012-07-23 02:05:25 UTC (rev 4259)
+++ trunk/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java 2012-07-24 01:39:54 UTC (rev 4260)
@@ -23,11 +23,14 @@
package org.teiid.query.processor.relational;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Collection;
import java.util.Collections;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.TimeZone;
import net.sf.saxon.om.Item;
import net.sf.saxon.om.NodeInfo;
@@ -38,6 +41,7 @@
import net.sf.saxon.type.BuiltInAtomicType;
import net.sf.saxon.type.ConversionResult;
import net.sf.saxon.value.AtomicValue;
+import net.sf.saxon.value.CalendarValue;
import net.sf.saxon.value.StringValue;
import net.sf.saxon.value.Value;
@@ -52,6 +56,7 @@
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.types.XMLType;
+import org.teiid.core.util.TimestampWithTimezone;
import org.teiid.query.QueryPlugin;
import org.teiid.query.eval.Evaluator;
import org.teiid.query.function.FunctionDescriptor;
@@ -281,14 +286,14 @@
}
Object value = colItem;
if (value instanceof AtomicValue) {
- value = Value.convertToJava(colItem);
+ value = getValue((AtomicValue)colItem);
} else if (value instanceof Item) {
Item i = (Item)value;
BuiltInAtomicType bat = typeMapping.get(proColumn.getSymbol().getType());
if (bat != null) {
ConversionResult cr = StringValue.convertStringToBuiltInType(i.getStringValueCS(), bat, null);
value = cr.asAtomic();
- value = Value.convertToJava((AtomicValue)value);
+ value = getValue((AtomicValue)value);
if (value instanceof Item) {
value = ((Item)value).getStringValue();
}
@@ -306,6 +311,19 @@
item = null;
return tuple;
}
+
+ private Object getValue(AtomicValue value) throws XPathException {
+ if (value instanceof CalendarValue) {
+ CalendarValue cv = (CalendarValue)value;
+ if (!cv.hasTimezone()) {
+ Calendar cal = cv.getCalendar();
+ Date d = cal.getTime();
+ cal.setTimeZone(getContext().getServerTimeZone());
+ return TimestampWithTimezone.createTimestamp(d, TimeZone.getTimeZone("GMT"), cal);
+ }
+ }
+ return Value.convertToJava(value);
+ }
@Override
public boolean hasFinalBuffer() {
Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java 2012-07-23 02:05:25 UTC (rev 4259)
+++ trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java 2012-07-24 01:39:54 UTC (rev 4260)
@@ -194,6 +194,16 @@
process(sql, expected);
}
+ @Test public void testXmlTableDateTime() throws Exception {
+ String sql = "select * from xmltable('/a' passing convert('<a dt=\"2011-11-17T07:38:49\" dtz=\"2011-11-17T07:38:49Z\" t=\"13:23:14\" d=\"2010-04-05\" />', xml) columns x timestamp path '@dt', x1 timestamp path '@dtz', y date path '@d', z time path '@t') as x"; //$NON-NLS-1$
+
+ List<?>[] expected = new List<?>[] {
+ Arrays.asList(TimestampUtil.createTimestamp(111, 10, 17, 7, 38, 49, 0), TimestampUtil.createTimestamp(111, 10, 17, 1, 38, 49, 0), TimestampUtil.createDate(110, 3, 5), TimestampUtil.createTime(13, 23, 14))
+ };
+
+ process(sql, expected);
+ }
+
@Test public void testXmlTablePassingSubquery() throws Exception {
String sql = "select * from xmltable('/a/b' passing (SELECT xmlelement(name a, xmlAgg(xmlelement(name b, e1))) from pm1.g1) columns val string path '/.') as x"; //$NON-NLS-1$
11 years, 9 months
teiid SVN: r4259 - in trunk: admin and 31 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-07-22 22:05:25 -0400 (Sun, 22 Jul 2012)
New Revision: 4259
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-jpa/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 for next development iteration
Modified: trunk/admin/pom.xml
===================================================================
--- trunk/admin/pom.xml 2012-07-23 02:04:06 UTC (rev 4258)
+++ trunk/admin/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-admin</artifactId>
Modified: trunk/adminshell/pom.xml
===================================================================
--- trunk/adminshell/pom.xml 2012-07-23 02:04:06 UTC (rev 4258)
+++ trunk/adminshell/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: trunk/api/pom.xml
===================================================================
--- trunk/api/pom.xml 2012-07-23 02:04:06 UTC (rev 4258)
+++ trunk/api/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-api</artifactId>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2012-07-23 02:04:06 UTC (rev 4258)
+++ trunk/build/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid</artifactId>
Modified: trunk/client/pom.xml
===================================================================
--- trunk/client/pom.xml 2012-07-23 02:04:06 UTC (rev 4258)
+++ trunk/client/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.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-07-23 02:04:06 UTC (rev 4258)
+++ trunk/client-jdk15/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.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-07-23 02:04:06 UTC (rev 4258)
+++ trunk/common-core/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.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-07-23 02:04:06 UTC (rev 4258)
+++ trunk/connectors/connector-file/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.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-07-23 02:04:06 UTC (rev 4258)
+++ trunk/connectors/connector-ldap/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.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-07-23 02:04:06 UTC (rev 4258)
+++ trunk/connectors/connector-salesforce/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.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-07-23 02:04:06 UTC (rev 4258)
+++ trunk/connectors/connector-ws/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ws</artifactId>
Modified: trunk/connectors/pom.xml
===================================================================
--- trunk/connectors/pom.xml 2012-07-23 02:04:06 UTC (rev 4258)
+++ trunk/connectors/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.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-07-23 02:04:06 UTC (rev 4258)
+++ trunk/connectors/salesforce-api/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.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-07-23 02:04:06 UTC (rev 4258)
+++ trunk/connectors/sandbox/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.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-07-23 02:04:06 UTC (rev 4258)
+++ trunk/connectors/sandbox/translator-yahoo/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.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-07-23 02:04:06 UTC (rev 4258)
+++ trunk/connectors/translator-file/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.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-07-23 02:04:06 UTC (rev 4258)
+++ trunk/connectors/translator-hive/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.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-07-23 02:04:06 UTC (rev 4258)
+++ trunk/connectors/translator-jdbc/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-jdbc</artifactId>
Modified: trunk/connectors/translator-jpa/pom.xml
===================================================================
--- trunk/connectors/translator-jpa/pom.xml 2012-07-23 02:04:06 UTC (rev 4258)
+++ trunk/connectors/translator-jpa/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-jpa</artifactId>
Modified: trunk/connectors/translator-ldap/pom.xml
===================================================================
--- trunk/connectors/translator-ldap/pom.xml 2012-07-23 02:04:06 UTC (rev 4258)
+++ trunk/connectors/translator-ldap/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.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-07-23 02:04:06 UTC (rev 4258)
+++ trunk/connectors/translator-loopback/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.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-07-23 02:04:06 UTC (rev 4258)
+++ trunk/connectors/translator-olap/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.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-07-23 02:04:06 UTC (rev 4258)
+++ trunk/connectors/translator-salesforce/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.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-07-23 02:04:06 UTC (rev 4258)
+++ trunk/connectors/translator-ws/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ws</artifactId>
Modified: trunk/engine/pom.xml
===================================================================
--- trunk/engine/pom.xml 2012-07-23 02:04:06 UTC (rev 4258)
+++ trunk/engine/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.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-07-23 02:04:06 UTC (rev 4258)
+++ trunk/hibernate-dialect/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.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-07-23 02:04:06 UTC (rev 4258)
+++ trunk/jboss-integration/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-jboss-integration</artifactId>
Modified: trunk/metadata/pom.xml
===================================================================
--- trunk/metadata/pom.xml 2012-07-23 02:04:06 UTC (rev 4258)
+++ trunk/metadata/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-07-23 02:04:06 UTC (rev 4258)
+++ trunk/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -10,7 +10,7 @@
<artifactId>teiid-parent</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>8.1.0.Beta1</version>
+ <version>8.1.0.Beta2-SNAPSHOT</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/tags/teiid-parent-8.1.0.Beta1</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-8.1.0.Beta1</developerConnection>
- <url>http://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-8.1.0.Beta1</url>
+ <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>
</scm>
<licenses>
<license>
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2012-07-23 02:04:06 UTC (rev 4258)
+++ trunk/runtime/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-runtime</artifactId>
Modified: trunk/test-integration/common/pom.xml
===================================================================
--- trunk/test-integration/common/pom.xml 2012-07-23 02:04:06 UTC (rev 4258)
+++ trunk/test-integration/common/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.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-07-23 02:04:06 UTC (rev 4258)
+++ trunk/test-integration/db/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -9,7 +9,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/test-integration/pom.xml
===================================================================
--- trunk/test-integration/pom.xml 2012-07-23 02:04:06 UTC (rev 4258)
+++ trunk/test-integration/pom.xml 2012-07-23 02:05:25 UTC (rev 4259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Beta1</version>
+ <version>8.1.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
11 years, 9 months
teiid SVN: r4258 - tags.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-07-22 22:04:06 -0400 (Sun, 22 Jul 2012)
New Revision: 4258
Added:
tags/teiid-parent-8.1.0.Beta1/
Log:
[maven-release-plugin] copy for tag teiid-parent-8.1.0.Beta1
11 years, 9 months
teiid SVN: r4257 - in trunk: admin and 31 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-07-22 22:03:30 -0400 (Sun, 22 Jul 2012)
New Revision: 4257
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-jpa/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.1.0.Beta1
Modified: trunk/admin/pom.xml
===================================================================
--- trunk/admin/pom.xml 2012-07-20 23:02:19 UTC (rev 4256)
+++ trunk/admin/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-admin</artifactId>
Modified: trunk/adminshell/pom.xml
===================================================================
--- trunk/adminshell/pom.xml 2012-07-20 23:02:19 UTC (rev 4256)
+++ trunk/adminshell/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: trunk/api/pom.xml
===================================================================
--- trunk/api/pom.xml 2012-07-20 23:02:19 UTC (rev 4256)
+++ trunk/api/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-api</artifactId>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2012-07-20 23:02:19 UTC (rev 4256)
+++ trunk/build/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid</artifactId>
Modified: trunk/client/pom.xml
===================================================================
--- trunk/client/pom.xml 2012-07-20 23:02:19 UTC (rev 4256)
+++ trunk/client/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
Modified: trunk/client-jdk15/pom.xml
===================================================================
--- trunk/client-jdk15/pom.xml 2012-07-20 23:02:19 UTC (rev 4256)
+++ trunk/client-jdk15/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client-jdk15</artifactId>
Modified: trunk/common-core/pom.xml
===================================================================
--- trunk/common-core/pom.xml 2012-07-20 23:02:19 UTC (rev 4256)
+++ trunk/common-core/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</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-07-20 23:02:19 UTC (rev 4256)
+++ trunk/connectors/connector-file/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</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-07-20 23:02:19 UTC (rev 4256)
+++ trunk/connectors/connector-ldap/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</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-07-20 23:02:19 UTC (rev 4256)
+++ trunk/connectors/connector-salesforce/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</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-07-20 23:02:19 UTC (rev 4256)
+++ trunk/connectors/connector-ws/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ws</artifactId>
Modified: trunk/connectors/pom.xml
===================================================================
--- trunk/connectors/pom.xml 2012-07-20 23:02:19 UTC (rev 4256)
+++ trunk/connectors/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</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-07-20 23:02:19 UTC (rev 4256)
+++ trunk/connectors/salesforce-api/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>salesforce-api</artifactId>
Modified: trunk/connectors/sandbox/pom.xml
===================================================================
--- trunk/connectors/sandbox/pom.xml 2012-07-20 23:02:19 UTC (rev 4256)
+++ trunk/connectors/sandbox/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</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-07-20 23:02:19 UTC (rev 4256)
+++ trunk/connectors/sandbox/translator-yahoo/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</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-07-20 23:02:19 UTC (rev 4256)
+++ trunk/connectors/translator-file/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</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-07-20 23:02:19 UTC (rev 4256)
+++ trunk/connectors/translator-hive/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</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-07-20 23:02:19 UTC (rev 4256)
+++ trunk/connectors/translator-jdbc/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-jdbc</artifactId>
Modified: trunk/connectors/translator-jpa/pom.xml
===================================================================
--- trunk/connectors/translator-jpa/pom.xml 2012-07-20 23:02:19 UTC (rev 4256)
+++ trunk/connectors/translator-jpa/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-jpa</artifactId>
Modified: trunk/connectors/translator-ldap/pom.xml
===================================================================
--- trunk/connectors/translator-ldap/pom.xml 2012-07-20 23:02:19 UTC (rev 4256)
+++ trunk/connectors/translator-ldap/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</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-07-20 23:02:19 UTC (rev 4256)
+++ trunk/connectors/translator-loopback/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</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-07-20 23:02:19 UTC (rev 4256)
+++ trunk/connectors/translator-olap/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</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-07-20 23:02:19 UTC (rev 4256)
+++ trunk/connectors/translator-salesforce/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</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-07-20 23:02:19 UTC (rev 4256)
+++ trunk/connectors/translator-ws/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ws</artifactId>
Modified: trunk/engine/pom.xml
===================================================================
--- trunk/engine/pom.xml 2012-07-20 23:02:19 UTC (rev 4256)
+++ trunk/engine/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-engine</artifactId>
Modified: trunk/hibernate-dialect/pom.xml
===================================================================
--- trunk/hibernate-dialect/pom.xml 2012-07-20 23:02:19 UTC (rev 4256)
+++ trunk/hibernate-dialect/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-hibernate-dialect</artifactId>
Modified: trunk/jboss-integration/pom.xml
===================================================================
--- trunk/jboss-integration/pom.xml 2012-07-20 23:02:19 UTC (rev 4256)
+++ trunk/jboss-integration/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-jboss-integration</artifactId>
Modified: trunk/metadata/pom.xml
===================================================================
--- trunk/metadata/pom.xml 2012-07-20 23:02:19 UTC (rev 4256)
+++ trunk/metadata/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-07-20 23:02:19 UTC (rev 4256)
+++ trunk/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -10,7 +10,7 @@
<artifactId>teiid-parent</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</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.1.0.Beta1</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-8.1.0.Beta1</developerConnection>
+ <url>http://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-8.1.0.Beta1</url>
</scm>
<licenses>
<license>
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2012-07-20 23:02:19 UTC (rev 4256)
+++ trunk/runtime/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-runtime</artifactId>
Modified: trunk/test-integration/common/pom.xml
===================================================================
--- trunk/test-integration/common/pom.xml 2012-07-20 23:02:19 UTC (rev 4256)
+++ trunk/test-integration/common/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</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-07-20 23:02:19 UTC (rev 4256)
+++ trunk/test-integration/db/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -9,7 +9,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/test-integration/pom.xml
===================================================================
--- trunk/test-integration/pom.xml 2012-07-20 23:02:19 UTC (rev 4256)
+++ trunk/test-integration/pom.xml 2012-07-23 02:03:30 UTC (rev 4257)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.1.0.Alpha3-SNAPSHOT</version>
+ <version>8.1.0.Beta1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
11 years, 9 months
teiid SVN: r4256 - in trunk: test-integration/common/src/test/java/org/teiid/jdbc and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-07-20 19:02:19 -0400 (Fri, 20 Jul 2012)
New Revision: 4256
Modified:
trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java
trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java
Log:
correcting a testing issue where the wrong vdb may be referenced by the VFS
Modified: trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java
===================================================================
--- trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java 2012-07-20 21:09:19 UTC (rev 4255)
+++ trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java 2012-07-20 23:02:19 UTC (rev 4256)
@@ -39,7 +39,6 @@
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.util.FileUtils;
import org.teiid.core.util.LRUCache;
-import org.teiid.core.util.PropertiesUtils;
import org.teiid.metadata.FunctionMethod;
import org.teiid.query.function.FunctionTree;
import org.teiid.query.function.SystemFunctionManager;
@@ -92,7 +91,7 @@
}
public static IndexMetadataStore loadMetadata(String vdbName, URL url) throws IOException, MalformedURLException, URISyntaxException {
- String fileName = PropertiesUtils.toHex(url.toExternalForm().getBytes());
+ String fileName = String.valueOf(vdbName + "-" + url.toExternalForm().hashCode());
VirtualFile root = VFS.getChild(fileName);
if (!root.exists()) {
VFS.mountZip(url.openStream(), fileName, root, TempFileProvider.create("vdbs", Executors.newScheduledThreadPool(2)));
Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java 2012-07-20 21:09:19 UTC (rev 4255)
+++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java 2012-07-20 23:02:19 UTC (rev 4256)
@@ -70,7 +70,7 @@
vdbImport.setName(VDB2);
param.vdbImports = Arrays.asList(vdbImport);
server.removeVDB(VDB1);
- server.deployVDB(VDB1, UnitTestUtil.getTestDataPath()+"/QT_Ora9DS_1.vdb", param);
+ server.deployVDB(VDB1, UnitTestUtil.getTestDataPath()+"/PartsSupplier.vdb", param);
this.internalConnection = server.createConnection("jdbc:teiid:"+VDB1);
executeTest("select * from tables where schemaname='BQT1' order by name", expectedAfter); //$NON-NLS-1$
11 years, 9 months
teiid SVN: r4255 - trunk/jboss-integration/src/test/java/org/teiid/jboss.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2012-07-20 17:09:19 -0400 (Fri, 20 Jul 2012)
New Revision: 4255
Modified:
trunk/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidConfiguration.java
Log:
TEIID-1985: adding get-plan to admin method, and also adding "include-source" paramter for request based methods to retrieve only user level requests
Modified: trunk/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidConfiguration.java
===================================================================
--- trunk/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidConfiguration.java 2012-07-20 20:44:01 UTC (rev 4254)
+++ trunk/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidConfiguration.java 2012-07-20 21:09:19 UTC (rev 4255)
@@ -204,7 +204,7 @@
assertEquals(40, opNames.size());
String[] ops = { "add","add-anyauthenticated-role","add-data-role","assign-datasource",
"cache-statistics","cache-types","cancel-request","change-vdb-connection-type",
- "clear-cache","describe","execute-query","get-plan","get-schema", "get-translator","get-vdb",
+ "clear-cache","describe","execute-query","get-query-plan","get-schema", "get-translator","get-vdb",
"list-long-running-requests","list-requests","list-requests-per-session",
"list-requests-per-vdb","list-sessions","list-transactions","list-translators",
"list-vdbs","mark-datasource-available","read-attribute",
11 years, 9 months
teiid SVN: r4254 - in trunk: adminshell/src/main/java/org/teiid/adminshell and 4 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2012-07-20 16:44:01 -0400 (Fri, 20 Jul 2012)
New Revision: 4254
Modified:
trunk/admin/src/main/java/org/teiid/adminapi/Admin.java
trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java
trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java
trunk/engine/pom.xml
trunk/jboss-integration/src/main/java/org/teiid/jboss/Element.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/OperationsConstants.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java
trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties
trunk/metadata/pom.xml
Log:
TEIID-1985: adding get-plan to admin method, and also adding "include-source" paramter for request based methods to retrieve only user level requests
Modified: trunk/admin/src/main/java/org/teiid/adminapi/Admin.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/Admin.java 2012-07-20 20:11:06 UTC (rev 4253)
+++ trunk/admin/src/main/java/org/teiid/adminapi/Admin.java 2012-07-20 20:44:01 UTC (rev 4254)
@@ -307,4 +307,12 @@
* @param typeNamePattern RegEx pattern to filter to names of tables, procedures that are being read. Null means no filter.
*/
String getSchema(String vdbName, int vdbVersion, String modelName, EnumSet<SchemaObjectType> allowedTypes, String typeNamePattern) throws AdminException;
+
+ /**
+ * Get the Query Plan for the given session with provided execution id.
+ * @param sessionId
+ * @param executionId
+ * @return
+ */
+ String getQueryPlan(String sessionId, int executionId) throws AdminException;
}
Modified: trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java 2012-07-20 20:11:06 UTC (rev 4253)
+++ trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java 2012-07-20 20:44:01 UTC (rev 4254)
@@ -1374,6 +1374,23 @@
} catch (Exception e) {
throw new AdminProcessingException(AdminPlugin.Event.TEIID70046, e);
}
+ }
+
+ @Override
+ public String getQueryPlan(String sessionId, int executionId) throws AdminException {
+ final ModelNode request = buildRequest("teiid", "get-plan", "session", sessionId, "execution-id", String.valueOf(executionId));//$NON-NLS-1$
+ if (request == null) {
+ return null;
+ }
+ try {
+ ModelNode outcome = this.connection.execute(request);
+ if (!Util.isSuccess(outcome)) {
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70021, Util.getFailureDescription(outcome));
+ }
+ return outcome.get(RESULT).asString();
+ } catch (Exception e) {
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70022, e);
+ }
}
}
}
Modified: trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java
===================================================================
--- trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java 2012-07-20 20:11:06 UTC (rev 4253)
+++ trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java 2012-07-20 20:44:01 UTC (rev 4254)
@@ -341,6 +341,14 @@
@Doc(text = "models") String... models)
throws AdminException {
getAdmin().restartVDB(vdbName, vdbVersion, models);
+ }
+
+ @Doc(text = "Get query execution plan for the given execution id")
+ public static String getQueryPlan(
+ @Doc(text = "Session Id") String sessionId,
+ @Doc(text = "Execution Id") int executionId)
+ throws AdminException {
+ return getAdmin().getQueryPlan(sessionId, executionId);
}
@Doc(text = "Get the current org.teiid.adminapi.Admin instance for direct use. Note: Used for advanced usecases to bypass AdminShell methods")
Modified: trunk/engine/pom.xml
===================================================================
--- trunk/engine/pom.xml 2012-07-20 20:11:06 UTC (rev 4253)
+++ trunk/engine/pom.xml 2012-07-20 20:44:01 UTC (rev 4254)
@@ -98,13 +98,6 @@
<artifactId>xom</artifactId>
<version>1.2</version>
</dependency>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/Element.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/Element.java 2012-07-20 20:11:06 UTC (rev 4253)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/Element.java 2012-07-20 20:44:01 UTC (rev 4254)
@@ -236,7 +236,10 @@
}
public boolean isDefined(ModelNode node) {
- return node.hasDefined(getModelName());
+ if ( node.hasDefined(getModelName())) {
+ return !asString(node).isEmpty();
+ }
+ return false;
}
public int asInt(ModelNode node) {
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/OperationsConstants.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/OperationsConstants.java 2012-07-20 20:11:06 UTC (rev 4253)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/OperationsConstants.java 2012-07-20 20:44:01 UTC (rev 4254)
@@ -47,4 +47,6 @@
public static final String ENTITY_TYPE = "entity-type"; //$NON-NLS-1$
public static final String ENTITY_PATTERN = "entity-pattern"; //$NON-NLS-1$
+
+ public static final String INCLUDE_SOURCE = "include-source"; //$NON-NLS-1$
}
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2012-07-20 20:11:06 UTC (rev 4253)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2012-07-20 20:44:01 UTC (rev 4254)
@@ -229,10 +229,21 @@
if (!operation.hasDefined(OperationsConstants.SESSION)) {
throw new OperationFailedException(new ModelNode().set(IntegrationPlugin.Util.getString(OperationsConstants.SESSION+MISSING)));
}
+ boolean includeSourceQueries = true;
+ if (operation.hasDefined(OperationsConstants.INCLUDE_SOURCE)) {
+ includeSourceQueries = operation.get(OperationsConstants.INCLUDE_SOURCE).asBoolean();
+ }
ModelNode result = context.getResult();
List<RequestMetadata> requests = engine.getRequestsForSession(operation.get(OperationsConstants.SESSION).asString());
for (RequestMetadata request:requests) {
- VDBMetadataMapper.RequestMetadataMapper.INSTANCE.wrap(request, result.add());
+ if (request.sourceRequest()) {
+ if (includeSourceQueries) {
+ VDBMetadataMapper.RequestMetadataMapper.INSTANCE.wrap(request, result.add());
+ }
+ }
+ else {
+ VDBMetadataMapper.RequestMetadataMapper.INSTANCE.wrap(request, result.add());
+ }
}
}
@@ -240,6 +251,10 @@
operationNode.get(REQUEST_PROPERTIES, OperationsConstants.SESSION, TYPE).set(ModelType.STRING);
operationNode.get(REQUEST_PROPERTIES, OperationsConstants.SESSION, REQUIRED).set(true);
operationNode.get(REQUEST_PROPERTIES, OperationsConstants.SESSION, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.SESSION));
+
+ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.INCLUDE_SOURCE, TYPE).set(ModelType.BOOLEAN);
+ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.INCLUDE_SOURCE, REQUIRED).set(false);
+ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.INCLUDE_SOURCE, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.INCLUDE_SOURCE));
ModelNode reply = operationNode.get(REPLY_PROPERTIES);
reply.get(TYPE).set(ModelType.LIST);
@@ -253,13 +268,30 @@
}
@Override
protected void executeOperation(OperationContext context, DQPCore engine, ModelNode operation) throws OperationFailedException{
+ boolean includeSourceQueries = true;
+ if (operation.hasDefined(OperationsConstants.INCLUDE_SOURCE)) {
+ includeSourceQueries = operation.get(OperationsConstants.INCLUDE_SOURCE).asBoolean();
+ }
+
ModelNode result = context.getResult();
List<RequestMetadata> requests = engine.getRequests();
for (RequestMetadata request:requests) {
- VDBMetadataMapper.RequestMetadataMapper.INSTANCE.wrap(request, result.add());
+ if (request.sourceRequest()) {
+ if (includeSourceQueries) {
+ VDBMetadataMapper.RequestMetadataMapper.INSTANCE.wrap(request, result.add());
+ }
+ }
+ else {
+ VDBMetadataMapper.RequestMetadataMapper.INSTANCE.wrap(request, result.add());
+ }
}
}
protected void describeParameters(ModelNode operationNode, ResourceBundle bundle) {
+
+ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.INCLUDE_SOURCE, TYPE).set(ModelType.BOOLEAN);
+ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.INCLUDE_SOURCE, REQUIRED).set(false);
+ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.INCLUDE_SOURCE, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.INCLUDE_SOURCE));
+
ModelNode reply = operationNode.get(REPLY_PROPERTIES);
reply.get(TYPE).set(ModelType.LIST);
VDBMetadataMapper.RequestMetadataMapper.INSTANCE.describe(reply.get(VALUE_TYPE));
@@ -279,13 +311,25 @@
throw new OperationFailedException(new ModelNode().set(IntegrationPlugin.Util.getString(OperationsConstants.VDB_VERSION+MISSING)));
}
+ boolean includeSourceQueries = true;
+ if (operation.hasDefined(OperationsConstants.INCLUDE_SOURCE)) {
+ includeSourceQueries = operation.get(OperationsConstants.INCLUDE_SOURCE).asBoolean();
+ }
+
ModelNode result = context.getResult();
String vdbName = operation.get(OperationsConstants.VDB_NAME).asString();
int vdbVersion = operation.get(OperationsConstants.VDB_VERSION).asInt();
for (TransportService t: this.transports) {
List<RequestMetadata> requests = t.getRequestsUsingVDB(vdbName,vdbVersion);
for (RequestMetadata request:requests) {
- VDBMetadataMapper.RequestMetadataMapper.INSTANCE.wrap(request, result.add());
+ if (request.sourceRequest()) {
+ if (includeSourceQueries) {
+ VDBMetadataMapper.RequestMetadataMapper.INSTANCE.wrap(request, result.add());
+ }
+ }
+ else {
+ VDBMetadataMapper.RequestMetadataMapper.INSTANCE.wrap(request, result.add());
+ }
}
}
}
@@ -298,7 +342,12 @@
operationNode.get(REQUEST_PROPERTIES, OperationsConstants.VDB_VERSION, TYPE).set(ModelType.INT);
operationNode.get(REQUEST_PROPERTIES, OperationsConstants.VDB_VERSION, REQUIRED).set(true);
operationNode.get(REQUEST_PROPERTIES, OperationsConstants.VDB_VERSION, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.VDB_VERSION));
+
+ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.INCLUDE_SOURCE, TYPE).set(ModelType.BOOLEAN);
+ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.INCLUDE_SOURCE, REQUIRED).set(false);
+ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.INCLUDE_SOURCE, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.INCLUDE_SOURCE));
+
ModelNode reply = operationNode.get(REPLY_PROPERTIES);
reply.get(TYPE).set(ModelType.LIST);
VDBMetadataMapper.RequestMetadataMapper.INSTANCE.describe(reply.get(VALUE_TYPE));
@@ -383,7 +432,7 @@
class GetPlan extends TeiidOperationHandler{
protected GetPlan() {
- super("get-plan"); //$NON-NLS-1$
+ super("get-query-plan"); //$NON-NLS-1$
}
@Override
protected void executeOperation(OperationContext context, DQPCore engine, ModelNode operation) throws OperationFailedException{
Modified: trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties
===================================================================
--- trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2012-07-20 20:11:06 UTC (rev 4253)
+++ trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2012-07-20 20:44:01 UTC (rev 4254)
@@ -254,10 +254,10 @@
cancel-request.execution-id.describe=The Execution Identifier of the query
cancel-request.reply=True if successful; false otherwise.
-get-plan.describe=Get the plan of the actively running query
-get-plan.session.describe=The session Identifier of the user
-get-plan.execution-id.describe=The Execution Identifier of the query
-get-plan.reply=the plan as xml if successful; null otherwise.
+get-query-plan.describe=Get the plan of the actively running query
+get-query-plan.session.describe=The session Identifier of the user
+get-query-plan.execution-id.describe=The Execution Identifier of the query
+get-query-plan.reply=the plan as xml if successful; null otherwise.
change-vdb-connection-type.describe=Change the default VDB version selection
change-vdb-connection-type.vdb-name.describe=VDB Name
@@ -306,6 +306,7 @@
get-schema.reply=schema in the form of DDL
list-requests.describe=List of active requests
+list-requests.include-source.describe=include source queries; defaults to true
list-requests.reply=list of requests
list-sessions.describe=List of all the current active sessions in the Teiid subsystem.
@@ -349,11 +350,13 @@
list-requests-per-session.describe=Current active requests in progress in the query engine for a given session identifier
list-requests-per-session.session.describe=The session Identifier
+list-requests-per-session.include-source.describe=include source queries; defaults to true
list-requests-per-session.reply=requests for given session
list-requests-per-vdb.describe=Current active requests in progress in the query engine for a given VDB name and its version.
list-requests-per-vdb.vdb-name.describe=VDB Name
list-requests-per-vdb.vdb-version.describe=VDB Version
+list-requests-per-vdb.include-source.describe=include source queries; defaults to true
list-requests-per-vdb.reply=list of requests on the given vdb
terminate-session.describe=Terminate the session
Modified: trunk/metadata/pom.xml
===================================================================
--- trunk/metadata/pom.xml 2012-07-20 20:11:06 UTC (rev 4253)
+++ trunk/metadata/pom.xml 2012-07-20 20:44:01 UTC (rev 4254)
@@ -63,13 +63,6 @@
<artifactId>jboss-vfs</artifactId>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
\ No newline at end of file
11 years, 9 months
teiid SVN: r4253 - in trunk: test-integration/common/src/test/java/org/teiid/jdbc and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-07-20 16:11:06 -0400 (Fri, 20 Jul 2012)
New Revision: 4253
Modified:
trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java
trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java
Log:
correcting a testing issue where the wrong vdb may be referenced by the VFS
Modified: trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java
===================================================================
--- trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java 2012-07-20 19:20:16 UTC (rev 4252)
+++ trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java 2012-07-20 20:11:06 UTC (rev 4253)
@@ -39,6 +39,7 @@
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.util.FileUtils;
import org.teiid.core.util.LRUCache;
+import org.teiid.core.util.PropertiesUtils;
import org.teiid.metadata.FunctionMethod;
import org.teiid.query.function.FunctionTree;
import org.teiid.query.function.SystemFunctionManager;
@@ -91,9 +92,10 @@
}
public static IndexMetadataStore loadMetadata(String vdbName, URL url) throws IOException, MalformedURLException, URISyntaxException {
- VirtualFile root = VFS.getChild(vdbName);
+ String fileName = PropertiesUtils.toHex(url.toExternalForm().getBytes());
+ VirtualFile root = VFS.getChild(fileName);
if (!root.exists()) {
- VFS.mountZip(url.openStream(), vdbName, root, TempFileProvider.create("vdbs", Executors.newScheduledThreadPool(2)));
+ VFS.mountZip(url.openStream(), fileName, root, TempFileProvider.create("vdbs", Executors.newScheduledThreadPool(2)));
// once done this mount should be closed, since this class is only used testing
// it is hard to event when the test is done, otherwise we need to elevate the VFS to top
}
Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java 2012-07-20 19:20:16 UTC (rev 4252)
+++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java 2012-07-20 20:11:06 UTC (rev 4253)
@@ -109,7 +109,7 @@
importProperties.setProperty("importer.excludeTables", "VDB\\.SYS\\..*");
importProperties.setProperty("importer.excludeProcedures", "VDB\\..*");
MetadataFactory mf = getMetadata(importProperties, conn);
- assertEquals(String.valueOf(mf.asMetadataStore().getSchemas().get("TEST").getTables()), 17, mf.asMetadataStore().getSchemas().get("TEST").getTables().size());
+ assertEquals(String.valueOf(mf.asMetadataStore().getSchemas().get("TEST").getTables()), 18, mf.asMetadataStore().getSchemas().get("TEST").getTables().size());
assertEquals(0, mf.asMetadataStore().getSchemas().get("TEST").getProcedures().size());
}
11 years, 9 months