getJAXBProperties(){
return super.getJAXBProperties();
}
@@ -143,7 +120,11 @@
}
=
public void setModelType(String modelType) {
- this.modelType =3D modelType;
+ if (modelType !=3D null) {
+ this.modelType =3D modelType.toUpperCase();
+ } else {
+ this.modelType =3D null;
+ }
} =
=
public String toString() {
@@ -255,22 +236,13 @@
this.errors.clear();
}
=
- @XmlAccessorType(XmlAccessType.NONE)
- @XmlType(name =3D "", propOrder =3D {
- "value"
- })
public static class ValidationError implements Serializable{
private static final long serialVersionUID =3D 2044197069467559527L;
=
public enum Severity {ERROR, WARNING};
=
- @XmlValue
protected String value;
- =
- @XmlAttribute(name =3D "severity", required =3D true)
protected String severity;
- =
- @XmlAttribute(name =3D "path")
protected String path;
=
public ValidationError() {};
Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/PropertyMetadat=
a.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/PropertyMetadata.java=
2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/PropertyMetadata.java=
2012-05-01 19:12:27 UTC (rev 4047)
@@ -24,11 +24,6 @@
=
import java.io.Serializable;
=
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
/**
*
* <complexType name=3D"property">
@@ -43,14 +38,10 @@
* =
* =
*/
-(a)XmlAccessorType(XmlAccessType.NONE)
-(a)XmlType(name =3D "property")
public class PropertyMetadata implements Serializable{
private static final long serialVersionUID =3D -5040224539939758816L;
=
- @XmlAttribute(name =3D "name", required =3D true)
protected String name;
- @XmlAttribute(name =3D "value", required =3D true)
protected String value;
=
public PropertyMetadata() {
Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/SourceMappingMe=
tadata.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/SourceMappingMetadata=
.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/SourceMappingMetadata=
.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -24,23 +24,11 @@
=
import java.io.Serializable;
=
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-(a)XmlAccessorType(XmlAccessType.NONE)
-(a)XmlType(name =3D "")
public class SourceMappingMetadata implements Serializable {
private static final long serialVersionUID =3D -4417878417697685794L;
=
- @XmlAttribute(name =3D "name", required =3D true)
private String name;
- =
- @XmlAttribute(name =3D "connection-jndi-name")
private String jndiName;
- =
- @XmlAttribute(name =3D "translator-name",required =3D true)
private String translatorName;
=
public SourceMappingMetadata() {}
Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java 2012=
-05-01 15:19:22 UTC (rev 4046)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java 2012=
-05-01 19:12:27 UTC (rev 4047)
@@ -24,8 +24,6 @@
import java.net.URL;
import java.util.*;
=
-import javax.xml.bind.annotation.*;
-
import org.teiid.adminapi.DataPolicy;
import org.teiid.adminapi.Model;
import org.teiid.adminapi.Translator;
@@ -34,15 +32,6 @@
import org.teiid.core.util.StringUtil;
=
=
-(a)XmlAccessorType(XmlAccessType.NONE)
-(a)XmlType(name =3D "", propOrder =3D {
- "description",
- "JAXBProperties",
- "models",
- "translators",
- "dataPolicies"
-})
-(a)XmlRootElement(name =3D "vdb")
public class VDBMetaData extends AdminObjectImpl implements VDB {
=
private static final String VERSION_DELIM =3D "."; //$NON-NLS-1$
@@ -53,7 +42,6 @@
* This simulating a list over a map. JAXB requires a list and performanc=
e recommends
* map and we would like to keep one variable to represent both. =
*/
- @XmlElement(name =3D "model", required =3D true, type =3D ModelMetaData.c=
lass)
protected ListOverMap models =3D new ListOverMap(new KeyBuilder() {
private static final long serialVersionUID =3D 846247100420118961L;
=
@@ -63,7 +51,6 @@
}
});
=
- @XmlElement(name =3D "translator", required =3D true, type =3D VDBTransla=
torMetaData.class)
protected ListOverMap translators =3D new ListOver=
Map(new KeyBuilder() {
private static final long serialVersionUID =3D 3890502172003653563L;
=
@@ -73,7 +60,6 @@
}
}); =
=
- @XmlElement(name =3D "data-role", required =3D true, type =3D DataPolicyM=
etadata.class)
protected ListOverMap dataPolicies =3D new ListOverMa=
p(new KeyBuilder() {
private static final long serialVersionUID =3D 4954591545242715254L;
=
@@ -83,10 +69,8 @@
}
}); =
=
- @XmlAttribute(name =3D "version", required =3D true)
private int version =3D 1;
=
- @XmlElement(name =3D "description")
protected String description;
=
private String fileUrl =3D null;
@@ -96,7 +80,6 @@
private boolean removed;
private long queryTimeout =3D Long.MIN_VALUE;
=
- @XmlAttribute(name =3D "name", required =3D true)
public String getName() {
return super.getName();
}
@@ -300,7 +283,6 @@
=
// This one manages the JAXB binding
@Override
- @XmlElement(name =3D "property", type =3D PropertyMetadata.class)
public List getJAXBProperties(){
return super.getJAXBProperties();
}
Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataPars=
er.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.jav=
a 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.jav=
a 2012-05-01 19:12:27 UTC (rev 4047)
@@ -39,7 +39,6 @@
=
import org.teiid.adminapi.AdminPlugin;
import org.teiid.adminapi.DataPolicy;
-import org.teiid.adminapi.Model;
import org.teiid.adminapi.Translator;
import org.teiid.adminapi.impl.DataPolicyMetadata.PermissionMetaData;
import org.teiid.adminapi.impl.ModelMetaData.ValidationError;
@@ -219,7 +218,7 @@
private static void parseModel(XMLStreamReader reader, ModelMetaData mode=
l) throws XMLStreamException {
Properties props =3D getAttributes(reader);
model.setName(props.getProperty(Element.NAME.getLocalName()));
- model.setModelType(Model.Type.valueOf(props.getProperty(Element.TYPE.get=
LocalName(), "PHYSICAL")));
+ model.setModelType(props.getProperty(Element.TYPE.getLocalName(), "PHYSI=
CAL"));
model.setVisible(Boolean.parseBoolean(props.getProperty(Element.VISIBLE.=
getLocalName(), "true")));
model.setPath(props.getProperty(Element.PATH.getLocalName()));
=
Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBTranslatorMe=
taData.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBTranslatorMetaData=
.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBTranslatorMetaData=
.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -23,15 +23,9 @@
=
import java.util.List;
=
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
import org.teiid.adminapi.Translator;
=
=
-(a)XmlAccessorType(XmlAccessType.NONE)
public class VDBTranslatorMetaData extends AdminObjectImpl implements Tran=
slator {
private static final long serialVersionUID =3D -3454161477587996138L;
private String type;
@@ -44,7 +38,6 @@
return super.getName();
} =
=
- @XmlAttribute(name =3D "name", required =3D true)
public void setName(String name) {
super.setName(name);
}
@@ -54,13 +47,11 @@
return type;
}
=
- @XmlAttribute(name =3D "type",required =3D true)
public void setType(String type) {
this.type =3D type;
} =
=
@Override
- @XmlElement(name =3D "property", type =3D PropertyMetadata.class)
public List getJAXBProperties(){
return super.getJAXBProperties();
} =
@@ -82,7 +73,6 @@
return this.description;
}
=
- @XmlAttribute(name =3D "description")
public void setDescription(String desc) {
this.description =3D desc;
}
Modified: trunk/admin/src/test/java/org/teiid/adminapi/impl/TestModelMetaDa=
ta.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/admin/src/test/java/org/teiid/adminapi/impl/TestModelMetaData.jav=
a 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/admin/src/test/java/org/teiid/adminapi/impl/TestModelMetaData.jav=
a 2012-05-01 19:12:27 UTC (rev 4047)
@@ -34,7 +34,7 @@
public void testModelType() {
=
ModelMetaData model =3D new ModelMetaData();
- model.modelType =3D "physical";
+ model.setModelType("physical");
=
assertTrue(model.getModelType() =3D=3D Model.Type.PHYSICAL);
assertTrue(model.isSource());
Modified: trunk/admin/src/test/java/org/teiid/adminapi/impl/TestVDBMetaData=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/admin/src/test/java/org/teiid/adminapi/impl/TestVDBMetaData.java =
2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/admin/src/test/java/org/teiid/adminapi/impl/TestVDBMetaData.java =
2012-05-01 19:12:27 UTC (rev 4047)
@@ -30,13 +30,6 @@
import java.util.Arrays;
import java.util.List;
=
-import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-
import org.jboss.dmr.ModelNode;
import org.junit.Test;
import org.teiid.adminapi.DataPolicy;
@@ -49,33 +42,7 @@
=
@SuppressWarnings("nls")
public class TestVDBMetaData {
-
=
- public void testMarshellUnmarshellUsingJaxb() throws Exception {
- =
- VDBMetaData vdb =3D buildVDB();
- =
- SchemaFactory schemaFactory =3D SchemaFactory.newInstance(XMLConstants.W=
3C_XML_SCHEMA_NS_URI);
- Schema schema =3D schemaFactory.newSchema(VDBMetaData.class.getRes=
ource("/vdb-deployer.xsd")); //$NON-NLS-1$
- JAXBContext jc =3D JAXBContext.newInstance(new Class[] {VDBMetaData.c=
lass});
- Marshaller marshell =3D jc.createMarshaller();
- marshell.setSchema(schema);
- marshell.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT,new Boolean(true));
- =
- StringWriter sw =3D new StringWriter();
- marshell.marshal(vdb, sw);
- =
- //System.out.println(sw.toString());
-
- // UnMarshell
- Unmarshaller un =3D jc.createUnmarshaller();
- un.setSchema(schema);
- vdb =3D (VDBMetaData)un.unmarshal(new StringReader(sw.toString()));
- =
- validateVDB(vdb);
- }
- =
- =
@Test
public void testMarshellUnmarshellDirectParsing() throws Exception {
=
Property changes on: trunk/adminshell/src/main/java/groovy
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/groovy:3535-3555*
/branches/7.6.x/adminshell/src/main/java/groovy:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/java/groovy:3816-3868*,3876-3915*,3920-=
3983*
/trunk/adminshell/src/main/java/groovy:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/groovy:3535-3555*
/branches/7.6.x/adminshell/src/main/java/groovy:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/java/groovy:3816-3868*,3876-3915*,3920-=
3983*
/branches/8.0.x/adminshell/src/main/java/groovy:4002-4046*
/trunk/adminshell/src/main/java/groovy:3507-3666
Property changes on: trunk/adminshell/src/main/java/groovy/sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/groovy/sql:3535-3555*
/branches/7.6.x/adminshell/src/main/java/groovy/sql:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/java/groovy/sql:3816-3868*,3876-3915*,3=
920-3983*
/trunk/adminshell/src/main/java/groovy/sql:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/groovy/sql:3535-3555*
/branches/7.6.x/adminshell/src/main/java/groovy/sql:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/java/groovy/sql:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/adminshell/src/main/java/groovy/sql:4002-4046*
/trunk/adminshell/src/main/java/groovy/sql:3507-3666
Property changes on: trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3535=
-3555
/branches/7.6.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3673-3711=
,3754-3769
/branches/7.7.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3816-3868=
,3876-3915,3920-3983
/trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3535=
-3555
/branches/7.6.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3673-3711=
,3754-3769
/branches/7.7.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3816-3868=
,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:4002-4046
/trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java:3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell:3535-355=
5*
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell:3673-3711*,37=
54-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell:3816-3868*,38=
76-3915*,3920-3983*
/trunk/adminshell/src/main/java/org/teiid/adminshell:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell:3535-355=
5*
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell:3673-3711*,37=
54-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell:3816-3868*,38=
76-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell:4002-4046*
/trunk/adminshell/src/main/java/org/teiid/adminshell:3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/Ad=
minHelpCommand.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminHel=
pCommand.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpComm=
and.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpComm=
and.java:3816-3868,3876-3915,3920-3983
/trunk/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:=
3507-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminHel=
pCommand.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpComm=
and.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpComm=
and.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpComm=
and.java:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:=
3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/Ad=
minShell.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShe=
ll.java:2901-2940
/branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.ja=
va:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.ja=
va:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.ja=
va:3816-3868,3876-3915,3920-3983
/trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3188-3=
450,3452-3666
+ /branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShe=
ll.java:2901-2940
/branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.ja=
va:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.ja=
va:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.ja=
va:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3188-3=
450,3452-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/Gr=
oovyAdminConsole.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAd=
minConsole.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminCo=
nsole.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminCo=
nsole.java:3816-3868,3876-3915,3920-3983
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.jav=
a:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAd=
minConsole.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminCo=
nsole.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminCo=
nsole.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminCo=
nsole.java:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.jav=
a:3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/Gr=
oovyAdminShell.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAd=
minShell.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminSh=
ell.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminSh=
ell.java:3816-3868,3876-3915,3920-3983
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:=
3507-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAd=
minShell.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminSh=
ell.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminSh=
ell.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminSh=
ell.java:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:=
3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/Gr=
oovySqlExtensions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovySq=
lExtensions.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExte=
nsions.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExte=
nsions.java:3816-3868,3876-3915,3920-3983
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.ja=
va:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovySq=
lExtensions.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExte=
nsions.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExte=
nsions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExte=
nsions.java:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.ja=
va:3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/He=
lp.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/Help.jav=
a:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:367=
3-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:381=
6-3868,3876-3915,3920-3983
/trunk/adminshell/src/main/java/org/teiid/adminshell/Help.java:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/Help.jav=
a:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:367=
3-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:400=
2-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/Help.java:3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/Mi=
grationUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/Migratio=
nUtil.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil=
.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil=
.java:3816-3868,3876-3915,3920-3983
/trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:350=
7-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/Migratio=
nUtil.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil=
.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil=
.java:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:350=
7-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/Sq=
lHelpCommand.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpC=
ommand.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpComman=
d.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpComman=
d.java:3816-3868,3876-3915,3920-3983
/trunk/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:35=
07-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpC=
ommand.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpComman=
d.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpComman=
d.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpComman=
d.java:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:35=
07-3666
Property changes on: trunk/adminshell/src/main/resources/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org:3816-3868*,3876-3915*,392=
0-3983*
/trunk/adminshell/src/main/resources/org:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org:3816-3868*,3876-3915*,392=
0-3983*
/branches/8.0.x/adminshell/src/main/resources/org:4002-4046*
/trunk/adminshell/src/main/resources/org:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/codehaus
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/codehaus:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus:3673-3711*,3754-=
3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus:3816-3868*,3876-=
3915*,3920-3983*
/trunk/adminshell/src/main/resources/org/codehaus:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/codehaus:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus:3673-3711*,3754-=
3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus:3816-3868*,3876-=
3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/codehaus:4002-4046*
/trunk/adminshell/src/main/resources/org/codehaus:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groovy
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy:3535=
-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy:3673-3711=
*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy:3816-3868=
*,3876-3915*,3920-3983*
/trunk/adminshell/src/main/resources/org/codehaus/groovy:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy:3535=
-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy:3673-3711=
*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy:3816-3868=
*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy:4002-4046*
/trunk/adminshell/src/main/resources/org/codehaus/groovy:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groov=
y/tools
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tool=
s:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools:367=
3-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools:381=
6-3868*,3876-3915*,3920-3983*
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tool=
s:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools:367=
3-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools:381=
6-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy/tools:400=
2-4046*
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groov=
y/tools/shell
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tool=
s/shell:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll:3816-3868*,3876-3915*,3920-3983*
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3507-3=
666
+ /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tool=
s/shell:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll:4002-4046*
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3507-3=
666
Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groov=
y/tools/shell/commands.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tool=
s/shell/commands.xml:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll/commands.xml:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll/commands.xml:3816-3868,3876-3915,3920-3983
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/comman=
ds.xml:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tool=
s/shell/commands.xml:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll/commands.xml:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll/commands.xml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll/commands.xml:4002-4046
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/comman=
ds.xml:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid:3816-3868*,3876-391=
5*,3920-3983*
/trunk/adminshell/src/main/resources/org/teiid:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid:3816-3868*,3876-391=
5*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/teiid:4002-4046*
/trunk/adminshell/src/main/resources/org/teiid:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/teiid/adminshe=
ll
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell:353=
5-3555*
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell:3673-371=
1*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell:3816-386=
8*,3876-3915*,3920-3983*
/trunk/adminshell/src/main/resources/org/teiid/adminshell:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell:353=
5-3555*
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell:3673-371=
1*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell:3816-386=
8*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/teiid/adminshell:4002-404=
6*
/trunk/adminshell/src/main/resources/org/teiid/adminshell:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/teiid/adminshe=
ll/AdminHelpCommand.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/Adm=
inHelpCommand.properties:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHel=
pCommand.properties:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHel=
pCommand.properties:3816-3868,3876-3915,3920-3983
/trunk/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.=
properties:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/Adm=
inHelpCommand.properties:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHel=
pCommand.properties:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHel=
pCommand.properties:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHel=
pCommand.properties:4002-4046
/trunk/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.=
properties:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/teiid/adminshe=
ll/SqlHelpCommand.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/Sql=
HelpCommand.properties:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpC=
ommand.properties:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpC=
ommand.properties:3816-3868,3876-3915,3920-3983
/trunk/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.pr=
operties:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/Sql=
HelpCommand.properties:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpC=
ommand.properties:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpC=
ommand.properties:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpC=
ommand.properties:4002-4046
/trunk/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.pr=
operties:3507-3666
Property changes on: trunk/adminshell/src/test/java/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/test/java/org:3535-3555*
/branches/7.6.x/adminshell/src/test/java/org:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/test/java/org:3816-3868*,3876-3915*,3920-398=
3*
/trunk/adminshell/src/test/java/org:3507-3666
+ /branches/7.4.x/adminshell/src/test/java/org:3535-3555*
/branches/7.6.x/adminshell/src/test/java/org:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/test/java/org:3816-3868*,3876-3915*,3920-398=
3*
/branches/8.0.x/adminshell/src/test/java/org:4002-4046*
/trunk/adminshell/src/test/java/org:3507-3666
Property changes on: trunk/adminshell/src/test/java/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/test/java/org/teiid:3535-3555*
/branches/7.6.x/adminshell/src/test/java/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/test/java/org/teiid:3816-3868*,3876-3915*,39=
20-3983*
/trunk/adminshell/src/test/java/org/teiid:3507-3666
+ /branches/7.4.x/adminshell/src/test/java/org/teiid:3535-3555*
/branches/7.6.x/adminshell/src/test/java/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/test/java/org/teiid:3816-3868*,3876-3915*,39=
20-3983*
/branches/8.0.x/adminshell/src/test/java/org/teiid:4002-4046*
/trunk/adminshell/src/test/java/org/teiid:3507-3666
Property changes on: trunk/adminshell/src/test/java/org/teiid/adminshell
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell:3535-355=
5*
/branches/7.6.x/adminshell/src/test/java/org/teiid/adminshell:3673-3711*,37=
54-3769
/branches/7.7.x/adminshell/src/test/java/org/teiid/adminshell:3816-3868*,38=
76-3915*,3920-3983*
/trunk/adminshell/src/test/java/org/teiid/adminshell:3507-3666
+ /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell:3535-355=
5*
/branches/7.6.x/adminshell/src/test/java/org/teiid/adminshell:3673-3711*,37=
54-3769
/branches/7.7.x/adminshell/src/test/java/org/teiid/adminshell:3816-3868*,38=
76-3915*,3920-3983*
/branches/8.0.x/adminshell/src/test/java/org/teiid/adminshell:4002-4046*
/trunk/adminshell/src/test/java/org/teiid/adminshell:3507-3666
Property changes on: trunk/adminshell/src/test/java/org/teiid/adminshell/Te=
stAdminShell.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell/TestAdmi=
nShell.java:3535-3555
/branches/7.6.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShel=
l.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShel=
l.java:3816-3868,3876-3915,3920-3983
/trunk/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:35=
07-3666
+ /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell/TestAdmi=
nShell.java:3535-3555
/branches/7.6.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShel=
l.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShel=
l.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShel=
l.java:4002-4046
/trunk/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:35=
07-3666
Property changes on: trunk/adminshell/src/test/resources/foo
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/test/resources/foo:3535-3555*
/branches/7.6.x/adminshell/src/test/resources/foo:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/test/resources/foo:3816-3868*,3876-3915*,392=
0-3983*
/trunk/adminshell/src/test/resources/foo:3507-3666
+ /branches/7.4.x/adminshell/src/test/resources/foo:3535-3555*
/branches/7.6.x/adminshell/src/test/resources/foo:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/test/resources/foo:3816-3868*,3876-3915*,392=
0-3983*
/branches/8.0.x/adminshell/src/test/resources/foo:4002-4046*
/trunk/adminshell/src/test/resources/foo:3507-3666
Property changes on: trunk/adminshell/src/test/resources/foo/bar.txt
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/test/resources/foo/bar.txt:3535-3555
/branches/7.6.x/adminshell/src/test/resources/foo/bar.txt:3673-3711,3754-37=
69
/branches/7.7.x/adminshell/src/test/resources/foo/bar.txt:3816-3868,3876-39=
15,3920-3983
/trunk/adminshell/src/test/resources/foo/bar.txt:3507-3666
+ /branches/7.4.x/adminshell/src/test/resources/foo/bar.txt:3535-3555
/branches/7.6.x/adminshell/src/test/resources/foo/bar.txt:3673-3711,3754-37=
69
/branches/7.7.x/adminshell/src/test/resources/foo/bar.txt:3816-3868,3876-39=
15,3920-3983
/branches/8.0.x/adminshell/src/test/resources/foo/bar.txt:4002-4046
/trunk/adminshell/src/test/resources/foo/bar.txt:3507-3666
Property changes on: trunk/api/src/main/java/org/teiid/events
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/api/src/main/java/org/teiid/events:3535-3555*
/branches/7.6.x/api/src/main/java/org/teiid/events:3673-3711*,3754-3769
/branches/7.7.x/api/src/main/java/org/teiid/events:3816-3868*,3876-3915*,39=
20-3983*
/trunk/api/src/main/java/org/teiid/events:3507-3666
+ /branches/7.4.x/api/src/main/java/org/teiid/events:3535-3555*
/branches/7.6.x/api/src/main/java/org/teiid/events:3673-3711*,3754-3769
/branches/7.7.x/api/src/main/java/org/teiid/events:3816-3868*,3876-3915*,39=
20-3983*
/branches/8.0.x/api/src/main/java/org/teiid/events:4002-4046*
/trunk/api/src/main/java/org/teiid/events:3507-3666
Property changes on: trunk/api/src/main/java/org/teiid/events/EventDistribu=
tor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributor.ja=
va:3340-3349,3535-3555
/branches/7.6.x/api/src/main/java/org/teiid/events/EventDistributor.java:36=
73-3711,3754-3769
/branches/7.7.x/api/src/main/java/org/teiid/events/EventDistributor.java:38=
16-3868,3876-3915,3920-3983
/trunk/api/src/main/java/org/teiid/events/EventDistributor.java:3188-3450,3=
452-3666
+ /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributor.ja=
va:3340-3349,3535-3555
/branches/7.6.x/api/src/main/java/org/teiid/events/EventDistributor.java:36=
73-3711,3754-3769
/branches/7.7.x/api/src/main/java/org/teiid/events/EventDistributor.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/api/src/main/java/org/teiid/events/EventDistributor.java:40=
02-4046
/trunk/api/src/main/java/org/teiid/events/EventDistributor.java:3188-3450,3=
452-3666
Property changes on: trunk/api/src/main/java/org/teiid/events/EventDistribu=
torFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributorFac=
tory.java:3535-3555
/branches/7.6.x/api/src/main/java/org/teiid/events/EventDistributorFactory.=
java:3673-3711,3754-3769
/branches/7.7.x/api/src/main/java/org/teiid/events/EventDistributorFactory.=
java:3816-3868,3876-3915,3920-3983
/trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3507=
-3666
+ /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributorFac=
tory.java:3535-3555
/branches/7.6.x/api/src/main/java/org/teiid/events/EventDistributorFactory.=
java:3673-3711,3754-3769
/branches/7.7.x/api/src/main/java/org/teiid/events/EventDistributorFactory.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/api/src/main/java/org/teiid/events/EventDistributorFactory.=
java:4002-4046
/trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3507=
-3666
Modified: trunk/api/src/main/java/org/teiid/metadata/FunctionMethod.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/api/src/main/java/org/teiid/metadata/FunctionMethod.java 2012-05-=
01 15:19:22 UTC (rev 4046)
+++ trunk/api/src/main/java/org/teiid/metadata/FunctionMethod.java 2012-05-=
01 19:12:27 UTC (rev 4047)
@@ -26,9 +26,6 @@
import java.util.Arrays;
import java.util.List;
=
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
import org.teiid.core.util.EquivalenceUtil;
import org.teiid.core.util.HashCodeUtil;
=
@@ -108,7 +105,6 @@
=
private Determinism determinism =3D Determinism.DETERMINISTIC;
=
- @XmlElement(name=3D"inputParameters")
protected List inParameters =3D new ArrayList(2);
private FunctionParameter outputParameter;
private Schema parent;
@@ -154,7 +150,6 @@
* Return name of method
* @return Name
*/
- @XmlAttribute
public String getName() {
return super.getName();
}
@@ -180,7 +175,6 @@
* Get description of method
* @return Description
*/
- @XmlAttribute
public String getDescription() { =
return this.description;
} =
@@ -198,7 +192,6 @@
* @return Category
* @see FunctionCategoryConstants
*/
- @XmlAttribute
public String getCategory() { =
return this.category;
} =
@@ -228,7 +221,6 @@
this.pushdown =3D pushdown;
}
=
- @XmlAttribute
public void setPushDown(String pushdown) {
if (pushdown !=3D null) {
if (pushdown.equals(REQUIRED)) {
@@ -247,7 +239,6 @@
* Get invocation class name
* @return Invocation class name
*/
- @XmlAttribute
public String getInvocationClass() { =
return this.invocationClass;
} =
@@ -264,7 +255,6 @@
* Get invocation method name
* @return Invocation method name
*/
- @XmlAttribute
public String getInvocationMethod() { =
return this.invocationMethod;
} =
@@ -312,7 +302,6 @@
* Get ouput parameter.
* @return Output parameter or return argument
*/
- @XmlElement(name=3D"returnParameter")
public FunctionParameter getOutputParameter() { =
return this.outputParameter;
}
@@ -448,7 +437,6 @@
return this.determinism;
}
=
- @XmlAttribute(name=3D"deterministic")
public void setDeterministicBoolean(boolean deterministic) {
this.determinism =3D deterministic ? Determinism.DETERMINISTIC : Dete=
rminism.NONDETERMINISTIC;
}
Modified: trunk/api/src/main/java/org/teiid/metadata/FunctionParameter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/api/src/main/java/org/teiid/metadata/FunctionParameter.java 2012-=
05-01 15:19:22 UTC (rev 4046)
+++ trunk/api/src/main/java/org/teiid/metadata/FunctionParameter.java 2012-=
05-01 19:12:27 UTC (rev 4047)
@@ -24,9 +24,6 @@
=
import java.io.Serializable;
=
-import javax.xml.bind.annotation.XmlAttribute;
-
-
/**
* A function parameter defines the name and description of an input or ou=
tput
* parameter for a function. The name should not be null, but that is not =
@@ -81,7 +78,6 @@
* Return name of parameter.
* @return Name
*/
- @XmlAttribute
public String getName() {
return this.name;
}
@@ -98,7 +94,6 @@
* Get description of parameter
* @return Description
*/
- @XmlAttribute
public String getDescription() { =
return this.description;
} =
@@ -116,7 +111,6 @@
* @return Type name
* @see org.teiid.core.types.DataTypeManager.DefaultDataTypes
*/
- @XmlAttribute
public String getType() { =
return this.type;
} =
Modified: trunk/api/src/main/java/org/teiid/metadata/MetadataStore.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/api/src/main/java/org/teiid/metadata/MetadataStore.java 2012-05-0=
1 15:19:22 UTC (rev 4046)
+++ trunk/api/src/main/java/org/teiid/metadata/MetadataStore.java 2012-05-0=
1 19:12:27 UTC (rev 4047)
@@ -47,11 +47,7 @@
}
=
public Schema getSchema(String name) {
- Schema s =3D this.schemas.get(name);
- if (s =3D=3D null) {
- s =3D this.schemas.get(name.toUpperCase());
- }
- return s;
+ return this.schemas.get(name);
}
=
public void addSchema(Schema schema) {
Modified: trunk/api/src/main/java/org/teiid/translator/BaseDelegatingExecut=
ionFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFac=
tory.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFac=
tory.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -192,18 +192,10 @@
return delegate.supportsBatchedUpdates();
}
@Override
- public boolean supportsBetweenCriteria() {
- return delegate.supportsBetweenCriteria();
- }
- @Override
public boolean supportsBulkUpdate() {
return delegate.supportsBulkUpdate();
}
@Override
- public boolean supportsCaseExpressions() {
- return delegate.supportsCaseExpressions();
- }
- @Override
public boolean supportsCommonTableExpressions() {
return delegate.supportsCommonTableExpressions();
}
Modified: trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012=
-05-01 15:19:22 UTC (rev 4046)
+++ trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012=
-05-01 19:12:27 UTC (rev 4047)
@@ -377,15 +377,6 @@
}
=
/** =
- * Support indicates connector accepts criteria of form (element BETWE=
EN constant AND constant)
- * WHEN ... END
- * ... END
* @since 4.0
*/
@@ -685,7 +666,10 @@
/**
* Get list of all supported function names. Arithmetic functions hav=
e names like
* "+". =
- * @see SourceSystemFunctions
+ * @see SourceSystemFunctions for a listing of system pushdown functio=
ns. Note that
+ * not all system functions are listed as some functions will use a co=
mmon name
+ * such as CONCAT vs. the || operator, and other functions will be rew=
ritten and
+ * not pushed down, such as SPACE.
* @since 3.1 SP3 =
*/ =
public List getSupportedFunctions() {
Modified: trunk/api/src/main/java/org/teiid/translator/SourceSystemFunction=
s.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/api/src/main/java/org/teiid/translator/SourceSystemFunctions.java=
2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/api/src/main/java/org/teiid/translator/SourceSystemFunctions.java=
2012-05-01 19:12:27 UTC (rev 4047)
@@ -27,6 +27,10 @@
* The names and function forms follow the Open Group CLI functions, with =
a few exceptions
* (such as lpad, rpad, bitand, bitor, etc. which are most notably support=
ed by Oracle).
* =
+ * Note that not all system functions are listed as some functions will us=
e a common name
+ * such as CONCAT vs. the || operator, and other functions will be rewritt=
en and
+ * not pushed down, such as SPACE.
+ * =
*/
public class SourceSystemFunctions {
=
Property changes on: trunk/build/kits
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/build/kits:3535-3555*
/branches/7.6.x/build/kits:3673-3711*,3754-3769
/branches/7.7.x/build/kits:3816-3868,3876-3915,3920-3983
/trunk/build/kits:3507-3666
+ /branches/7.4.x/build/kits:3535-3555*
/branches/7.6.x/build/kits:3673-3711*,3754-3769
/branches/7.7.x/build/kits:3816-3868,3876-3915,3920-3983
/branches/8.0.x/build/kits:4002-4046
/trunk/build/kits:3507-3666
Property changes on: trunk/build/kits/adminshell
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/build/kits/adminshell:3535-3555
/branches/7.6.x/build/kits/adminshell:3673-3711,3754-3769
/branches/7.7.x/build/kits/adminshell:3816-3868,3876-3915,3920-3983
/trunk/build/kits/adminshell:3507-3666
+ /branches/7.4.x/build/kits/adminshell:3535-3555
/branches/7.6.x/build/kits/adminshell:3673-3711,3754-3769
/branches/7.7.x/build/kits/adminshell:3816-3868,3876-3915,3920-3983
/branches/8.0.x/build/kits/adminshell:4002-4046
/trunk/build/kits/adminshell:3507-3666
Modified: trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-05-0=
1 15:19:22 UTC (rev 4046)
+++ trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-05-0=
1 19:12:27 UTC (rev 4047)
@@ -48,6 +48,8 @@
Greenplum Translator - for use with the Greenplum database.
Enhanced parse/format pushdown - added more built-in support =
and extension points for parse/format function pushdown. Added parse/forma=
t timestamp handling for SQLServer, Sybase, Oracle, and PostgreSQL.
User Defined Aggregates - user defined aggregate functions ca=
n be defined via extension metadata, DDL, or connector metadata. =
+ SET PAYLOAD statement - SET PAYLOAD can be used to set a name=
value pair on a session scoped payload that will be sent with requests.
+ ENCRYPT REQUESTS - encryptRequests may be used as a connectio=
n/datasource property when not using SSL to indicate that request messgaes =
and any associated payload should be encrypted.
=
@@ -74,12 +76,15 @@
The translator API facilities for iterator/bulk updates were combine=
d and updated. Multi-valued literals were replaced by the Parameter class =
with an associated value iterator =
available on the BatchedCommand. The IteratorValueSource class was =
also removed.
VARBINARY, OPTIONS, and OUT were added as reserved words.
- AbstractMetadataRecord and its sub-classes use a case-insensitive ma=
p for properties rather than a LinkedHashMap. Thus, property key lookups a=
re now case-insensitive. =
+ AbstractMetadataRecord and its sub-classes use a case-insensitive ma=
p for properties rather than a LinkedHashMap. Thus, property key lookups a=
re now case-insensitive.
+ Removed the unused ExecutionFactory methods supportsBetweenCriteria =
and supportsCaseExpression. =
=
from 7.7
parse/formatdate and parse/formattime are no longer pushdown functio=
ns. They are converted into parse/formattimestamp.
+ SQLWarning exception chains attached to the ExecutionContext will be=
returned as a single TeiidSQLWarning rather than as individual TeiidSQLWar=
nings. See the TeiidSQLWarning javadocs
+for how to access the underlying SQLWarning chains.
=
from 7.5
@@ -227,7 +232,279 @@
=
Detailed Release Notes - Teiid - Version ${project.version}
+ =
+ Bug
+
+
+[TEIID-7 ] - =
Control of BigDecimal precision and scale
+
+[TEIID-17 ] - =
Root criteria with sibling roots
+
+[TEIID-32 ] - =
Support null values in proc relational joins
+
+[TEIID-37 ] - =
Parse function for XSD datatypes for Web service procedures
+
+[TEIID-42 ] - =
Correlated subqueries in XML criteria
+
+[TEIID-63 ] - =
Recursion Editor RECORD Feature When Limit Exceeded Does Not Work
+
+[TEIID-69 ] - =
Fully implement Hash Join
+
+[TEIID-102 ] =
- Metadata search with * or ? may return the wrong results
+
+[TEIID-122 ] =
- Min/Max cardinality should be enforced during document generation
+
+[TEIID-987 ] =
- Problem regarding how often availability is called on the Facet
+
+[TEIID-1058 =
] - SessionCleanupThread causes deadlocks when server is clustered
+
+[TEIID-1371 =
] - Translator does not unload correctly
+
+[TEIID-1465 =
] - Join between char and varchar
+
+[TEIID-1600 =
] - Exact numeric issues
+
+[TEIID-1838 =
] - Change to source model connection through AdminApi using assign=
ToModel() does not reflect in jdbc queries to that source model
+
+[TEIID-1863 =
] - Default Salesforce URL in teiid-connector-salesforce.rar needs =
update to SF v22
+
+[TEIID-1864 =
] - TIMESTAMPADD of SQL_TSI_FRAC_SECOND fails for Sybase 15 with JC=
onnect 6.0.5 driver
+
+[TEIID-1867 =
] - Duplicate metadata for multisource models
+
+[TEIID-1868 =
] - Internal Materialized View - Load/Refresh and Assertion Failed
+
+[TEIID-1869 =
] - Simple capabilities with PostgreSQL 8.3 using decodeinteger cau=
ses comm failure
+
+[TEIID-1870 =
] - Querying random number from DB2 v97 does not push down to source
+
+[TEIID-1871 =
] - Teiid is handling MySQL5.0 returning DAYNAME as a blob
+
+[TEIID-1872 =
] - Implicit temp table creation fails with insert and explicit col=
umns
+
+[TEIID-1873 =
] - Security documentation does not provide adequate information to=
integrate additional domains for authentication
+
+[TEIID-1876 =
] - Netezza translator using INTNNOT when it should use INT4NOT
+
+[TEIID-1878 =
] - Problem with accessing custom generated materialized views
+
+[TEIID-1879 =
] - Teradata Query Testing - Unhandled exception causing SOCKET CLO=
SED condition
+
+[TEIID-1882 =
] - EOFException with 7.6 client against a 7.4 server
+
+[TEIID-1883 =
] - Query timeout is superceded by synch ttl
+
+[TEIID-1884 =
] - COMMAND Logging incorrectly reporting END USER COMMAND record c=
ount in EDS for forward only resultsets
+
+[TEIID-1895 =
] - Properly escape the column references for Excel based data
+
+[TEIID-1899 =
] - Getting Assertion when running Inner Merge Join query with SELE=
CT COUNT(*) on top
+
+[TEIID-1900 =
] - Teiid client jar file is not complete: NoClassDefFoundError: or=
g/jboss/modules/ModuleLoadException
+
+[TEIID-1904 =
] - Prepared statement for SOURCE_NAME in multi-source mode throws =
exception Message:Unable to evaluate
+
+[TEIID-1905 =
] - Dymamic VDB does not work in 8.0
+
+[TEIID-1906 =
] - Settting a VDB with data roles from Teiid Designer 7.5 iand dep=
loying to Teiid 8 get a parser error
+
+[TEIID-1907 =
] - SQLStringVisitor should create call visitNode on Select
+
+[TEIID-1937 =
] - teiid encouters java.io.StreamCorruptedException
+
+[TEIID-1952 =
] - Oracle native driver preparedstatement char parameters are requ=
ired to be padded
+
+[TEIID-1953 =
] - Greenplum DB - BQT correlated subquery failures
+
+[TEIID-1954 =
] - System Schema does not show metadata for Indexes in the SYS.Key=
s or SYS.KeyColumns table
+
+[TEIID-1956 =
] - WHERE clause throws org.teiid.jdbc.TeiidSQLException: Index: 2,=
Size: 1
+
+[TEIID-1957 =
] - Resource Adapter's not passing deployment the validation ch=
ecks in 7.1.0-Final
+
+[TEIID-1960 =
] - Client recieving java.lang.IndexOutOfBoundsException in =
+
+[TEIID-1961 =
] - A translator override that is not used by a physical model will=
cause an exception on the server when the vdb is deployed
+
+[TEIID-1962 =
] - EDS Ingres10 as Source - LOCATE function not returning correct =
query results =
+
+[TEIID-1964 =
] - Queries which exceed the query timeout value are reported as ca=
nceled with no reference to the reason (timed out)
+
+[TEIID-1966 =
] - supportsInCriteria is ignored
+
+[TEIID-1968 =
] - NPE in GoupingNode
+
+[TEIID-1969 =
] - Missing message for key JDBCQueryExecution.Error_executing_quer=
y__1
+
+[TEIID-1972 =
] - Non-stagable cardinality dependent aggregate should prevent the=
creation of a staged grouping
+
+[TEIID-1974 =
] - Function RAND() should be RANDOM(int, int) for Teradata
+
+[TEIID-1975 =
] - Failure description is incomplete
+
+[TEIID-1976 =
] - Metadata TYPE_NAME value is null for String Columns
+
+[TEIID-1978 =
] - SalesForce getDeleted function does not return deleted objects =
list
+
+[TEIID-1981 =
] - Admin API does not correctly in Domain mode
+
+[TEIID-1983 =
] - BaseDelegatingTranslator should delegate properties from setSup=
ports* methods
+
+[TEIID-1986 =
] - Exception on the slave node during materialization table load
+
+[TEIID-1987 =
] - Exception Processing Web Service Response =
+
+[TEIID-1990 =
] - UNION pushdown
+
+[TEIID-1994 =
] - Regression in latest 7.7.1 code
+
+[TEIID-1998 =
] - Deployed translator JAR fails to be loaded when used in the VDB
+
+[TEIID-2001 =
] - Skip loading of Function/Other models during the Index Based VD=
Bs
+
+[TEIID-2002 =
] - Dynmamic Metadata load failure with Sales Force data source
+
+[TEIID-2003 =
] - NPE processing order by in rule collapse source
+
+[TEIID-2005 =
] - Source query for Oracle sequence adds an alias, which will retu=
rn "sequence doesn't exist" errors
+
+[TEIID-2007 =
] - JDBC warnings are not properly handled
+
+[TEIID-2017 =
] - CLONE - wrong type on model in VDB definition
+
+[TEIID-2018 =
] - VDB resources are not associated
+
+[TEIID-2020 =
] - Running Sybase procedure with jconnect driver in Teiid fails
+
+
+ =
+ Enhancement
+
+
+[TEIID-1809 =
] - Teiid maven build needs to work off of Jboss parent pom
+
+[TEIID-1859 =
] - Add a capability to restrict comparisons
+
+[TEIID-1865 =
] - Thread-safe JDBC connection
+
+[TEIID-1898 =
] - In Version 8, can the Teiid-<version>-client.jar (JDBC dr=
iver) be renamed because it causes confusion with the Teiid-client-<vers=
ion>.jar used in the server
+
+[TEIID-1916 =
] - Add support for alternate collation
+
+[TEIID-1959 =
] - Add a way to exclude tables/procedures from JDBC import
+
+[TEIID-1984 =
] - GetUpdated and GetDeleted SF procedures should be supported in =
dynamic vdbs
+
+[TEIID-1985 =
] - Additional avenues for plan information
+
+[TEIID-2006 =
] - Add a JDBC/ODBC statement to set the command payload
+
+[TEIID-2009 =
] - Allow for the possiblity of rewriten user commands by the Autho=
riztionValidator
+
+
+ =
+ Feature Request
+
+
+[TEIID-144 ] =
- ENHANCEMENT: Entitlements on XML Document Models
+
+[TEIID-151 ] =
- ENHANCEMENT: Need a way to stop building node in a recursive XML =
document when the node is repeated
+
+[TEIID-170 ] =
- Fully implement joining of parent and child mapping classes
+
+[TEIID-174 ] =
- add support to MMCallableStatement for named parameter methods
+
+[TEIID-176 ] =
- Auto-Staging tables should be shared in some circumstances
+
+[TEIID-185 ] =
- Add Option For MTOM in Web Services
+
+[TEIID-223 ] =
- XML output elements should be minimized
+
+[TEIID-417 ] =
- Add REST Support to Data Services
+
+[TEIID-499 ] =
- pushdown of parsedate, parsetime, parsetimestamp
+
+[TEIID-1280 =
] - Allow views/procedures to be defined without designer
+
+[TEIID-1352 =
] - Produce Admin API jar containing only Interfaces.
+
+[TEIID-1560 =
] - Add support for user defined / pushdown aggregate functions
+
+[TEIID-1720 =
] - Support for JBoss AS 7.x as host environment
+
+[TEIID-1801 =
] - Async Event Processing: Reset and Re-run plan
+
+[TEIID-1819 =
] - Reading multi entity data from a single data file
+
+[TEIID-1834 =
] - Add support for a comparable binary type
+
+[TEIID-1850 =
] - Add support for GreenPlum Database as a source
+
+
=
+ Quality Risk
+
+
+[TEIID-3 ] - =
Allow connectors to specify function capability for specific type sig=
nature
+
+[TEIID-1022 =
] - Index metadata should not treat cardinality 0 as unknown
+
+[TEIID-1604 =
] - Rationalize the context objects
+
+[TEIID-1837 =
] - Replication should distribute load off of the coordinator
+
+[TEIID-1841 =
] - week function in teiid not returning expected value
+
+[TEIID-1842 =
] - Remove translate criteria based update procedures
+
+[TEIID-1894 =
] - Consolidate bulk/iterator based inserts
+
+[TEIID-1950 =
] - teiid client settings properties overrides don't work with =
signed jars
+
+[TEIID-1995 =
] - Misleading error message
+
+[TEIID-2008 =
] - Allow client max object size to be settable
+
+[TEIID-2010 =
] - Remove unused translator supports.
+
+
+ =
+ Task
+
+
+[TEIID-1839 =
] - Redo the weather example
+
+[TEIID-1875 =
] - Convert community docs to confluence
+
+[TEIID-1889 =
] - Standardize logging in Teiid
+
+[TEIID-1901 =
] - Redo Quick Start guide for Teiid 8.0 changes
+
+[TEIID-1924 =
] - Update the documents for Teiid 8.0
+
+[TEIID-1955 =
] - Update to work with JBoss AS 7.1-Final
+
+[TEIID-1967 =
] - Bind EventDistributor to JNDI tree
+
+[TEIID-1971 =
] - Provide delegating Metadata Repository implementation class
+
+[TEIID-2000 =
] - Provide install script for Teiid to be installed in the domain =
mode
+
+[TEIID-2004 =
] - Support 1.7 JDBC methods
+
+[TEIID-2019 =
] - Remove all references to "javax.xml.bind" classes in =
the Teiid and support stream based xml
+
+
+ =
+ Sub-task
+
+
+[TEIID-1540 =
] - Add the ability to delegate one shot dependent joins to the tra=
nslators
+
+
+ =
+ =
+ =
=
The Teiid community project is=
hosted on jboss.org.
Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml 2012=
-05-01 15:19:22 UTC (rev 4046)
+++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml 2012=
-05-01 19:12:27 UTC (rev 4047)
@@ -15,12 +15,13 @@
=
=
+ =
Modified: trunk/client/src/main/java/org/teiid/client/DQP.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/client/DQP.java 2012-05-01 15:19:2=
2 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/client/DQP.java 2012-05-01 19:12:2=
7 UTC (rev 4047)
@@ -26,6 +26,7 @@
=
import org.teiid.client.lob.LobChunk;
import org.teiid.client.metadata.MetadataResult;
+import org.teiid.client.security.Secure;
import org.teiid.client.util.ResultsFuture;
import org.teiid.client.xa.XATransactionException;
import org.teiid.client.xa.XidImpl;
@@ -35,6 +36,7 @@
=
public interface DQP {
=
+ @Secure(optional=3Dtrue)
ResultsFuture executeRequest(long reqID, RequestMessage m=
essage) throws TeiidProcessingException, TeiidComponentException;
=
ResultsFuture processCursorRequest(long reqID, int batchF=
irst, int fetchSize) throws TeiidProcessingException;
Modified: trunk/client/src/main/java/org/teiid/client/plan/PlanNode.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/client/plan/PlanNode.java 2012-05-=
01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/client/plan/PlanNode.java 2012-05-=
01 19:12:27 UTC (rev 4047)
@@ -28,24 +28,23 @@
import java.io.ObjectOutput;
import java.io.StringReader;
import java.io.StringWriter;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
+import java.util.Properties;
=
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
=
import org.teiid.core.TeiidRuntimeException;
+import org.teiid.core.types.XMLType;
import org.teiid.core.util.ExternalizeUtil;
import org.teiid.jdbc.JDBCPlugin;
=
@@ -56,17 +55,13 @@
* parent. For procedure plans child PlanNodes will be processing instruct=
ions,
* which can in turn contain other relational or procedure plans.
*/
-(a)XmlType
-(a)XmlRootElement(name=3D"node")
public class PlanNode implements Externalizable {
=
/**
* A Property is a named value of a {@link PlanNode} that may be
* another {@link PlanNode} or a non-null list of values.
*/
- @XmlType(name =3D "property")
public static class Property implements Externalizable {
- @XmlAttribute
private String name;
private List values;
private PlanNode planNode;
@@ -83,7 +78,6 @@
return name;
}
=
- @XmlElement(name=3D"value")
public List getValues() {
return values;
}
@@ -92,7 +86,6 @@
this.values =3D values;
}
=
- @XmlElement(name=3D"node")
public PlanNode getPlanNode() {
return planNode;
}
@@ -118,10 +111,8 @@
=
}
=
- @XmlElement(name=3D"property")
private List properties =3D new LinkedList();
private PlanNode parent;
- @XmlAttribute
private String name;
=
public PlanNode() {
@@ -215,34 +206,75 @@
writer.writeEndElement();
}
=
- private void writeElement(final XMLStreamWriter writer, String name, S=
tring value) throws XMLStreamException {
+ private static void writeElement(final XMLStreamWriter writer, String =
name, String value) throws XMLStreamException {
writer.writeStartElement(name);
writer.writeCharacters(value);
writer.writeEndElement();
} =
=
- public static PlanNode fromXml(String planString) {
- try {
- JAXBContext jc =3D JAXBContext.newInstance(new Class[] {PlanNode.=
class});
- Unmarshaller marshaller =3D jc.createUnmarshaller();
- PlanNode planNode =3D (PlanNode) marshaller.unmarshal(new StringReader(=
planString));
- setParents(planNode);
- return planNode;
- } catch (JAXBException e) {
- //shouldn't happen
- throw new TeiidRuntimeException(e);
+ private static Properties getAttributes(XMLStreamReader reader) {
+ Properties props =3D new Properties();
+ if (reader.getAttributeCount() > 0) {
+ for(int i=3D0; i values =3D new ArrayList();
+ while (reader.hasNext() && (reader.nextTag() !=3D XMLStreamConstants=
.END_ELEMENT)) {
+ String valueNode =3D reader.getLocalName();
+ if (valueNode.equals("value")) {//$NON-NLS-1$
+ values.add(reader.getElementText()); =
+ }
+ else if (valueNode.equals("node")) {//$NON-NLS-1$
+ values =3D null;
+ Properties nodeProps =3D getAttributes(reader);
+ PlanNode childNode =3D new PlanNode(nodeProps.getProperty("name"))=
;//$NON-NLS-1$
+ node.addProperty(props.getProperty("name"), buildNode(reader, chil=
dNode));//$NON-NLS-1$
+ break;
+ }
+ else {
+ throw new XMLStreamException(JDBCPlugin.Util.gs("unexpected_elemen=
t", reader.getName(), "value"), reader.getLocation());//$NON-NLS-1$ //$NON-=
NLS-2$
+ }
+ }
+ if (values !=3D null) {
+ node.addProperty(props.getProperty("name"), values);//$NON-NLS-1$
+ }
+ }
+ else {
+ throw new XMLStreamException(JDBCPlugin.Util.gs("unexpected_element"=
, reader.getName(), "property"), reader.getLocation()); //$NON-NLS-1$ //$NO=
N-NLS-2$
+ }
+ }
+ return node;
+ }
+
@Override
public String toString() {
StringBuilder builder =3D new StringBuilder();
Modified: trunk/client/src/main/java/org/teiid/client/security/ILogon.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/client/security/ILogon.java 2012-0=
5-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/client/security/ILogon.java 2012-0=
5-01 19:12:27 UTC (rev 4047)
@@ -37,9 +37,11 @@
static final String KRB5TOKEN =3D "KRB5TOKEN"; //$NON-NLS-1$
static final String KRB5_ESTABLISHED =3D "KRB5_CONTEXT_ESTABLISHED"; //$N=
ON-NLS-1$
=
+ @Secure
LogonResult logon(Properties connectionProperties)
throws LogonException, TeiidComponentException, CommunicationException;
=
+ @Secure
LogonResult neogitiateGssLogin(Properties connectionProperties, byte[]=
serviceToken, boolean createSession) throws LogonException;
=
/**
@@ -60,5 +62,6 @@
*/
ResultsFuture logoff() throws InvalidSessionException, TeiidComponen=
tException;
=
+ @Secure
void assertIdentity(SessionToken sessionId) throws InvalidSessionExcept=
ion, TeiidComponentException, CommunicationException;
}
Copied: trunk/client/src/main/java/org/teiid/client/security/Secure.java (f=
rom rev 4046, branches/8.0.x/client/src/main/java/org/teiid/client/security=
/Secure.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/client/security/Secure.java =
(rev 0)
+++ trunk/client/src/main/java/org/teiid/client/security/Secure.java 2012-0=
5-01 19:12:27 UTC (rev 4047)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ * =
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * =
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * =
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+package org.teiid.client.security;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+(a)Target({ElementType.METHOD})
+(a)Retention(RetentionPolicy.RUNTIME)
+(a)Inherited
+(a)Documented
+public @interface Secure {
+ =
+ boolean optional() default false;
+
+}
Property changes on: trunk/client/src/main/java/org/teiid/client/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/client/util:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/client/util:3673-3711*,3754-=
3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util:3816-3868*,3876-=
3915*,3920-3983*
/trunk/client/src/main/java/org/teiid/client/util:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/client/util:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/client/util:3673-3711*,3754-=
3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util:3816-3868*,3876-=
3915*,3920-3983*
/branches/8.0.x/client/src/main/java/org/teiid/client/util:4002-4046*
/trunk/client/src/main/java/org/teiid/client/util:3507-3666
Modified: trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java 2=
012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java 2=
012-05-01 19:12:27 UTC (rev 4047)
@@ -22,14 +22,8 @@
=
package org.teiid.client.util;
=
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
+import java.io.*;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -72,23 +66,27 @@
=
if (this.exception =3D=3D null) {
Throwable t =3D buildException(classNames, message, stackTrace, code);
- if (t =3D=3D null) {
- if (causeHolder !=3D null) {
- this.exception =3D causeHolder.exception;
- }
+ if (causeHolder !=3D null) {
+ t.initCause(causeHolder.exception);
}
- else {
- if (causeHolder !=3D null) {
- t.initCause(causeHolder.exception);
+ this.exception =3D t;
+ =
+ if (this.exception instanceof SQLException) {
+ try {
+ int count =3D in.readInt();
+ for (int i =3D 0; i < count; i++) {
+ ExceptionHolder next =3D (ExceptionHolder)in.readObject();
+ if (next.exception instanceof SQLException) {
+ ((SQLException)this.exception).setNextException((SQLException) next=
.exception);
+ }
+ }
+ } catch (EOFException e) {
+ =
+ } catch (OptionalDataException e) {
+ =
}
- this.exception =3D t;
}
}
-
- if (this.exception =3D=3D null) {
- this.exception =3D new TeiidRuntimeException(message);
- this.exception.setStackTrace(stackTrace);
- } =
}
=
@Override
@@ -126,6 +124,22 @@
else {
out.writeObject(null);
}
+ // handle SQLException chains
+ if (exception instanceof SQLException) {
+ SQLException se =3D (SQLException)exception;
+ SQLException next =3D se.getNextException();
+ int count =3D 0;
+ while (next !=3D null) {
+ count++;
+ next =3D next.getNextException();
+ }
+ out.writeInt(count);
+ next =3D se.getNextException();
+ while (next !=3D null) {
+ out.writeObject(new ExceptionHolder(next, true));
+ next =3D next.getNextException();
+ }
+ }
}
=
public Throwable getException() {
@@ -133,30 +147,32 @@
}
=
private Throwable buildException(List classNames, String message,=
StackTraceElement[] stackTrace, String code) {
- if (classNames.isEmpty()) {
- return null;
+ String originalClass =3D Exception.class.getName();
+ =
+ if (!classNames.isEmpty()) {
+ originalClass =3D classNames.get(0);
}
=
- String originalClass =3D classNames.get(0);
- =
List args =3D Arrays.asList(CorePlugin.Util.getString("Exception=
Holder.converted_exception", message, originalClass)); //$NON-NLS-1$
=
Throwable result =3D null;
for (String className : classNames) {
try {
result =3D (Throwable)ReflectionHelper.create(className, args, Excepti=
onHolder.class.getClassLoader());
- result.setStackTrace(stackTrace);
break;
} catch (TeiidException e1) {
//
}
}
=
- if (result instanceof TeiidException) {
+ if (result =3D=3D null) {
+ result =3D new TeiidRuntimeException(args.get(0));
+ } else if (result instanceof TeiidException) {
((TeiidException)result).setCode(code);
((TeiidException)result).setOriginalType(classNames.get(0));
}
=
+ result.setStackTrace(stackTrace);
return result;
}
=
Property changes on: trunk/client/src/main/java/org/teiid/client/util/Excep=
tionHolder.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionHo=
lder.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.=
java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.=
java:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3507=
-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionHo=
lder.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.=
java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.=
java:4002-4046
/trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3507=
-3666
Property changes on: trunk/client/src/main/java/org/teiid/client/util/Excep=
tionUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionUt=
il.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.ja=
va:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.ja=
va:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3507-3=
666
+ /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionUt=
il.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.ja=
va:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.ja=
va:4002-4046
/trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3507-3=
666
Property changes on: trunk/client/src/main/java/org/teiid/client/util/Resul=
tsFuture.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsFutu=
re.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ResultsFuture.ja=
va:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ResultsFuture.ja=
va:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3507-3=
666
+ /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsFutu=
re.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ResultsFuture.ja=
va:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ResultsFuture.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/client/util/ResultsFuture.ja=
va:4002-4046
/trunk/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3507-3=
666
Property changes on: trunk/client/src/main/java/org/teiid/client/util/Resul=
tsReceiver.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsRece=
iver.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.=
java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.=
java:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3507=
-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsRece=
iver.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.=
java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.=
java:4002-4046
/trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3507=
-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/jdbc:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc:3816-3868*,3876-3915*,3=
920-3983*
/trunk/client/src/main/java/org/teiid/jdbc:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/jdbc:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/client/src/main/java/org/teiid/jdbc:4002-4046*
/trunk/client/src/main/java/org/teiid/jdbc:3507-3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java 2012-05-0=
1 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java 2012-05-0=
1 19:12:27 UTC (rev 4047)
@@ -350,11 +350,7 @@
* @see javax.sql.XADataSource#getXAConnection(java.lang.String, java.=
lang.String)
*/
public XAConnection getXAConnection(final String userName, final Strin=
g password) throws java.sql.SQLException {
- return XAConnectionImpl.newInstance(new XAConnectionImpl.ConnectionSo=
urce() {
-
- public ConnectionImpl createConnection() throws SQLException {
- return (ConnectionImpl)getConnection(userName, password);
- }});
+ return new XAConnectionImpl((ConnectionImpl) getConnection(userName, =
password));
}
=
public PooledConnection getPooledConnection() throws SQLException {
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/BaseDataSour=
ce.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.jav=
a:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:367=
3-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:381=
6-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.jav=
a:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:367=
3-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:400=
2-4046
/trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/BatchResults=
.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:=
3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3673-=
3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3816-=
3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:=
3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3673-=
3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3816-=
3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:4002-=
4046
/trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java 20=
12-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java 20=
12-05-01 19:12:27 UTC (rev 4047)
@@ -681,4 +681,13 @@
setObject((Object)parameterName, val);
}
=
+ public T getObject(int columnIndex, Class type) throws SQLExceptio=
n {
+ throw SqlUtil.createFeatureNotSupportedException();
+ }
+
+ public T getObject(String columnLabel, Class type)
+ throws SQLException {
+ throw SqlUtil.createFeatureNotSupportedException();
+ }
+
}
\ No newline at end of file
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/CallableStat=
ementImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/CallableStatementI=
mpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.j=
ava:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3507-=
3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/CallableStatementI=
mpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.j=
ava:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3507-=
3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java 2012-05-0=
1 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java 2012-05-0=
1 19:12:27 UTC (rev 4047)
@@ -32,6 +32,7 @@
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executor;
import java.util.logging.Level;
import java.util.logging.Logger;
=
@@ -99,7 +100,8 @@
private String debugLog;
// the last query annotations
private Collection annotations;
- private Properties connectionProps;
+ private Properties connectionProps;
+ private Properties payload;
=
public ConnectionImpl(ServerConnection serverConn, Properties info, St=
ring url) { =
this.connectionProps =3D info;
@@ -828,6 +830,7 @@
}
=
public void recycleConnection() {
+ this.payload =3D null;
try {
//close all open statements
this.closeStatements();
@@ -1005,6 +1008,42 @@
setPassword(oldPassword);
}
}
- }
-
+ }
+
+ public void abort(Executor executor) throws SQLException {
+ if (closed) {
+ return;
+ }
+ //TODO: ensure that threads are released. In theory they will be since =
close effectively cancels current executions
+ close();
+ }
+
+ public int getNetworkTimeout() throws SQLException {
+ throw SqlUtil.createFeatureNotSupportedException();
+ }
+
+ public String getSchema() throws SQLException {
+ return null;
+ }
+
+ /**
+ * @see query timeouts and the synchronousTtl setting if using socket con=
nections
+ */
+ public void setNetworkTimeout(Executor executor, int milliseconds)
+ throws SQLException {
+ throw SqlUtil.createFeatureNotSupportedException();
+ }
+
+ public void setSchema(String schema) throws SQLException {
+ =
+ }
+ =
+ public Properties getPayload() {
+ return payload;
+ }
+ =
+ public void setPayload(Properties payload) {
+ this.payload =3D payload;
+ }
+ =
}
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ConnectionIm=
pl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.jav=
a:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:367=
3-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:381=
6-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3188-3450,34=
52-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.jav=
a:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:367=
3-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:400=
2-4046
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3188-3450,34=
52-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ConnectionLi=
stener.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionListener=
.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java=
:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java=
:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionListener=
.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java=
:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java=
:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ConnectionPr=
ofile.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.=
java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:=
3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:=
3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.=
java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:=
3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:=
4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/DataTypeTran=
sformer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DataTypeTransforme=
r.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.jav=
a:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3507-36=
66
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DataTypeTransforme=
r.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.jav=
a:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3507-36=
66
Modified: trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java 201=
2-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java 201=
2-05-01 19:12:27 UTC (rev 4047)
@@ -446,14 +446,13 @@
=
/**
* Gets a description of the access rights for a column of the give=
n name.
- * Catalog, schema and table names are not used to narrow down the sea=
rch,
- * but the schema name should match the virtualdatabasename used to ob=
tain
+ * Catalog name should match the virtualdatabasename used to obtain
* this driver connection.
* @param name of the catalog to which columns belong.
* @param name of the schema to which columns belong.
* @param name of the table to which columns belong.
* @param name pattern to be matched by column names.
- * @return ResultSet containing column privilage information.
+ * @return ResultSet containing column privilege information.
* @throws SQLException if there is an error obtaining server results
*/
public ResultSet getColumnPrivileges(String catalog, String schema, St=
ring table, String columnName) throws SQLException {
@@ -487,9 +486,8 @@
=
/**
* Get's the metadata information about the columns whose names mat=
ch the given
- * columnNamePattern. Catalog, schema and tableNamePattern are not use=
d to
- * narrow down the search, but Catalog and schema names should match t=
he
- * virtualdatabasename and version used to obtain this driver connecti=
on.
+ * columnNamePattern. Catalog names should match the
+ * virtualdatabasename used to obtain this driver connection.
* The ResultSet returned by this method contains the following ad=
ditional
* columns that are not specified in the JDBC specification.
*
@@ -594,9 +592,8 @@
/**
* Gets the description of the foreign key columns in the table for=
eignTable.
* These foreign key columns reference primary key columns of primaryT=
able.
- * Catalog and schema information is not used to narrow down the searc=
h, but
- * Catalog and schema names(primary and foreign) should match the
- * virtualdatabasename and version used to obtain this driver connecti=
on.
+ * Catalog names(primary and foreign) should match the
+ * virtualdatabasename used to obtain this driver connection.
* @param name of the catalog containing primary keys.
* @param name of the schema containing primary keys.
* @param name of the table containing primary keys.
@@ -1985,7 +1982,7 @@
}
=
public boolean supportsGroupByUnrelated() throws SQLException {
- return false;
+ return true;
}
=
public boolean supportsIntegrityEnhancementFacility() throws SQLExcept=
ion {
@@ -2004,22 +2001,10 @@
return true;
}
=
- /**
- *
Checks whether mixed-case unquoted SQL identifiers used in SQL s=
tatements are
- * case sensitive
- * @return if so return true, else false.
- * @throws SQLException, should never occur.
- */
public boolean supportsMixedCaseIdentifiers() throws SQLException {
return false;
}
=
- /**
- * Checks whether mixed-case quoted SQL identifiers used in SQL sta=
tements are
- * case sensitive
- * @return if so return true, else false.
- * @throws SQLException, should never occur.
- */
public boolean supportsMixedCaseQuotedIdentifiers() throws SQLExceptio=
n {
return false;
}
@@ -2028,36 +2013,20 @@
return false;
}
=
- /**
- * Are multiple ResultSets from a single execute supported?
- * @return true if so; false otherwise
- * @throws SQLException, should never occur
- */
public boolean supportsMultipleResultSets() throws SQLException {
return false;
}
=
- /**
- * Retrieves whether it is possible to have multiple ResultSet objects
- * returned from a CallableStatement object simultaneously.
- * @return true if so; false otherwise
- * @throws SQLException, should never occur
- */
public boolean supportsMultipleOpenResults() throws SQLException {
return false;
}
=
- /**
- * Checks whether multiple transactions open at once on different c=
onnectons
- * @return if so return true, else false.
- * @throws SQLException, should never occur.
- */
public boolean supportsMultipleTransactions() throws SQLException {
return true;
}
=
public boolean supportsNamedParameters() throws SQLException {
- return false;
+ return true;
}
=
public boolean supportsNonNullableColumns() throws SQLException {
@@ -2076,11 +2045,6 @@
return true;
}
=
- /**
- * Checks whether an ORDER BY clause can use columns that are not i=
n the SELECT clause.
- * @return if so return true, else false.
- * @throws SQLException, should never occur.
- */
public boolean supportsOrderByUnrelated() throws SQLException {
return true;
}
@@ -2115,7 +2079,6 @@
* @param intValue holdability
* @return boolean true if so; false otherwise
* @throws SQLException, should never occur
-
*/
public boolean supportsResultSetHoldability(int holdability) throws SQ=
LException {
return false;
@@ -2354,4 +2317,14 @@
}
}
}
+
+ public boolean generatedKeyAlwaysReturned() throws SQLException {
+ return false;
+ }
+
+ public ResultSet getPseudoColumns(String catalog, String schemaPattern,
+ String tableNamePattern, String columnNamePattern)
+ throws SQLException {
+ throw SqlUtil.createFeatureNotSupportedException();
+ }
}
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/DatabaseMeta=
DataImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataIm=
pl.java:3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.ja=
va:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.ja=
va:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3188-3=
450,3452-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataIm=
pl.java:3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.ja=
va:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.ja=
va:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3188-3=
450,3452-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/DeferredMeta=
dataProvider.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataPr=
ovider.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvide=
r.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvide=
r.java:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:35=
07-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataPr=
ovider.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvide=
r.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvide=
r.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvide=
r.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:35=
07-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProf=
ile.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.ja=
va:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:37=
54-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:38=
16-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3188-3450,3=
452-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.ja=
va:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:37=
54-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:40=
02-4046
/trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3188-3450,3=
452-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/EnhancedTime=
r.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java=
:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3816=
-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java=
:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:4002=
-4046
/trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ExecutionPro=
perties.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ExecutionPropertie=
s.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.jav=
a:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3507-36=
66
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ExecutionPropertie=
s.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.jav=
a:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3507-36=
66
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/FilteredResu=
ltsMetadata.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMet=
adata.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata=
.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata=
.java:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:350=
7-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMet=
adata.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata=
.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata=
.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:350=
7-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNa=
mes.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.ja=
va:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:38=
16-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.ja=
va:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:40=
02-4046
/trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPo=
sitions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPosition=
s.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.jav=
a:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3507-36=
66
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPosition=
s.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.jav=
a:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3507-36=
66
Modified: trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java 2012-05-01 15=
:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java 2012-05-01 19=
:12:27 UTC (rev 4047)
@@ -66,5 +66,6 @@
TEIID20025,
TEIID20026,
TEIID20027,
+ TEIID20028
} =
}
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.j=
ava
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:35=
35-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3673-37=
11,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3816-38=
68,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:35=
35-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3673-37=
11,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3816-38=
68,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:4002-40=
46
/trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java 2012-05-01 15:19=
:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java 2012-05-01 19:12=
:27 UTC (rev 4047)
@@ -75,7 +75,8 @@
TeiidURL.CONNECTION.DISCOVERY_STRATEGY,
TeiidURL.CONNECTION.PASSTHROUGH_AUTHENTICATION,
TeiidURL.CONNECTION.JAAS_NAME,
- TeiidURL.CONNECTION.KERBEROS_SERVICE_PRINCIPLE_NAME));
+ TeiidURL.CONNECTION.KERBEROS_SERVICE_PRINCIPLE_NAME,
+ TeiidURL.CONNECTION.ENCRYPT_REQUESTS));
props.addAll(EXECUTION_PROPERTIES);
return Collections.unmodifiableSet(props);
}
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3149-=
3217,3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3673-3711,=
3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3816-3868,=
3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3188-3450,3452-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3149-=
3217,3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3673-3711,=
3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3816-3868,=
3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3188-3450,3452-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/MetadataProv=
ider.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.j=
ava:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3=
816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.j=
ava:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:4=
002-4046
/trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/NonBlockingR=
owProcessor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProc=
essor.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor=
.java:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:359=
8-3666
+ /branches/7.6.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProc=
essor.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor=
.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:359=
8-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ParameterMet=
aDataImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataI=
mpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.j=
ava:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3507-=
3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataI=
mpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.j=
ava:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3507-=
3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/PartialResul=
tsWarning.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarn=
ing.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.j=
ava:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3507-=
3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarn=
ing.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.j=
ava:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3507-=
3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/PreparedStat=
ementImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PreparedStatementI=
mpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.j=
ava:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3507-=
3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PreparedStatementI=
mpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.j=
ava:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3507-=
3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/RequestOptio=
ns.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/client/src/main/java/org/teiid/jdbc/RequestOptions.jav=
a:3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/RequestOptions.java:381=
6-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/RequestOptions.java:3507-3666
+ /branches/7.6.x/client/src/main/java/org/teiid/jdbc/RequestOptions.jav=
a:3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/RequestOptions.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/RequestOptions.java:400=
2-4046
/trunk/client/src/main/java/org/teiid/jdbc/RequestOptions.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java 2012-05-01=
15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java 2012-05-01=
19:12:27 UTC (rev 4047)
@@ -1666,4 +1666,13 @@
throws SQLException {
throw SqlUtil.createFeatureNotSupportedException(); =
}
+
+ public T getObject(int columnIndex, Class type) throws SQLExceptio=
n {
+ throw SqlUtil.createFeatureNotSupportedException();
+ }
+
+ public T getObject(String columnLabel, Class type)
+ throws SQLException {
+ throw SqlUtil.createFeatureNotSupportedException();
+ }
}
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ResultSetImp=
l.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java=
:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3816=
-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java=
:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:4002=
-4046
/trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ResultSetMet=
aDataImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataI=
mpl.java:3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.j=
ava:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3188-=
3450,3452-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataI=
mpl.java:3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.j=
ava:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3188-=
3450,3452-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/SQLStates.ja=
va
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:322=
0-3275,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3673-371=
1,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3816-386=
8,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java:3188-3450,3452-36=
66
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:322=
0-3275,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3673-371=
1,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java:3188-3450,3452-36=
66
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/SocketProfil=
e.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java=
:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3816=
-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java=
:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:4002=
-4046
/trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/StatementCal=
lback.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/client/src/main/java/org/teiid/jdbc/StatementCallback.=
java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/StatementCallback.java:=
3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3598-3666
+ /branches/7.6.x/client/src/main/java/org/teiid/jdbc/StatementCallback.=
java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/StatementCallback.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/StatementCallback.java:=
4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3598-3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2012-05-01=
15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2012-05-01=
19:12:27 UTC (rev 4047)
@@ -156,8 +156,8 @@
protected Map outParamByName =3D new TreeMap(String.CASE_INSENSITIVE_ORDER);
=
private static Pattern TRANSACTION_STATEMENT =3D Pattern.compile("\\s*=
(commit|rollback|(start\\s+transaction))\\s*;?", Pattern.CASE_INSENSITIVE);=
//$NON-NLS-1$
- private static Pattern SET_STATEMENT =3D Pattern.compile("\\s*set\\s+(=
(?:session authorization)|(?:\\w+))\\s+(?:([a-zA-Z](?:\\w|_)*)|((?:'[^']*')=
+));?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
- private static Pattern SHOW_STATEMENT =3D Pattern.compile("\\s*show\\s=
+(\\w*);?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
+ private static Pattern SET_STATEMENT =3D Pattern.compile("\\s*set(?:\\=
s+(payload))?\\s+((?:session authorization)|(?:[a-zA-Z]\\w*))\\s+(?:([a-zA-=
Z]\\w*)|((?:'[^']*')+));?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
+ private static Pattern SHOW_STATEMENT =3D Pattern.compile("\\s*show\\s=
+([a-zA-Z]\\w*);?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
/**
* Factory Constructor =
* @param driverConnection
@@ -430,14 +430,22 @@
if (resultsMode =3D=3D ResultsMode.RESULTSET) {
throw new TeiidSQLException(JDBCPlugin.Util.getString("Statemen=
tImpl.set_result_set")); //$NON-NLS-1$
}
- String key =3D match.group(1);
- String value =3D match.group(2);
+ String key =3D match.group(2);
+ String value =3D match.group(3);
if (value =3D=3D null) {
- value =3D match.group(3);
+ value =3D match.group(4);
value =3D StringUtil.replaceAll(value, "''", "'"); //$NON-NLS-1=
$ //$NON-NLS-2$
value =3D value.substring(1, value.length() - 1);
}
- if ("SESSION AUTHORIZATION".equalsIgnoreCase(key)) { //$NON-NLS-=
1$
+ if (match.group(1) !=3D null) {
+ //payload case
+ Properties p =3D this.getMMConnection().getPayload();
+ if (p =3D=3D null) {
+ p =3D new Properties();
+ this.getMMConnection().setPayload(p);
+ }
+ p.setProperty(key, value);
+ } else if ("SESSION AUTHORIZATION".equalsIgnoreCase(key)) { //$N=
ON-NLS-1$
this.getMMConnection().changeUser(value, this.getMMConnection()=
.getPassword());
} else if (key.equalsIgnoreCase(TeiidURL.CONNECTION.PASSWORD)) {
this.getMMConnection().setPassword(value);
@@ -589,7 +597,11 @@
this.getConnection().beginLocalTxnIfNeeded();
this.currentRequestID =3D this.driverConnection.nextRequestID();
// Create a request message
- reqMsg.setExecutionPayload(this.payload); =
+ if (this.payload !=3D null) {
+ reqMsg.setExecutionPayload(this.payload); =
+ } else {
+ reqMsg.setExecutionPayload(this.getMMConnection().getPayload());
+ }
reqMsg.setCursorType(this.resultSetType);
reqMsg.setFetchSize(this.fetchSize);
reqMsg.setRowLimit(this.maxRows);
@@ -1108,4 +1120,12 @@
=
return metadataMap;
}
+
+ public void closeOnCompletion() throws SQLException {
+ throw SqlUtil.createFeatureNotSupportedException();
+ }
+
+ public boolean isCloseOnCompletion() throws SQLException {
+ return false;
+ }
}
\ No newline at end of file
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/StatementImp=
l.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java=
:3149-3217,3220-3275,3281-3325,3355-3365,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3816=
-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3188-3450,345=
2-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java=
:3149-3217,3220-3275,3281-3325,3355-3365,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:4002=
-4046
/trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3188-3450,345=
2-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidConnect=
ion.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.ja=
va:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:38=
16-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.ja=
va:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:40=
02-4046
/trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java 2012-05-=
01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java 2012-05-=
01 19:12:27 UTC (rev 4047)
@@ -24,7 +24,9 @@
=
import java.net.MalformedURLException;
import java.sql.Connection;
+import java.sql.SQLFeatureNotSupportedException;
import java.util.Properties;
+import java.util.logging.Logger;
=
import org.teiid.net.TeiidURL;
=
@@ -107,6 +109,10 @@
* Name of Kerberos KDC service principle name
*/
private String kerberosServicePrincipleName;
+ /**
+ * If not using ssl determines whether requests with the associated co=
mmand payload should be encrypted
+ */
+ private boolean encryptRequests;
=
public TeiidDataSource() {
}
@@ -517,5 +523,21 @@
public void setKerberosServicePrincipleName(String kerberosServerName) {
this.kerberosServicePrincipleName =3D kerberosServerName;
}
+
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ return TeiidDriver.logger;
+ }
+ =
+ public void setEncryptRequests(boolean encryptRequests) {
+ this.encryptRequests =3D encryptRequests;
+ }
+ =
+ public boolean isEncryptRequests() {
+ return encryptRequests;
+ }
+ =
+ public boolean getEncryptRequests() {
+ return encryptRequests;
+ }
}
=
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSou=
rce.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.ja=
va:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:38=
16-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.ja=
va:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:40=
02-4046
/trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java 2012-05-01 1=
5:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java 2012-05-01 1=
9:12:27 UTC (rev 4047)
@@ -27,6 +27,7 @@
import java.sql.DriverManager;
import java.sql.DriverPropertyInfo;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import java.util.Enumeration;
import java.util.LinkedList;
import java.util.List;
@@ -55,7 +56,7 @@
=
public class TeiidDriver implements Driver {
=
- private static Logger logger =3D Logger.getLogger("org.teiid.jdbc"); //$N=
ON-NLS-1$
+ static Logger logger =3D Logger.getLogger("org.teiid.jdbc"); //$NON-NLS-1$
static final String DRIVER_NAME =3D "Teiid JDBC Driver"; //$NON-NLS-1$
=
private static TeiidDriver INSTANCE =3D new TeiidDriver();
@@ -235,6 +236,10 @@
public boolean jdbcCompliant() {
return false;
}
+
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ return logger;
+ }
}
=
=
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.=
java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3=
535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3673-3=
711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3816-3=
868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3=
535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3673-3=
711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:4002-4=
046
/trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidPrepare=
dStatement.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedState=
ment.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.=
java:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:3598=
-3666
+ /branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedState=
ment.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.=
java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:3598=
-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLExce=
ption.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.=
java:3220-3275,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:=
3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:=
3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3188-3450=
,3452-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.=
java:3220-3275,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:=
3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:=
4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3188-3450=
,3452-3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java 2012-05-=
01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java 2012-05-=
01 19:12:27 UTC (rev 4047)
@@ -26,11 +26,33 @@
=
=
/**
- * Teiid specific SQLWarning
+ * Teiid specific SQLWarning
+//warning will be an instanceof TeiidSQLWarning to convey model/source inf=
ormation
+SQLWarning warning =3D stmt.getWarnings();
+
+while (warning !=3D null) {
+ Exception e =3D warning.getCause();
+ if (cause instanceof SQLWarning) {
+ //childWarning should now be the head of the source warning chain
+ SQLWarning childWarning =3D (SQLWarning)cause;
+ while (childWarning !=3D null) {
+ //do something with childWarning
+ childWarning =3D childWarning.getNextWarning();
+ }
+ }
+ warning =3D warning.getNextWarning();
+}
+ listeners;
- private XAResource resource;
private ConnectionImpl connection;
- private ConnectionSource cs;
- =
+ private CloseInterceptor handler;
private boolean isClosed;
=
- public static XAConnectionImpl newInstance (ConnectionSource cs){
- return new XAConnectionImpl(cs);
- }
- =
- public XAConnectionImpl(ConnectionSource cs){
- this.cs =3D cs;
+ public XAConnectionImpl(ConnectionImpl conn){
+ this.connection =3D conn;
}
=
public Connection getConnection() throws SQLException{
ConnectionImpl conn =3D getConnectionImpl();
- =
- Connection result =3D (Connection)Proxy.newProxyInstance(this.getClass()=
.getClassLoader(), new Class[] {Connection.class}, new CloseInterceptor(con=
n));
- =
+ if (handler !=3D null) {
+ handler.close();
+ }
+ handler =3D new CloseInterceptor(conn);
+ Connection result =3D (Connection)Proxy.newProxyInstance(this.getClass()=
.getClassLoader(), new Class[] {Connection.class}, handler);
return result;
}
=
@@ -129,15 +132,6 @@
throw new SQLException(JDBCPlugin.Util.getString("MMXAConnecti=
on.connection_is_closed")); //$NON-NLS-1$
}
=
- if(connection =3D=3D null){
- try{
- connection =3D cs.createConnection();
- }catch(SQLException e){ =
- notifyListener(e);
- throw e;
- } =
- }
- =
return connection;
}
=
@@ -156,10 +150,7 @@
}
=
public XAResource getXAResource() throws SQLException{
- if(resource =3D=3D null){
- resource =3D XAResourceImpl.newInstance(this);
- }
- return resource;
+ return this;
}
=
public void close()throws SQLException{ =
@@ -195,4 +186,138 @@
=
public void removeStatementEventListener(StatementEventListener arg0) {
}
+ =
+ public void commit(Xid xid, boolean onePhase) throws XAException {
+ XidImpl mmXid =3D getMMXid(xid);
+ try{
+ getMMConnection().commitTransaction(mmXid, onePhase); =
+ }catch(SQLException e){
+ String logMsg =3D JDBCPlugin.Util.getString("MMXAResource.FailedCommitT=
XN", xid, onePhase ? "true":"false"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NL=
S-3$
+ throw handleError(e, logMsg);
+ }
+ }
+
+ private XAException handleError(Exception e,String logMsg) {
+ logger.log(Level.SEVERE, logMsg, e);
+
+ if(e instanceof TeiidSQLException){
+ Throwable ex =3D ((TeiidSQLException)e).getCause();
+ if(ex instanceof XAException){
+ return (XAException)ex;
+ }
+ if (ex instanceof XATransactionException) {
+ return ((XATransactionException)ex).getXAException();
+ }
+ }
+ return new XAException(XAException.XAER_RMERR);
+ }
+
+ /**
+ * @see javax.transaction.xa.XAResource#end(javax.transaction.xa.Xid, =
int)
+ */
+ public void end(Xid xid, int flag) throws XAException {
+ XidImpl mmXid =3D getMMXid(xid);
+ try{
+ getMMConnection().endTransaction(mmXid, flag); =
+ }catch(SQLException e){
+ String logMsg =3D JDBCPlugin.Util.getString("MMXAResource.Fail=
edEndTXN", xid, new Integer(flag)); //$NON-NLS-1$
+ throw handleError(e, logMsg);
+ }
+ }
+
+ /**
+ * @see javax.transaction.xa.XAResource#forget(javax.transaction.xa.Xi=
d)
+ */
+ public void forget(Xid xid) throws XAException {
+ XidImpl mmXid =3D getMMXid(xid);
+ try{
+ getMMConnection().forgetTransaction(mmXid); =
+ }catch(SQLException e){
+ String logMsg =3D JDBCPlugin.Util.getString("MMXAResource.Fail=
edForgetTXN", xid); //$NON-NLS-1$
+ throw handleError(e, logMsg);
+ }
+ }
+
+ public int getTransactionTimeout() throws XAException {
+ return timeOut;
+ }
+
+ public boolean isSameRM(XAResource arg0) throws XAException {
+ if (arg0 =3D=3D this) {
+ return true;
+ }
+ if (!(arg0 instanceof XAConnectionImpl)) {
+ return false;
+ }
+ XAConnectionImpl other =3D (XAConnectionImpl)arg0;
+ try {
+ return this.getMMConnection().isSameProcess(other.getMMConnection());
+ } catch (CommunicationException e) {
+ throw handleError(e, JDBCPlugin.Util.getString("MMXAResource.FailedISSa=
meRM")); //$NON-NLS-1$
+ }
+ }
+
+ public int prepare(Xid xid) throws XAException {
+ XidImpl mmXid =3D getMMXid(xid);
+ try{
+ return getMMConnection().prepareTransaction(mmXid); =
+ }catch(SQLException e){
+ String logMsg =3D JDBCPlugin.Util.getString("MMXAResource.Fail=
edPrepareTXN", xid); //$NON-NLS-1$
+ throw handleError(e, logMsg);
+ }
+ }
+
+ /**
+ * @see javax.transaction.xa.XAResource#recover(int)
+ */
+ public Xid[] recover(int flag) throws XAException {
+ try{
+ return getMMConnection().recoverTransaction(flag); =
+ }catch(SQLException e){
+ String logMsg =3D JDBCPlugin.Util.getString("MMXAResource.Fail=
edRecoverTXN", flag); //$NON-NLS-1$
+ throw handleError(e, logMsg);
+ }
+ }
+
+ public void rollback(Xid xid) throws XAException {
+ XidImpl mmXid =3D getMMXid(xid);
+ try{
+ getMMConnection().rollbackTransaction(mmXid); =
+ }catch(SQLException e){
+ String logMsg =3D JDBCPlugin.Util.getString("MMXAResource.Fail=
edRollbackTXN", xid); //$NON-NLS-1$
+ throw handleError(e, logMsg);
+ }
+ }
+
+ public boolean setTransactionTimeout(int seconds) throws XAException {
+ timeOut =3D seconds;
+ return true;
+ }
+
+ public void start(Xid xid, int flag) throws XAException {
+ XidImpl mmXid =3D getMMXid(xid);
+ try{
+ getMMConnection().startTransaction(mmXid, flag, timeOut); =
+ }catch(SQLException e){
+ String logMsg =3D JDBCPlugin.Util.getString("MMXAResource.Fail=
edStartTXN", xid, new Integer(flag)); //$NON-NLS-1$
+ handleError(e, logMsg);
+ }
+ }
+ =
+ private ConnectionImpl getMMConnection() throws XAException{
+ try{
+ return this.getConnectionImpl();
+ }catch(SQLException e){
+ throw new XAException(XAException.XAER_RMFAIL);
+ }
+ }
+ =
+ /**
+ * @param xid
+ * @return
+ * @throws XAException
+ */
+ private XidImpl getMMXid(Xid originalXid) {
+ return new XidImpl(originalXid);
+ }
}
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/XAConnection=
Impl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.j=
ava:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3=
816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.j=
ava:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:4=
002-4046
/trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3507-3666
Deleted: trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java 2012-05-0=
1 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java 2012-05-0=
1 19:12:27 UTC (rev 4047)
@@ -1,209 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership. Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- * =
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * =
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- * =
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-package org.teiid.jdbc;
-
-import java.sql.SQLException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
-import javax.transaction.xa.Xid;
-
-import org.teiid.client.xa.XATransactionException;
-import org.teiid.client.xa.XidImpl;
-import org.teiid.net.CommunicationException;
-
-
-/**
- * Implementation of XAResource.
- */
-public class XAResourceImpl implements XAResource{
- private static Logger logger =3D Logger.getLogger("org.teiid.jdbc"); //$N=
ON-NLS-1$
-
- private XAConnectionImpl mmConnection;
- private int timeOut;
- =
- public static XAResourceImpl newInstance (XAConnectionImpl mmConnectio=
n){
- return new XAResourceImpl(mmConnection);
- }
- =
- public XAResourceImpl(XAConnectionImpl mmConnection){
- this.mmConnection =3D mmConnection;
- } =
- =
- /**
- * @see javax.transaction.xa.XAResource#commit(javax.transaction.xa.Xi=
d, boolean)
- */
- public void commit(Xid xid, boolean onePhase) throws XAException {
- XidImpl mmXid =3D getMMXid(xid);
- try{
- getMMConnection().commitTransaction(mmXid, onePhase); =
- }catch(SQLException e){
- String logMsg =3D JDBCPlugin.Util.getString("MMXAResource.FailedCommitT=
XN", xid, onePhase ? "true":"false"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NL=
S-3$
- throw handleError(e, logMsg);
- }
- }
-
- private XAException handleError(Exception e,String logMsg) {
- logger.log(Level.SEVERE, logMsg, e);
-
- if(e instanceof TeiidSQLException){
- Throwable ex =3D ((TeiidSQLException)e).getCause();
- if(ex instanceof XAException){
- return (XAException)ex;
- }
- if (ex instanceof XATransactionException) {
- return ((XATransactionException)ex).getXAException();
- }
- }
- return new XAException(XAException.XAER_RMERR);
- }
-
- /**
- * @see javax.transaction.xa.XAResource#end(javax.transaction.xa.Xid, =
int)
- */
- public void end(Xid xid, int flag) throws XAException {
- XidImpl mmXid =3D getMMXid(xid);
- try{
- getMMConnection().endTransaction(mmXid, flag); =
- }catch(SQLException e){
- String logMsg =3D JDBCPlugin.Util.getString("MMXAResource.Fail=
edEndTXN", xid, new Integer(flag)); //$NON-NLS-1$
- throw handleError(e, logMsg);
- }
- }
-
- /**
- * @see javax.transaction.xa.XAResource#forget(javax.transaction.xa.Xi=
d)
- */
- public void forget(Xid xid) throws XAException {
- XidImpl mmXid =3D getMMXid(xid);
- try{
- getMMConnection().forgetTransaction(mmXid); =
- }catch(SQLException e){
- String logMsg =3D JDBCPlugin.Util.getString("MMXAResource.Fail=
edForgetTXN", xid); //$NON-NLS-1$
- throw handleError(e, logMsg);
- }
- }
-
- /**
- * @see javax.transaction.xa.XAResource#getTransactionTimeout()
- */
- public int getTransactionTimeout() throws XAException {
- return timeOut;
- }
-
- /**
- * @see javax.transaction.xa.XAResource#isSameRM(javax.transaction.xa.=
XAResource)
- */
- public boolean isSameRM(XAResource arg0) throws XAException {
- if (arg0 =3D=3D this) {
- return true;
- }
- if (!(arg0 instanceof XAResourceImpl)) {
- return false;
- }
- XAResourceImpl other =3D (XAResourceImpl)arg0;
- try {
- return this.getMMConnection().isSameProcess(other.getMMConnection());
- } catch (CommunicationException e) {
- throw handleError(e, JDBCPlugin.Util.getString("MMXAResource.FailedISSa=
meRM")); //$NON-NLS-1$
- }
- }
-
- /**
- * @see javax.transaction.xa.XAResource#prepare(javax.transaction.xa.X=
id)
- */
- public int prepare(Xid xid) throws XAException {
- XidImpl mmXid =3D getMMXid(xid);
- try{
- return getMMConnection().prepareTransaction(mmXid); =
- }catch(SQLException e){
- String logMsg =3D JDBCPlugin.Util.getString("MMXAResource.Fail=
edPrepareTXN", xid); //$NON-NLS-1$
- throw handleError(e, logMsg);
- }
- }
-
- /**
- * @see javax.transaction.xa.XAResource#recover(int)
- */
- public Xid[] recover(int flag) throws XAException {
- try{
- return getMMConnection().recoverTransaction(flag); =
- }catch(SQLException e){
- String logMsg =3D JDBCPlugin.Util.getString("MMXAResource.Fail=
edRecoverTXN", flag); //$NON-NLS-1$
- throw handleError(e, logMsg);
- }
- }
-
- /**
- * @see javax.transaction.xa.XAResource#rollback(javax.transaction.xa.=
Xid)
- */
- public void rollback(Xid xid) throws XAException {
- XidImpl mmXid =3D getMMXid(xid);
- try{
- getMMConnection().rollbackTransaction(mmXid); =
- }catch(SQLException e){
- String logMsg =3D JDBCPlugin.Util.getString("MMXAResource.Fail=
edRollbackTXN", xid); //$NON-NLS-1$
- throw handleError(e, logMsg);
- }
- }
-
- /**
- * @see javax.transaction.xa.XAResource#setTransactionTimeout(int)
- */
- public boolean setTransactionTimeout(int seconds) throws XAException {
- timeOut =3D seconds;
- return true;
- }
-
- /**
- * @see javax.transaction.xa.XAResource#start(javax.transaction.xa.Xid=
, int)
- */
- public void start(Xid xid, int flag) throws XAException {
- XidImpl mmXid =3D getMMXid(xid);
- try{
- getMMConnection().startTransaction(mmXid, flag, timeOut); =
- }catch(SQLException e){
- String logMsg =3D JDBCPlugin.Util.getString("MMXAResource.Fail=
edStartTXN", xid, new Integer(flag)); //$NON-NLS-1$
- handleError(e, logMsg);
- }
- }
- =
- private ConnectionImpl getMMConnection() throws XAException{
- try{
- return this.mmConnection.getConnectionImpl();
- }catch(SQLException e){
- throw new XAException(XAException.XAER_RMFAIL);
- }
- }
- =
- /**
- * @param xid
- * @return
- * @throws XAException
- */
- private XidImpl getMMXid(Xid originalXid) {
- return new XidImpl(originalXid);
- }
-}
Modified: trunk/client/src/main/java/org/teiid/net/TeiidURL.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/net/TeiidURL.java 2012-05-01 15:19=
:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/net/TeiidURL.java 2012-05-01 19:12=
:27 UTC (rev 4047)
@@ -84,6 +84,8 @@
public static final String JAAS_NAME =3D "jaasName"; //$NON-NLS-1$
=
public static final String KERBEROS_SERVICE_PRINCIPLE_NAME =3D "kerberos=
ServicePrincipleName"; //$NON-NLS-1$;
+ =
+ public static final String ENCRYPT_REQUESTS =3D "encryptRequests"; //$NO=
N-NLS-1$;
}
=
public static final String DOT_DELIMITER =3D "."; //$NON-NLS-1$
Property changes on: trunk/client/src/main/java/org/teiid/net/socket
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/net/socket:3673-3711*,3754-3=
769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket:3816-3868*,3876-3=
915*,3920-3983*
/trunk/client/src/main/java/org/teiid/net/socket:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/net/socket:3673-3711*,3754-3=
769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket:3816-3868*,3876-3=
915*,3920-3983*
/branches/8.0.x/client/src/main/java/org/teiid/net/socket:4002-4046*
/trunk/client/src/main/java/org/teiid/net/socket:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Authen=
ticationType.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/client/src/main/java/org/teiid/net/socket/Authenticati=
onType.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/AuthenticationTyp=
e.java:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:35=
98-3666
+ /branches/7.6.x/client/src/main/java/org/teiid/net/socket/Authenticati=
onType.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/AuthenticationTyp=
e.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/AuthenticationTyp=
e.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:35=
98-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Handsh=
ake.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Handshake.ja=
va:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/Handshake.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/Handshake.java:38=
16-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/net/socket/Handshake.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Handshake.ja=
va:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/Handshake.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/Handshake.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/Handshake.java:40=
02-4046
/trunk/client/src/main/java/org/teiid/net/socket/Handshake.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Messag=
e.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Message.java=
:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/Message.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/Message.java:3816=
-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/net/socket/Message.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Message.java=
:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/Message.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/Message.java:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/Message.java:4002=
-4046
/trunk/client/src/main/java/org/teiid/net/socket/Message.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Object=
Channel.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChanne=
l.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.jav=
a:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3507-36=
66
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChanne=
l.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.jav=
a:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3507-36=
66
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Object=
ChannelFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChanne=
lFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFact=
ory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFact=
ory.java:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:=
3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChanne=
lFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFact=
ory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFact=
ory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFact=
ory.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:=
3507-3666
Modified: trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelF=
actory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory=
.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory=
.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -49,7 +49,7 @@
public final class OioOjbectChannelFactory implements ObjectChannelFactory=
{
=
private final static int STREAM_BUFFER_SIZE =3D 1<<15;
- private final static int MAX_OBJECT_SIZE =3D 1 << 25;
+ private final static int DEFAULT_MAX_OBJECT_SIZE =3D 1 << 25;
=
private static Logger log =3D Logger.getLogger("org.teiid.client.sockets"=
); //$NON-NLS-1$
=
@@ -59,7 +59,7 @@
private ObjectInputStream inputStream;
private Object readLock =3D new Object();
=
- private OioObjectChannel(Socket socket) throws IOException {
+ private OioObjectChannel(Socket socket, int maxObjectSize) throws IOExce=
ption {
log.fine("creating new OioObjectChannel"); //$NON-NLS-1$
this.socket =3D socket;
BufferedOutputStream bos =3D new BufferedOutputStream( socket.=
getOutputStream(), STREAM_BUFFER_SIZE);
@@ -69,7 +69,7 @@
outputStream.flush();
final ClassLoader cl =3D this.getClass().getClassLoader();
BufferedInputStream bis =3D new BufferedInputStream(socket.get=
InputStream(), STREAM_BUFFER_SIZE);
- inputStream =3D new ObjectDecoderInputStream(new DataInputStre=
am(bis), cl, MAX_OBJECT_SIZE);
+ inputStream =3D new ObjectDecoderInputStream(new DataInputStre=
am(bis), cl, maxObjectSize);
}
=
@Override
@@ -145,6 +145,7 @@
private boolean conserveBandwidth;
private int soTimeout =3D 3000;
private volatile SSLSocketFactory sslSocketFactory;
+ private int maxObjectSize =3D DEFAULT_MAX_OBJECT_SIZE;
=
public OioOjbectChannelFactory(Properties props) {
this.props =3D props;
@@ -176,7 +177,7 @@
socket.setTcpNoDelay(!conserveBandwidth); // enable Nagle's algorithm=
to conserve bandwidth
socket.connect(address);
socket.setSoTimeout(soTimeout);
- return new OioObjectChannel(socket);
+ return new OioObjectChannel(socket, maxObjectSize);
}
=
public int getSendBufferSize() {
@@ -206,6 +207,10 @@
public void setSoTimeout(int soTimeout) {
this.soTimeout =3D soTimeout;
}
+ =
+ public void setMaxObjectSize(int maxObjectSize) {
+ this.maxObjectSize =3D maxObjectSize;
+ }
=
public int getSoTimeout() {
return soTimeout;
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/OioOjb=
ectChannelFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/OioOjbectCha=
nnelFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelF=
actory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelF=
actory.java:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.ja=
va:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/OioOjbectCha=
nnelFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelF=
actory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelF=
actory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelF=
actory.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.ja=
va:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Server=
Discovery.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServerDiscov=
ery.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.j=
ava:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3507-=
3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServerDiscov=
ery.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.j=
ava:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3507-=
3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Servic=
eInvocationStruct.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServiceInvoc=
ationStruct.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ServiceInvocation=
Struct.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ServiceInvocation=
Struct.java:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.ja=
va:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServiceInvoc=
ationStruct.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ServiceInvocation=
Struct.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ServiceInvocation=
Struct.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/ServiceInvocation=
Struct.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.ja=
va:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Single=
InstanceCommunicationException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SingleInstan=
ceCommunicationException.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCom=
municationException.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCom=
municationException.java:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicatio=
nException.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SingleInstan=
ceCommunicationException.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCom=
municationException.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCom=
municationException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCom=
municationException.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicatio=
nException.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ction.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.=
java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.=
java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -49,6 +49,7 @@
import org.teiid.client.util.ResultsFuture;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidException;
+import org.teiid.core.util.PropertiesUtils;
import org.teiid.gss.MakeGSS;
import org.teiid.jdbc.JDBCPlugin;
import org.teiid.net.CommunicationException;
@@ -210,7 +211,7 @@
}
=
public T getService(Class iface) {
- return iface.cast(Proxy.newProxyInstance(this.getClass().getClassLoader(=
), new Class[] {iface}, new SocketServerInstanceImpl.RemoteInvocationHandle=
r(iface) {
+ return iface.cast(Proxy.newProxyInstance(this.getClass().getClassLoader(=
), new Class[] {iface}, new SocketServerInstanceImpl.RemoteInvocationHandle=
r(iface, PropertiesUtils.getBooleanProperty(connProps, TeiidURL.CONNECTION.=
ENCRYPT_REQUESTS, false)) {
@Override
protected SocketServerInstance getInstance() throws CommunicationExcept=
ion {
if (failOver && System.currentTimeMillis() - lastPing > pingFailOverIn=
terval) {
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Socket=
ServerConnection.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServer=
Connection.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ction.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ction.java:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.jav=
a:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServer=
Connection.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ction.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ction.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ction.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.jav=
a:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Socket=
ServerConnectionFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServer=
ConnectionFactory.java:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ctionFactory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ctionFactory.java:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFact=
ory.java:3188-3450,3452-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServer=
ConnectionFactory.java:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ctionFactory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ctionFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ctionFactory.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFact=
ory.java:3188-3450,3452-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Socket=
ServerInstance.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServer=
Instance.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nce.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nce.java:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:=
3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServer=
Instance.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nce.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nce.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nce.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:=
3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Socket=
ServerInstanceFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServer=
InstanceFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceFactory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceFactory.java:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactor=
y.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServer=
InstanceFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceFactory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceFactory.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactor=
y.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImp=
l.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImp=
l.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -31,6 +31,7 @@
import java.lang.reflect.Proxy;
import java.net.InetSocketAddress;
import java.net.SocketTimeoutException;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
@@ -43,7 +44,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
=
-import org.teiid.client.security.ILogon;
+import org.teiid.client.security.Secure;
import org.teiid.client.util.ExceptionHolder;
import org.teiid.client.util.ExceptionUtil;
import org.teiid.client.util.ResultsFuture;
@@ -77,6 +78,7 @@
private Cryptor cryptor;
private String serverVersion;
private AuthenticationType authType =3D AuthenticationType.CLEARTEXT;
+ private HashMap, Object> serviceMap =3D new HashMap,=
Object>();
=
private boolean hasReader;
=
@@ -275,15 +277,19 @@
}
}
=
- @SuppressWarnings("unchecked")
@Override
- public T getService(Class iface) {
- return (T)Proxy.newProxyInstance(this.getClass().getClassLoader(), new C=
lass[] {iface}, new RemoteInvocationHandler(iface) {
- @Override
- protected SocketServerInstanceImpl getInstance() {
- return SocketServerInstanceImpl.this;
- }
- });
+ public synchronized T getService(Class iface) {
+ Object service =3D this.serviceMap.get(iface);
+ if (service =3D=3D null) {
+ service =3D Proxy.newProxyInstance(this.getClass().getClassLoader(), ne=
w Class[] {iface}, new RemoteInvocationHandler(iface, false) {
+ @Override
+ protected SocketServerInstanceImpl getInstance() {
+ return SocketServerInstanceImpl.this;
+ }
+ });
+ this.serviceMap.put(iface, service);
+ }
+ return iface.cast(service);
}
=
public long getSynchTimeout() {
@@ -292,12 +298,12 @@
=
public static abstract class RemoteInvocationHandler implements Invocatio=
nHandler {
=
- private boolean secure;
private Class targetClass;
+ private boolean secureOptional;
=
- public RemoteInvocationHandler(Class targetClass) {
+ public RemoteInvocationHandler(Class targetClass, boolean secureOptio=
nal) {
this.targetClass =3D targetClass;
- this.secure =3D ILogon.class.isAssignableFrom(targetClass);
+ this.secureOptional =3D secureOptional;
}
=
@Override
@@ -309,7 +315,8 @@
Message message =3D new Message();
message.setContents(new ServiceInvocationStruct(args, method.getName(),
targetClass));
- if (secure) {
+ Secure secure =3D method.getAnnotation(Secure.class);
+ if (secure !=3D null && (!secure.optional() || secureOptional)) {
message.setContents(instance.getCryptor().sealObject(message.getConte=
nts()));
}
ResultsFuture results =3D new ResultsFuture() {
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Socket=
ServerInstanceImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServer=
InstanceImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceImpl.java:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.j=
ava:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServer=
InstanceImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceImpl.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.j=
ava:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Socket=
Util.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketUtil.j=
ava:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3=
816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketUtil.j=
ava:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:4=
002-4046
/trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/UrlSer=
verDiscovery.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/UrlServerDis=
covery.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscover=
y.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscover=
y.java:3816-3868,3876-3915,3920-3983
/trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:35=
07-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/UrlServerDis=
covery.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscover=
y.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscover=
y.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscover=
y.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:35=
07-3666
Modified: trunk/client/src/main/java/org/teiid/netty/handler/codec/serializ=
ation/ObjectDecoderInputStream.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/=
ObjectDecoderInputStream.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/=
ObjectDecoderInputStream.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -22,24 +22,13 @@
*/
package org.teiid.netty.handler.codec.serialization;
=
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInput;
-import java.io.ObjectInputStream;
-import java.io.OutputStream;
-import java.io.StreamCorruptedException;
+import java.io.*;
import java.util.List;
=
import org.teiid.core.types.InputStreamFactory;
import org.teiid.core.types.InputStreamFactory.StreamFactoryReference;
import org.teiid.core.util.ExternalizeUtil;
+import org.teiid.jdbc.JDBCPlugin;
=
=
/**
@@ -83,8 +72,7 @@
throw new StreamCorruptedException("invalid data length: " + da=
taLen); //$NON-NLS-1$
}
if (dataLen > maxObjectSize) {
- throw new StreamCorruptedException(
- "data length too big: " + dataLen + " (max: " + maxObje=
ctSize + ')'); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new StreamCorruptedException(JDBCPlugin.Util.gs(JDBCPlugi=
n.Event.TEIID20028, dataLen, maxObjectSize));
}
}
fillBuffer();
Property changes on: trunk/client/src/main/resources/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/resources/org:3535-3555*
/branches/7.6.x/client/src/main/resources/org:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/resources/org:3816-3868*,3876-3915*,3920-39=
83*
/trunk/client/src/main/resources/org:3507-3666
+ /branches/7.4.x/client/src/main/resources/org:3535-3555*
/branches/7.6.x/client/src/main/resources/org:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/resources/org:3816-3868*,3876-3915*,3920-39=
83*
/branches/8.0.x/client/src/main/resources/org:4002-4046*
/trunk/client/src/main/resources/org:3507-3666
Property changes on: trunk/client/src/main/resources/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/client/src/main/resources/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/resources/org/teiid:3816-3868*,3876-3915*,3=
920-3983*
/trunk/client/src/main/resources/org/teiid:3507-3666
+ /branches/7.4.x/client/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/client/src/main/resources/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/resources/org/teiid:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/client/src/main/resources/org/teiid:4002-4046*
/trunk/client/src/main/resources/org/teiid:3507-3666
Property changes on: trunk/client/src/main/resources/org/teiid/jdbc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/resources/org/teiid/jdbc:3535-3555
/branches/7.6.x/client/src/main/resources/org/teiid/jdbc:3673-3711,3754-3769
/branches/7.7.x/client/src/main/resources/org/teiid/jdbc:3816-3868,3876-391=
5,3920-3983
/trunk/client/src/main/resources/org/teiid/jdbc:3507-3666
+ /branches/7.4.x/client/src/main/resources/org/teiid/jdbc:3535-3555
/branches/7.6.x/client/src/main/resources/org/teiid/jdbc:3673-3711,3754-3769
/branches/7.7.x/client/src/main/resources/org/teiid/jdbc:3816-3868,3876-391=
5,3920-3983
/branches/8.0.x/client/src/main/resources/org/teiid/jdbc:4002-4046
/trunk/client/src/main/resources/org/teiid/jdbc:3507-3666
Modified: trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties 2012-05-=
01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties 2012-05-=
01 19:12:27 UTC (rev 4047)
@@ -171,4 +171,6 @@
=
TEIID20008=3DFailed to load "org.jboss.teiid" module.
TEIID20023=3Dconnection closed
-TEIID20007=3DDuplicate Class
\ No newline at end of file
+TEIID20007=3DDuplicate Class
+TEIID20028=3Ddata length too big: {0} > max of {1}. You may need to adjus=
t the maxObjectSize client setting.
+unexpected_element=3DUnexpected Element {0} encountered, expecting one of =
{1}
\ No newline at end of file
Property changes on: trunk/client/src/main/resources/org/teiid/net
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/resources/org/teiid/net:3535-3555*
/branches/7.6.x/client/src/main/resources/org/teiid/net:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/resources/org/teiid/net:3816-3868*,3876-391=
5*,3920-3983*
/trunk/client/src/main/resources/org/teiid/net:3507-3666
+ /branches/7.4.x/client/src/main/resources/org/teiid/net:3535-3555*
/branches/7.6.x/client/src/main/resources/org/teiid/net:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/resources/org/teiid/net:3816-3868*,3876-391=
5*,3920-3983*
/branches/8.0.x/client/src/main/resources/org/teiid/net:4002-4046*
/trunk/client/src/main/resources/org/teiid/net:3507-3666
Modified: trunk/client/src/main/resources/teiid-client-settings.orig.proper=
ties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/resources/teiid-client-settings.orig.properties 2=
012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/resources/teiid-client-settings.orig.properties 2=
012-05-01 19:12:27 UTC (rev 4047)
@@ -127,3 +127,10 @@
#
=
org.teiid.sockets.conserveBandwidth=3Dfalse
+
+#
+# Maximum number of bytes per server message.
+# May need to be increased when using custom types and/or large batch size=
s.
+#
+
+org.teiid.sockets.maxObjectSize=3D33554432
Property changes on: trunk/client/src/test/java/org/teiid/client/plan
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/client/plan:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/client/plan:3673-3711*,3754-=
3769
/branches/7.7.x/client/src/test/java/org/teiid/client/plan:3816-3868*,3876-=
3915*,3920-3983*
/trunk/client/src/test/java/org/teiid/client/plan:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/client/plan:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/client/plan:3673-3711*,3754-=
3769
/branches/7.7.x/client/src/test/java/org/teiid/client/plan:3816-3868*,3876-=
3915*,3920-3983*
/branches/8.0.x/client/src/test/java/org/teiid/client/plan:4002-4046*
/trunk/client/src/test/java/org/teiid/client/plan:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/client/plan/TestP=
lanNode.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/client/plan/TestPlanNod=
e.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.jav=
a:3816-3868,3876-3915,3920-3983
/trunk/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3507-36=
66
+ /branches/7.4.x/client/src/test/java/org/teiid/client/plan/TestPlanNod=
e.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.jav=
a:4002-4046
/trunk/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3507-36=
66
Property changes on: trunk/client/src/test/java/org/teiid/client/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/client/util:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/client/util:3673-3711*,3754-=
3769
/branches/7.7.x/client/src/test/java/org/teiid/client/util:3816-3868*,3876-=
3915*,3920-3983*
/trunk/client/src/test/java/org/teiid/client/util:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/client/util:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/client/util:3673-3711*,3754-=
3769
/branches/7.7.x/client/src/test/java/org/teiid/client/util:3816-3868*,3876-=
3915*,3920-3983*
/branches/8.0.x/client/src/test/java/org/teiid/client/util:4002-4046*
/trunk/client/src/test/java/org/teiid/client/util:3507-3666
Modified: trunk/client/src/test/java/org/teiid/client/util/TestExceptionHol=
der.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.ja=
va 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.ja=
va 2012-05-01 19:12:27 UTC (rev 4047)
@@ -1,3 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ * =
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * =
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * =
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
package org.teiid.client.util;
=
import static org.junit.Assert.*;
@@ -18,7 +40,7 @@
import org.teiid.core.util.ReflectionHelper;
import org.teiid.core.util.UnitTestUtil;
=
-
+(a)SuppressWarnings("nls")
public class TestExceptionHolder {
=
@SuppressWarnings("all")
@@ -72,12 +94,43 @@
assertTrue(e instanceof BadException2);
assertEquals("Remote org.teiid.client.util.TestExceptionHolder$Bad=
Exception2: I have foreign exception embedded in me", e.getMessage()); //$N=
ON-NLS-1$
=
- // now unknown exception is not found, so promote known SQL except=
ion up
e =3D e.getCause();
+ assertTrue(e instanceof TeiidRuntimeException);
+ =
+ e =3D e.getCause();
assertTrue(e instanceof SQLException);
+ =
assertEquals("Remote java.sql.SQLException: something bad happende=
d", e.getMessage()); //$NON-NLS-1$
- } =
+ }
=
+ @Test public void testSQLExceptionChain() throws Exception {
+ ClassLoader cl =3D new URLClassLoader(new URL[] {UnitTestUtil.getTestDat=
aFile("test.jar").toURI().toURL()}); //$NON-NLS-1$
+ Exception obj =3D (Exception)ReflectionHelper.create("test.UnknownExcept=
ion", null, cl); //$NON-NLS-1$
+ SQLException se =3D new SQLException("something bad happended");
+ se.initCause(obj); //$NON-NLS-1$
+ SQLException se1 =3D new SQLException("something else bad happended");
+ se1.initCause(obj); //$NON-NLS-1$
+ se.setNextException(se1);
+ =
+ ByteArrayOutputStream baos =3D new ByteArrayOutputStream();
+ ObjectOutputStream oos =3D new ObjectOutputStream(baos);
+ oos.writeObject(new ExceptionHolder(se, false)); //$NON-NLS-1$
+ oos.flush();
+ =
+ ObjectInputStream ois =3D new ObjectInputStream(new ByteArrayInput=
Stream(baos.toByteArray()));
+ ExceptionHolder holder =3D (ExceptionHolder)ois.readObject();
+ Throwable e =3D holder.getException();
+ assertTrue(e instanceof SQLException);
+ assertEquals("Remote java.sql.SQLException: something bad happende=
d", e.getMessage()); //$NON-NLS-1$
+ =
+ assertTrue(e.getCause() instanceof TeiidRuntimeException);
+ =
+ e =3D ((SQLException)e).getNextException();
+ assertTrue(e instanceof SQLException);
+ =
+ assertEquals("Remote java.sql.SQLException: something else bad hap=
pended", e.getMessage()); //$NON-NLS-1$
+ }
+ =
@Test public void testDeserializationUnknownChildException2() throws Exce=
ption {
ClassLoader cl =3D new URLClassLoader(new URL[] {UnitTestUtil.getTestDat=
aFile("test.jar").toURI().toURL()}); //$NON-NLS-1$
ArrayList args =3D new ArrayList();
@@ -93,7 +146,7 @@
ExceptionHolder holder =3D (ExceptionHolder)ois.readObject();
Throwable e =3D holder.getException();
assertTrue(e instanceof TeiidRuntimeException);
- assertEquals("Unknown Exception", e.getMessage()); //$NON-NLS-1$
+ assertEquals("Remote test.UnknownException: Unknown Exception", e.=
getMessage()); //$NON-NLS-1$
} =
=
private static class NotSerializable {
Property changes on: trunk/client/src/test/java/org/teiid/client/util/TestE=
xceptionHolder.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestExcepti=
onHolder.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/util/TestExceptionHol=
der.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/util/TestExceptionHol=
der.java:3816-3868,3876-3915,3920-3983
/trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:=
3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestExcepti=
onHolder.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/util/TestExceptionHol=
der.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/util/TestExceptionHol=
der.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/client/util/TestExceptionHol=
der.java:4002-4046
/trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:=
3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/client/util/TestR=
esultsFuture.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestResults=
Future.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/util/TestResultsFutur=
e.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/util/TestResultsFutur=
e.java:3816-3868,3876-3915,3920-3983
/trunk/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:35=
07-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestResults=
Future.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/util/TestResultsFutur=
e.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/util/TestResultsFutur=
e.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/client/util/TestResultsFutur=
e.java:4002-4046
/trunk/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:35=
07-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/jdbc:3673-3711*,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc:3816-3868*,3876-3915*,3=
920-3983*
/trunk/client/src/test/java/org/teiid/jdbc:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/jdbc:3673-3711*,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/client/src/test/java/org/teiid/jdbc:4002-4046*
/trunk/client/src/test/java/org/teiid/jdbc:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestAllResul=
tsImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl=
.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java=
:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java=
:3816-3868,3876-3915,3920-3983
/trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl=
.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java=
:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java=
:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestBatchRes=
ults.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.j=
ava:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3=
816-3868,3876-3915,3920-3983
/trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.j=
ava:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:4=
002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestCallable=
Statement.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestCallableStatem=
ent.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.j=
ava:3816-3868,3876-3915,3920-3983
/trunk/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3507-=
3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestCallableStatem=
ent.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.j=
ava:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3507-=
3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestConnecti=
on.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestConnection.jav=
a:3281-3325,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:367=
3-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:381=
6-3868,3876-3915,3920-3983
/trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java:3188-3450,34=
52-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestConnection.jav=
a:3281-3325,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:367=
3-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:400=
2-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java:3188-3450,34=
52-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestDataType=
Transformer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransf=
ormer.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer=
.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer=
.java:3816-3868,3876-3915,3920-3983
/trunk/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:350=
7-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransf=
ormer.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer=
.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer=
.java:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:350=
7-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestEmbedded=
Profile.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfil=
e.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.jav=
a:3816-3868,3876-3915,3920-3983
/trunk/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3507-36=
66
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfil=
e.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.jav=
a:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3507-36=
66
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestEnhanced=
Timer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.=
java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:=
3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:=
3816-3868,3876-3915,3920-3983
/trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.=
java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:=
3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:=
4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.=
java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3=
535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3673-3=
711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3816-3=
868,3876-3915,3920-3983
/trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3=
535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3673-3=
711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:4002-4=
046
/trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestPrepared=
Statement.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatem=
ent.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.j=
ava:3816-3868,3876-3915,3920-3983
/trunk/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3507-=
3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatem=
ent.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.j=
ava:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3507-=
3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestResultSe=
t.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java=
:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3816=
-3868,3876-3915,3920-3983
/trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java=
:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:4002=
-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestSQLExcep=
tion.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSQLException.j=
ava:3220-3275,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3=
816-3868,3876-3915,3920-3983
/trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3188-3450,=
3452-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSQLException.j=
ava:3220-3275,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:4=
002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3188-3450,=
3452-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestSocketPr=
ofile.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.=
java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:=
3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:=
3816-3868,3876-3915,3920-3983
/trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.=
java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:=
3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:=
4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3507-3666
Modified: trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java 2012-05-01=
15:19:22 UTC (rev 4046)
+++ trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java 2012-05-01=
19:12:27 UTC (rev 4047)
@@ -71,6 +71,14 @@
assertEquals("b'ar", p.get("foo")); //$NON-NLS-1$ //$NON-NLS-2$
}
=
+ @Test public void testSetPayloadStatement() throws Exception {
+ ConnectionImpl conn =3D Mockito.mock(ConnectionImpl.class);
+ Properties p =3D new Properties();
+ Mockito.stub(conn.getExecutionProperties()).toReturn(p);
+ StatementImpl statement =3D new StatementImpl(conn, ResultSet.TYPE_FORWA=
RD_ONLY, ResultSet.CONCUR_READ_ONLY);
+ assertFalse(statement.execute("set payload foo bar")); //$NON-NLS-1$
+ }
+ =
@Test public void testSetAuthorizationStatement() throws Exception {
ConnectionImpl conn =3D Mockito.mock(ConnectionImpl.class);
Properties p =3D new Properties();
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestStatemen=
t.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestStatement.java=
:3149-3217,3220-3275,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3816=
-3868,3876-3915,3920-3983
/trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java:3188-3450,345=
2-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestStatement.java=
:3149-3217,3220-3275,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:4002=
-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java:3188-3450,345=
2-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDat=
aSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSourc=
e.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.jav=
a:3816-3868,3876-3915,3920-3983
/trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3507-36=
66
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSourc=
e.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.jav=
a:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3507-36=
66
Modified: trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java 2012-05-=
01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java 2012-05-=
01 19:12:27 UTC (rev 4047)
@@ -138,7 +138,7 @@
@Test public void testGetPropertyInfo1() throws Exception { =
DriverPropertyInfo info[] =3D drv.getPropertyInfo("jdbc:teiid:vdb(=
a)mm://localhost:12345;applicationName=3Dx", null); //$NON-NLS-1$
=
- assertEquals(23, info.length);
+ assertEquals(24, info.length);
assertEquals(false, info[0].required);
assertEquals("ApplicationName", info[0].name); //$NON-NLS-1$
assertEquals("x", info[0].value); //$NON-NLS-1$
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDri=
ver.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.ja=
va:3149-3217,3281-3325,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:38=
16-3868,3876-3915,3920-3983
/trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3188-3450,3=
452-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.ja=
va:3149-3217,3281-3325,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:40=
02-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3188-3450,3=
452-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestWrapperI=
mpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.ja=
va:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:38=
16-3868,3876-3915,3920-3983
/trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.ja=
va:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:40=
02-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3507-3666
Modified: trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java 2012-05=
-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java 2012-05=
-01 19:12:27 UTC (rev 4047)
@@ -42,12 +42,7 @@
=
final ConnectionImpl mmConn =3D TestConnection.getMMConnection();
=
- XAConnectionImpl xaConn =3D new XAConnectionImpl(new XAConnectionImpl.Co=
nnectionSource() {
- @Override
- public ConnectionImpl createConnection() throws SQLException {
- return mmConn;
- }
- });
+ XAConnectionImpl xaConn =3D new XAConnectionImpl(mmConn);
=
Connection conn =3D xaConn.getConnection();
StatementImpl stmt =3D (StatementImpl)conn.createStatement();
@@ -68,14 +63,9 @@
}
=
@Test public void testNotification() throws Exception {
- XAConnectionImpl xaConn =3D new XAConnectionImpl(new XAConnectionImpl.Co=
nnectionSource() {
- @Override
- public ConnectionImpl createConnection() throws SQLException {
- ConnectionImpl c =3D Mockito.mock(ConnectionImpl.class);
- Mockito.doThrow(new SQLException(new InvalidSessionException())).when(=
c).commit();
- return c;
- }
- });
+ ConnectionImpl conn =3D Mockito.mock(ConnectionImpl.class);
+ Mockito.doThrow(new SQLException(new InvalidSessionException())).when(co=
nn).commit();
+ XAConnectionImpl xaConn =3D new XAConnectionImpl(conn);
ConnectionEventListener cel =3D Mockito.mock(ConnectionEventListener.cla=
ss);
xaConn.addConnectionEventListener(cel);
Connection c =3D xaConn.getConnection();
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestXAConnec=
tion.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.j=
ava:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3=
816-3868,3876-3915,3920-3983
/trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.j=
ava:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:4=
002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/util:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/util:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/util:3816-3868,3876-391=
5,3920-3983
/trunk/client/src/test/java/org/teiid/jdbc/util:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/util:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/util:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/util:3816-3868,3876-391=
5,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/util:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/util:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/net
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/net:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/net:3673-3711*,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/net:3816-3868*,3876-3915*,39=
20-3983*
/trunk/client/src/test/java/org/teiid/net:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/net:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/net:3673-3711*,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/net:3816-3868*,3876-3915*,39=
20-3983*
/branches/8.0.x/client/src/test/java/org/teiid/net:4002-4046*
/trunk/client/src/test/java/org/teiid/net:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/net/TestTeiidURL.=
java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3=
535-3555
/branches/7.6.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3673-3=
711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3816-3=
868,3876-3915,3920-3983
/trunk/client/src/test/java/org/teiid/net/TestTeiidURL.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3=
535-3555
/branches/7.6.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3673-3=
711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:4002-4=
046
/trunk/client/src/test/java/org/teiid/net/TestTeiidURL.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/net/socket
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/net/socket:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/net/socket:3673-3711,3754-37=
69
/branches/7.7.x/client/src/test/java/org/teiid/net/socket:3816-3868,3876-39=
15,3920-3983
/trunk/client/src/test/java/org/teiid/net/socket:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/net/socket:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/net/socket:3673-3711,3754-37=
69
/branches/7.7.x/client/src/test/java/org/teiid/net/socket:3816-3868,3876-39=
15,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/net/socket:4002-4046
/trunk/client/src/test/java/org/teiid/net/socket:3507-3666
Property changes on: trunk/common-core/src/main/java/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org:3535-3555*
/branches/7.6.x/common-core/src/main/java/org:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/main/java/org:3816-3868*,3876-3915*,3920-39=
83*
/trunk/common-core/src/main/java/org:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org:3535-3555*
/branches/7.6.x/common-core/src/main/java/org:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/main/java/org:3816-3868*,3876-3915*,3920-39=
83*
/branches/8.0.x/common-core/src/main/java/org:4002-4046*
/trunk/common-core/src/main/java/org:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid:3535-3555*
/branches/7.6.x/common-core/src/main/java/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid:3816-3868*,3876-3915*,3=
920-3983*
/trunk/common-core/src/main/java/org/teiid:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid:3535-3555*
/branches/7.6.x/common-core/src/main/java/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/common-core/src/main/java/org/teiid:4002-4046*
/trunk/common-core/src/main/java/org/teiid:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core:3535-3555*
/branches/7.6.x/common-core/src/main/java/org/teiid/core:3673-3711*,3754-37=
69
/branches/7.7.x/common-core/src/main/java/org/teiid/core:3816-3868*,3876-39=
15*,3920-3983*
/trunk/common-core/src/main/java/org/teiid/core:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core:3535-3555*
/branches/7.6.x/common-core/src/main/java/org/teiid/core:3673-3711*,3754-37=
69
/branches/7.7.x/common-core/src/main/java/org/teiid/core:3816-3868*,3876-39=
15*,3920-3983*
/branches/8.0.x/common-core/src/main/java/org/teiid/core:4002-4046*
/trunk/common-core/src/main/java/org/teiid/core:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/BundleU=
til.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/BundleUtil.ja=
va:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:36=
73-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:38=
16-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/BundleUtil.ja=
va:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:36=
73-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:40=
02-4046
/trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/Compone=
ntNotFoundException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/ComponentNotF=
oundException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundE=
xception.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundE=
xception.java:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.=
java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/ComponentNotF=
oundException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundE=
xception.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundE=
xception.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundE=
xception.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.=
java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/CoreCon=
stants.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/CoreConstants=
.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/CoreConstants.java=
:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/CoreConstants.java=
:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/CoreConstants.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/CoreConstants=
.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/CoreConstants.java=
:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/CoreConstants.java=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/CoreConstants.java=
:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/CoreConstants.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/CorePlu=
gin.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/CorePlugin.ja=
va:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:36=
73-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:38=
16-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/CorePlugin.ja=
va:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:36=
73-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:40=
02-4046
/trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidCo=
mponentException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidComponen=
tException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidComponentExce=
ption.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidComponentExce=
ption.java:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/TeiidComponentException.jav=
a:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidComponen=
tException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidComponentExce=
ption.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidComponentExce=
ption.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidComponentExce=
ption.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/TeiidComponentException.jav=
a:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidEx=
ception.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidExceptio=
n.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidException.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidException.jav=
a:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/TeiidException.java:3188-34=
50,3452-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidExceptio=
n.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidException.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidException.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidException.jav=
a:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/TeiidException.java:3188-34=
50,3452-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidPr=
ocessingException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidProcessi=
ngException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidProcessingExc=
eption.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidProcessingExc=
eption.java:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/TeiidProcessingException.ja=
va:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidProcessi=
ngException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidProcessingExc=
eption.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidProcessingExc=
eption.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidProcessingExc=
eption.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/TeiidProcessingException.ja=
va:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidRu=
ntimeException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeE=
xception.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeExcept=
ion.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeExcept=
ion.java:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:=
3188-3450,3452-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeE=
xception.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeExcept=
ion.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeExcept=
ion.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeExcept=
ion.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:=
3188-3450,3452-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/crypto
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/crypto:3535-3=
555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/crypto:3673-3711,3=
754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/crypto:3816-3868,3=
876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/crypto:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/crypto:3535-3=
555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/crypto:3673-3711,3=
754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/crypto:3816-3868,3=
876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/crypto:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/crypto:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types:3535-35=
55*
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types:3673-3711*,3=
754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types:3816-3868*,3=
876-3915*,3920-3983*
/trunk/common-core/src/main/java/org/teiid/core/types:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types:3535-35=
55*
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types:3673-3711*,3=
754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types:4002-4046*
/trunk/common-core/src/main/java/org/teiid/core/types:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/B=
aseLob.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BaseLob=
.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java=
:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java=
:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BaseLob=
.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java=
:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java=
:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3507-3666
Modified: trunk/common-core/src/main/java/org/teiid/core/types/BinaryType.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common-core/src/main/java/org/teiid/core/types/BinaryType.java 20=
12-05-01 15:19:22 UTC (rev 4046)
+++ trunk/common-core/src/main/java/org/teiid/core/types/BinaryType.java 20=
12-05-01 19:12:27 UTC (rev 4047)
@@ -24,9 +24,8 @@
=
import java.util.Arrays;
=
-import javax.xml.bind.DatatypeConverter;
-
import org.teiid.core.util.Assertion;
+import org.teiid.core.util.PropertiesUtils;
=
public final class BinaryType implements Comparable {
=
@@ -102,7 +101,7 @@
=
@Override
public String toString() {
- return DatatypeConverter.printHexBinary(bytes);
+ return PropertiesUtils.toHex(bytes);
}
=
public BlobType toBlob() {
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/B=
inaryType.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BinaryT=
ype.java:3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BinaryType.j=
ava:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/types/BinaryType.java:3507-=
3666
+ /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BinaryT=
ype.java:3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BinaryType.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BinaryType.j=
ava:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/BinaryType.java:3507-=
3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/B=
lobImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobImp=
l.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.jav=
a:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3507-36=
66
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobImp=
l.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.jav=
a:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3507-36=
66
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/B=
lobType.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobTyp=
e.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BlobType.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BlobType.jav=
a:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java:3507-36=
66
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobTyp=
e.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BlobType.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BlobType.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BlobType.jav=
a:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java:3507-36=
66
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/C=
lobImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobImp=
l.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.jav=
a:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3507-36=
66
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobImp=
l.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.jav=
a:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3507-36=
66
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/C=
lobType.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobTyp=
e.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/ClobType.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/ClobType.jav=
a:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java:3507-36=
66
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobTyp=
e.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/ClobType.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/ClobType.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/ClobType.jav=
a:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java:3507-36=
66
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/D=
ataTypeManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/DataTyp=
eManager.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/DataTypeMana=
ger.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/DataTypeMana=
ger.java:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:=
3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/DataTyp=
eManager.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/DataTypeMana=
ger.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/DataTypeMana=
ger.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/DataTypeMana=
ger.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:=
3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/I=
nputStreamFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/InputSt=
reamFactory.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/InputStreamF=
actory.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/InputStreamF=
actory.java:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.ja=
va:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/InputSt=
reamFactory.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/InputStreamF=
actory.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/InputStreamF=
actory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/InputStreamF=
actory.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.ja=
va:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/J=
DBCSQLTypeInfo.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/JDBCSQL=
TypeInfo.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeI=
nfo.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeI=
nfo.java:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:=
3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/JDBCSQL=
TypeInfo.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeI=
nfo.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeI=
nfo.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeI=
nfo.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:=
3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/L=
obSearchUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/LobSear=
chUtil.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/LobSearchUti=
l.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/LobSearchUti=
l.java:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:35=
07-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/LobSear=
chUtil.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/LobSearchUti=
l.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/LobSearchUti=
l.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/LobSearchUti=
l.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:35=
07-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/N=
ullType.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/NullTyp=
e.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/NullType.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/NullType.jav=
a:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/types/NullType.java:3507-36=
66
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/NullTyp=
e.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/NullType.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/NullType.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/NullType.jav=
a:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/NullType.java:3507-36=
66
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/S=
QLXMLImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SQLXMLI=
mpl.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.j=
ava:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.j=
ava:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3507-=
3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SQLXMLI=
mpl.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.j=
ava:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.j=
ava:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3507-=
3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/S=
equencable.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Sequenc=
able.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Sequencable.=
java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Sequencable.=
java:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3507=
-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Sequenc=
able.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Sequencable.=
java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Sequencable.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Sequencable.=
java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3507=
-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/S=
ourceTransform.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SourceT=
ransform.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/SourceTransf=
orm.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/SourceTransf=
orm.java:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:=
3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SourceT=
ransform.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/SourceTransf=
orm.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/SourceTransf=
orm.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/SourceTransf=
orm.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:=
3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/S=
tandardXMLTranslator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Standar=
dXMLTranslator.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/StandardXMLT=
ranslator.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/StandardXMLT=
ranslator.java:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator=
.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Standar=
dXMLTranslator.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/StandardXMLT=
ranslator.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/StandardXMLT=
ranslator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/StandardXMLT=
ranslator.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator=
.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/S=
treamable.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Streama=
ble.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Streamable.j=
ava:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Streamable.j=
ava:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java:3507-=
3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Streama=
ble.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Streamable.j=
ava:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Streamable.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Streamable.j=
ava:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java:3507-=
3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/T=
ransform.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Transfo=
rm.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Transform.ja=
va:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Transform.ja=
va:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/types/Transform.java:3507-3=
666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Transfo=
rm.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Transform.ja=
va:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Transform.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Transform.ja=
va:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/Transform.java:3507-3=
666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/T=
ransformationException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Transfo=
rmationException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Transformati=
onException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Transformati=
onException.java:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/types/TransformationExcepti=
on.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Transfo=
rmationException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Transformati=
onException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Transformati=
onException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Transformati=
onException.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/TransformationExcepti=
on.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/X=
MLTranslator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLTran=
slator.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/XMLTranslato=
r.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/XMLTranslato=
r.java:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:35=
07-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLTran=
slator.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/XMLTranslato=
r.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/XMLTranslato=
r.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/XMLTranslato=
r.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:35=
07-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/X=
MLType.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLType=
.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/XMLType.java=
:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/XMLType.java=
:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLType=
.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/XMLType.java=
:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/XMLType.java=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/XMLType.java=
:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/b=
asic
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/basic:3=
535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/basic:3673-3=
711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/basic:3816-3=
868,3876-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/types/basic:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/basic:3=
535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/basic:3673-3=
711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/basic:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic:4002-4=
046
/trunk/common-core/src/main/java/org/teiid/core/types/basic:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/util:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/util:3673-3711,375=
4-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/util:3816-3868,387=
6-3915,3920-3983
/trunk/common-core/src/main/java/org/teiid/core/util:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/util:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/util:3673-3711,375=
4-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/util:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/util:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/util:3507-3666
Modified: trunk/common-core/src/main/java/org/teiid/core/util/HashCodeUtil.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common-core/src/main/java/org/teiid/core/util/HashCodeUtil.java 2=
012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/common-core/src/main/java/org/teiid/core/util/HashCodeUtil.java 2=
012-05-01 19:12:27 UTC (rev 4047)
@@ -139,8 +139,12 @@
}
return hc;
}
+
+ public static final int expHashCode(String x) {
+ return expHashCode(x, true);
+ }
=
- public static final int expHashCode(String x) {
+ public static final int expHashCode(String x, boolean caseSensitive) {
if(x =3D=3D null) {
return 0;
}
@@ -148,7 +152,11 @@
int index =3D 1;
int xlen =3D x.length()+1; // switch to 1-based
while(index < xlen) {
- hc =3D PRIME * hc + x.charAt(index-1);
+ int charHash =3D x.charAt(index-1);
+ if (!caseSensitive) {
+ charHash =3D Character.toUpperCase(charHash);
+ }
+ hc =3D PRIME * hc + charHash;
index =3D index << 1; // left shift by 1 to double
}
return hc;
Modified: trunk/common-core/src/main/java/org/teiid/core/util/PropertiesUti=
ls.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common-core/src/main/java/org/teiid/core/util/PropertiesUtils.jav=
a 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/common-core/src/main/java/org/teiid/core/util/PropertiesUtils.jav=
a 2012-05-01 19:12:27 UTC (rev 4047)
@@ -646,6 +646,14 @@
'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'
};
=
+ public static String toHex(byte[] bytes) {
+ StringBuilder sb =3D new StringBuilder(bytes.length * 2);
+ for (byte b : bytes) {
+ sb.append(toHex(b >>> 4));
+ sb.append(toHex(b));
+ }
+ return sb.toString();
+ }
=
public static final void copyProperty(Properties srcProperties, String=
srcPropName, Properties tgtProperties, String tgtPropName) {
if(srcProperties =3D=3D null || srcPropName =3D=3D null || tgtProp=
erties =3D=3D null || tgtPropName =3D=3D null) {
@@ -724,141 +732,7 @@
return original;
}
=
- // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D
- /**
- * Returns a boolean indicating whether the string matched the given p=
attern.
- * A '*' may be
- * given to match the pattern exactly up to the '*', then anything aft=
er.
- * We will also support a leading star, and match on anything that end=
s with
- * the string specified after the star.
- * Note: Should also implement matching with '?' which means match any=
single
- * char.
- * @param pattern The property name to match which may include a '*'.
- * @param props The properties to search.
- * @return The boolean - passed or failed
- * but never null.
- */
- public static boolean filterTest( String pattern, String sCandidate ) {
-
- // Vars for match strategy
- char chStar =3D '*';
-
- // Match rule booleans. Please note that 'bLeading'
- // and 'bTrailing' refer to the string we are searching for.
- // For example, if the strategy is bLeading, and the Match frag
- // is "wet", and the candidate string is "wetrust", it will pass.
- // Likewise if the strategy is bTrailing and the Match frag is
- // "rust" and the candidate string is "wetrust", it will pass.
- boolean bLeading =3D false;
- boolean bTrailing =3D false;
- boolean bFullMatch =3D false;
- boolean bAnywhere =3D false;
- boolean bAllMatch =3D false;
-
- boolean bPass =3D false;
-
- String sMatchFrag =3D ""; //$NON-NLS-1$
-// List propNames =3D new ArrayList();
-
-
- // 1. Analyze pattern to resolve match strategy
-
- // First ensure the pattern is safe to work with.
- // If the pattern is an empty string, set it to '*',
- // which means anything passes.
- pattern =3D pattern.trim();
- if ( pattern.length() =3D=3D 0 )
- pattern =3D "*"; //$NON-NLS-1$
-
- int iFirstStar =3D pattern.indexOf( chStar );
- int iLastStar =3D pattern.lastIndexOf( chStar );
-
- // If there are any stars:
- if( (iFirstStar > -1) && ( iLastStar > -1 ) )
- {
- // and their positions are the same (same star, silly)
- if( iFirstStar =3D=3D iLastStar )
- {
- // and this star is at the front:
- if( iFirstStar =3D=3D 0 )
- {
- // and the pattern is only one byte long:
- if( pattern.length() =3D=3D 1 )
- {
- // Then the pattern is a single '*',
- // and all will pass the match:
- bAllMatch =3D true;
- }
- else
- {
- // Or the pattern is a leading star followed
- // by a string:
- bTrailing =3D true;
- sMatchFrag =3D pattern.substring( 1 );
- }
- }
- else
- {
- // OR the star is NOT at the front, so the
- // pattern is a trailing star preceded by a string:
- bLeading =3D true;
- sMatchFrag =3D pattern.substring( 0, iLastStar );
-
- }
- }
- else
- {
- // They are not equal
- //sMatchStrategy =3D ANYWHERE;
- bAnywhere =3D true;
- sMatchFrag =3D pattern.substring( iFirstStar + 1, iLastSt=
ar );
- }
- }
- else
- {
- // there are no stars at all
- //sMatchStrategy =3D FULL_MATCH;
- bFullMatch =3D true;
- sMatchFrag =3D pattern;
- }
-
- // Now test the string
- String name =3D sCandidate;
- bPass =3D false;
-
- // force the match fragment and the test string to UPPER case
- String sMatchFragUpper =3D sMatchFrag.toUpperCase();
- String sNameUpper =3D name.toUpperCase();
-
- // Test all of the booleans. Only one should be true.
- if( bAllMatch ) {
- bPass =3D true;
- }
- else
- if( bAnywhere ) {
- if( sNameUpper.indexOf( sMatchFragUpper ) > -1 )
- bPass =3D true;
- }
- else
- if( bFullMatch ) {
- if( sNameUpper.equals( sMatchFragUpper ) )
- bPass =3D true;
- }
- else
- if( bLeading ) {
- if( sNameUpper.startsWith( sMatchFragUpper ) )
- bPass =3D true;
- }
- else
- if( bTrailing ) {
- if( sNameUpper.endsWith( sMatchFragUpper ) )
- bPass =3D true;
- }
-
- return bPass;
- }
-
- public static void setBeanProperties(Object bean, Properties props, St=
ring prefix) {
+ public static void setBeanProperties(Object bean, Properties props, Strin=
g prefix) {
// Move all prop names to lower case so we can use reflection to get
// method names and look them up in the connection props.
final Properties connProps =3D lowerCaseAllPropNames(props);
Modified: trunk/common-core/src/main/java/org/teiid/core/util/SqlUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common-core/src/main/java/org/teiid/core/util/SqlUtil.java 2012-0=
5-01 15:19:22 UTC (rev 4046)
+++ trunk/common-core/src/main/java/org/teiid/core/util/SqlUtil.java 2012-0=
5-01 19:12:27 UTC (rev 4047)
@@ -87,6 +87,6 @@
public static SQLException createFeatureNotSupportedException() {
StackTraceElement ste =3D new Exception().getStackTrace()[1];
String methodName =3D ste.getMethodName();
- return new SQLFeatureNotSupportedException(methodName + " is not supp=
orted");
+ return new SQLFeatureNotSupportedException(methodName + " is not supp=
orted"); //$NON-NLS-1$
} =
}
Property changes on: trunk/common-core/src/test/java/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org:3535-3555*
/branches/7.6.x/common-core/src/test/java/org:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/test/java/org:3816-3868*,3876-3915*,3920-39=
83*
/trunk/common-core/src/test/java/org:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org:3535-3555*
/branches/7.6.x/common-core/src/test/java/org:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/test/java/org:3816-3868*,3876-3915*,3920-39=
83*
/branches/8.0.x/common-core/src/test/java/org:4002-4046*
/trunk/common-core/src/test/java/org:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid:3816-3868*,3876-3915*,3=
920-3983*
/trunk/common-core/src/test/java/org/teiid:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/common-core/src/test/java/org/teiid:4002-4046*
/trunk/common-core/src/test/java/org/teiid:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid/core:3673-3711*,3754-37=
69
/branches/7.7.x/common-core/src/test/java/org/teiid/core:3816-3868*,3876-39=
15*,3920-3983*
/trunk/common-core/src/test/java/org/teiid/core:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid/core:3673-3711*,3754-37=
69
/branches/7.7.x/common-core/src/test/java/org/teiid/core:3816-3868*,3876-39=
15*,3920-3983*
/branches/8.0.x/common-core/src/test/java/org/teiid/core:4002-4046*
/trunk/common-core/src/test/java/org/teiid/core:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/TestMet=
aMatrixException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatri=
xException.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixExce=
ption.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixExce=
ption.java:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.jav=
a:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatri=
xException.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixExce=
ption.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixExce=
ption.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixExce=
ption.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.jav=
a:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/TestMet=
aMatrixRuntimeException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatri=
xRuntimeException.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRunt=
imeException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRunt=
imeException.java:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeExcept=
ion.java:3188-3450,3452-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatri=
xRuntimeException.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRunt=
imeException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRunt=
imeException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRunt=
imeException.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeExcept=
ion.java:3188-3450,3452-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/crypto
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/crypto:3535-3=
555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/crypto:3673-3711,3=
754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/crypto:3816-3868,3=
876-3915,3920-3983
/trunk/common-core/src/test/java/org/teiid/core/crypto:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/crypto:3535-3=
555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/crypto:3673-3711,3=
754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/crypto:3816-3868,3=
876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/crypto:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/crypto:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types:3535-35=
55*
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types:3673-3711*,3=
754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types:3816-3868*,3=
876-3915*,3920-3983*
/trunk/common-core/src/test/java/org/teiid/core/types:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types:3535-35=
55*
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types:3673-3711*,3=
754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types:4002-4046*
/trunk/common-core/src/test/java/org/teiid/core/types:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/T=
estBlobValue.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestBlo=
bValue.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestBlobValu=
e.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestBlobValu=
e.java:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:35=
07-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestBlo=
bValue.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestBlobValu=
e.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestBlobValu=
e.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestBlobValu=
e.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:35=
07-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/T=
estClobValue.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestClo=
bValue.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestClobValu=
e.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestClobValu=
e.java:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:35=
07-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestClo=
bValue.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestClobValu=
e.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestClobValu=
e.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestClobValu=
e.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:35=
07-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/T=
estDataTypeManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestDat=
aTypeManager.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestDataType=
Manager.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestDataType=
Manager.java:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.j=
ava:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestDat=
aTypeManager.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestDataType=
Manager.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestDataType=
Manager.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestDataType=
Manager.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.j=
ava:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/T=
estSQLXMLImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestSQL=
XMLImpl.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLIm=
pl.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLIm=
pl.java:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3=
507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestSQL=
XMLImpl.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLIm=
pl.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLIm=
pl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLIm=
pl.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3=
507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/T=
estXMLStreamSourceTranslator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXML=
StreamSourceTranslator.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestXMLStrea=
mSourceTranslator.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestXMLStrea=
mSourceTranslator.java:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTr=
anslator.java:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXML=
StreamSourceTranslator.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestXMLStrea=
mSourceTranslator.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestXMLStrea=
mSourceTranslator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestXMLStrea=
mSourceTranslator.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTr=
anslator.java:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/T=
estXMLValue.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXML=
Value.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue=
.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue=
.java:3816-3868,3876-3915,3920-3983
/trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:350=
7-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXML=
Value.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue=
.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue=
.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:350=
7-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/b=
asic
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/basic:3=
535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/basic:3673-3=
711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/basic:3816-3=
868,3876-3915,3920-3983
/trunk/common-core/src/test/java/org/teiid/core/types/basic:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/basic:3=
535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/basic:3673-3=
711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/basic:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/basic:4002-4=
046
/trunk/common-core/src/test/java/org/teiid/core/types/basic:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/util:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/util:3673-3711,375=
4-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/util:3816-3868,387=
6-3915,3920-3983
/trunk/common-core/src/test/java/org/teiid/core/util:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/util:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/util:3673-3711,375=
4-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/util:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/util:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/util:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/query
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/query:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid/query:3673-3711*,3754-3=
769
/branches/7.7.x/common-core/src/test/java/org/teiid/query:3816-3868*,3876-3=
915*,3920-3983*
/trunk/common-core/src/test/java/org/teiid/query:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/query:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid/query:3673-3711*,3754-3=
769
/branches/7.7.x/common-core/src/test/java/org/teiid/query:3816-3868*,3876-3=
915*,3920-3983*
/branches/8.0.x/common-core/src/test/java/org/teiid/query:4002-4046*
/trunk/common-core/src/test/java/org/teiid/query:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/query/unitte=
st
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/query/unittest:353=
5-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/query/unittest:3673-371=
1,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/query/unittest:3816-386=
8,3876-3915,3920-3983
/trunk/common-core/src/test/java/org/teiid/query/unittest:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/query/unittest:353=
5-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/query/unittest:3673-371=
1,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/query/unittest:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/query/unittest:4002-4046
/trunk/common-core/src/test/java/org/teiid/query/unittest:3507-3666
Property changes on: trunk/connectors/connector-file/src/main/java/org/teii=
d/resource/adapter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/reso=
urce/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter:3816-3868*,3876-3915*,3920-3983*
/trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3=
507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/reso=
urce/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter:4002-4046*
/trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3=
507-3666
Property changes on: trunk/connectors/connector-file/src/main/java/org/teii=
d/resource/adapter/file
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/reso=
urce/adapter/file:3535-3555
/branches/7.6.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter/file:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter/file:3816-3868,3876-3915,3920-3983
/trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/f=
ile:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/reso=
urce/adapter/file:3535-3555
/branches/7.6.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter/file:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter/file:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter/file:4002-4046
/trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/f=
ile:3507-3666
Property changes on: trunk/connectors/connector-file/src/main/resources/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/resources/org:3535-=
3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org:3673-3711*=
,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org:3816-3868*=
,3876-3915*,3920-3983*
/trunk/connectors/connector-file/src/main/resources/org:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/resources/org:3535-=
3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org:3673-3711*=
,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org:3816-3868*=
,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org:4002-4046*
/trunk/connectors/connector-file/src/main/resources/org:3507-3666
Property changes on: trunk/connectors/connector-file/src/main/resources/org=
/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid=
:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid:3673=
-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid:3816=
-3868*,3876-3915*,3920-3983*
/trunk/connectors/connector-file/src/main/resources/org/teiid:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid=
:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid:3673=
-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid:3816=
-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid:4002=
-4046*
/trunk/connectors/connector-file/src/main/resources/org/teiid:3507-3666
Property changes on: trunk/connectors/connector-file/src/main/resources/org=
/teiid/resource
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid=
/resource:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce:3816-3868*,3876-3915*,3920-3983*
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource:3507=
-3666
+ /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid=
/resource:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce:4002-4046*
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource:3507=
-3666
Property changes on: trunk/connectors/connector-file/src/main/resources/org=
/teiid/resource/adapter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid=
/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter:3816-3868*,3876-3915*,3920-3983*
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adap=
ter:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid=
/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter:4002-4046*
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adap=
ter:3507-3666
Property changes on: trunk/connectors/connector-file/src/main/resources/org=
/teiid/resource/adapter/file
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid=
/resource/adapter/file:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file:3816-3868*,3876-3915*,3920-3983*
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adap=
ter/file:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid=
/resource/adapter/file:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file:4002-4046*
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adap=
ter/file:3507-3666
Property changes on: trunk/connectors/connector-file/src/main/resources/org=
/teiid/resource/adapter/file/i18n.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid=
/resource/adapter/file/i18n.properties:3535-3555
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file/i18n.properties:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file/i18n.properties:3816-3868,3876-3915,3920-3983
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adap=
ter/file/i18n.properties:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid=
/resource/adapter/file/i18n.properties:3535-3555
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file/i18n.properties:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file/i18n.properties:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file/i18n.properties:4002-4046
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adap=
ter/file/i18n.properties:3507-3666
Property changes on: trunk/connectors/connector-file/src/test/java/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/test/java/org:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org:3673-3711*,3754=
-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org:3816-3868*,3876=
-3915*,3920-3983*
/trunk/connectors/connector-file/src/test/java/org:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/test/java/org:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org:3673-3711*,3754=
-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org:3816-3868*,3876=
-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org:4002-4046*
/trunk/connectors/connector-file/src/test/java/org:3507-3666
Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid:3535=
-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid:3673-3711=
*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid:3816-3868=
*,3876-3915*,3920-3983*
/trunk/connectors/connector-file/src/test/java/org/teiid:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid:3535=
-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid:3673-3711=
*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid:3816-3868=
*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid:4002-4046*
/trunk/connectors/connector-file/src/test/java/org/teiid:3507-3666
Property changes on: trunk/connectors/connector-file/src/test/java/org/teii=
d/resource
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/reso=
urce:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource:=
3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource:=
3816-3868*,3876-3915*,3920-3983*
/trunk/connectors/connector-file/src/test/java/org/teiid/resource:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/reso=
urce:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource:=
3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource:=
3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource:=
4002-4046*
/trunk/connectors/connector-file/src/test/java/org/teiid/resource:3507-3666
Property changes on: trunk/connectors/connector-file/src/test/java/org/teii=
d/resource/adapter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/reso=
urce/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter:3816-3868*,3876-3915*,3920-3983*
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3=
507-3666
+ /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/reso=
urce/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter:4002-4046*
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3=
507-3666
Property changes on: trunk/connectors/connector-file/src/test/java/org/teii=
d/resource/adapter/file
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/reso=
urce/adapter/file:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file:3816-3868*,3876-3915*,3920-3983*
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/f=
ile:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/reso=
urce/adapter/file:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file:4002-4046*
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/f=
ile:3507-3666
Property changes on: trunk/connectors/connector-file/src/test/java/org/teii=
d/resource/adapter/file/TestFileConnection.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/reso=
urce/adapter/file/TestFileConnection.java:3535-3555
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file/TestFileConnection.java:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file/TestFileConnection.java:3816-3868,3876-3915,3920-3983
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/f=
ile/TestFileConnection.java:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/reso=
urce/adapter/file/TestFileConnection.java:3535-3555
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file/TestFileConnection.java:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file/TestFileConnection.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file/TestFileConnection.java:4002-4046
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/f=
ile/TestFileConnection.java:3507-3666
Property changes on: trunk/connectors/connector-ldap/src/main/java/org/teii=
d/resource/adapter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/reso=
urce/adapter:3535-3555*
/branches/7.6.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter:3816-3868*,3876-3915*,3920-3983*
/trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3=
507-3666
+ /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/reso=
urce/adapter:3535-3555*
/branches/7.6.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter:4002-4046*
/trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3=
507-3666
Property changes on: trunk/connectors/connector-ldap/src/main/java/org/teii=
d/resource/adapter/ldap
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/reso=
urce/adapter/ldap:3535-3555
/branches/7.6.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter/ldap:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter/ldap:3816-3868,3876-3915,3920-3983
/trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/l=
dap:3507-3666
+ /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/reso=
urce/adapter/ldap:3535-3555
/branches/7.6.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter/ldap:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter/ldap:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter/ldap:4002-4046
/trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/l=
dap:3507-3666
Property changes on: trunk/connectors/connector-ws/src/main/resources/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ws/src/main/resources/org:3535-35=
55*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org:3673-3711*,3=
754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org:3816-3868*,3=
876-3915*,3920-3983*
/trunk/connectors/connector-ws/src/main/resources/org:3507-3666
+ /branches/7.4.x/connectors/connector-ws/src/main/resources/org:3535-35=
55*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org:3673-3711*,3=
754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org:4002-4046*
/trunk/connectors/connector-ws/src/main/resources/org:3507-3666
Property changes on: trunk/connectors/connector-ws/src/main/resources/org/t=
eiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid:3=
535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid:3673-3=
711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid:3816-3=
868*,3876-3915*,3920-3983*
/trunk/connectors/connector-ws/src/main/resources/org/teiid:3507-3666
+ /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid:3=
535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid:3673-3=
711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid:3816-3=
868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid:4002-4=
046*
/trunk/connectors/connector-ws/src/main/resources/org/teiid:3507-3666
Property changes on: trunk/connectors/connector-ws/src/main/resources/org/t=
eiid/resource
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/r=
esource:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce:3816-3868*,3876-3915*,3920-3983*
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource:3507-3=
666
+ /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/r=
esource:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce:4002-4046*
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource:3507-3=
666
Property changes on: trunk/connectors/connector-ws/src/main/resources/org/t=
eiid/resource/adapter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/r=
esource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter:3816-3868*,3876-3915*,3920-3983*
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapte=
r:3507-3666
+ /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/r=
esource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter:4002-4046*
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapte=
r:3507-3666
Property changes on: trunk/connectors/connector-ws/src/main/resources/org/t=
eiid/resource/adapter/ws
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/r=
esource/adapter/ws:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws:3816-3868*,3876-3915*,3920-3983*
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapte=
r/ws:3507-3666
+ /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/r=
esource/adapter/ws:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws:4002-4046*
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapte=
r/ws:3507-3666
Property changes on: trunk/connectors/connector-ws/src/main/resources/org/t=
eiid/resource/adapter/ws/i18n.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/r=
esource/adapter/ws/i18n.properties:3535-3555
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws/i18n.properties:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws/i18n.properties:3816-3868,3876-3915,3920-3983
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapte=
r/ws/i18n.properties:3507-3666
+ /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/r=
esource/adapter/ws/i18n.properties:3535-3555
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws/i18n.properties:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws/i18n.properties:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws/i18n.properties:4002-4046
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapte=
r/ws/i18n.properties:3507-3666
Modified: trunk/connectors/translator-hive/src/main/java/org/teiid/translat=
or/hive/HiveExecutionFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/connectors/translator-hive/src/main/java/org/teiid/translator/hiv=
e/HiveExecutionFactory.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-hive/src/main/java/org/teiid/translator/hiv=
e/HiveExecutionFactory.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -128,17 +128,6 @@
} =
=
@Override
- public boolean supportsBetweenCriteria() {
- return false;
- }
-
- @Override
- public boolean supportsCaseExpressions() {
- //https://issues.apache.org/jira/browse/HIVE-164
- return true;
- }
-
- @Override
public boolean supportsCorrelatedSubqueries() {
//https://issues.apache.org/jira/browse/HIVE-784
return false;
Property changes on: trunk/connectors/translator-jdbc/src/main/java/org/tei=
id/translator/jdbc/FunctionModifier.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/tra=
nslator/jdbc/FunctionModifier.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/FunctionModifier.java:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/FunctionModifier.java:3816-3868,3876-3915,3920-3983
/trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/F=
unctionModifier.java:3598-3666
+ /branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/tra=
nslator/jdbc/FunctionModifier.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/FunctionModifier.java:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/FunctionModifier.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/FunctionModifier.java:4002-4046
/trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/F=
unctionModifier.java:3598-3666
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/JDBCBaseExecution.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/JDBCBaseExecution.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/JDBCBaseExecution.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -53,6 +53,7 @@
protected Connection connection;
protected ExecutionContext context;
protected JDBCExecutionFactory executionFactory;
+ protected Command command;
=
// Derived from properties
protected boolean trimString;
@@ -65,7 +66,7 @@
// Constructors
// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
=
- protected JDBCBaseExecution(Connection connection, ExecutionContext co=
ntext, JDBCExecutionFactory jef) {
+ protected JDBCBaseExecution(Command command, Connection connection, Ex=
ecutionContext context, JDBCExecutionFactory jef) {
this.connection =3D connection;
this.context =3D context;
=
@@ -73,6 +74,7 @@
=
trimString =3D jef.isTrimStrings();
fetchSize =3D context.getBatchSize();
+ this.command =3D command;
}
=
/**
@@ -143,7 +145,7 @@
=
protected void setSizeContraints(Statement statement) {
try {
- statement.setFetchSize(fetchSize);
+ executionFactory.setFetchSize(command, context, statement, fetchSize=
);
} catch (SQLException e) {
if (LogManager.isMessageToBeRecorded(LogConstants.CTX_CONNECTOR, Messag=
eLevel.DETAIL)) {
LogManager.logDetail(LogConstants.CTX_CONNECTOR, context.getRequest=
Id(), " could not set fetch size: ", fetchSize); //$NON-NLS-1$
@@ -193,15 +195,15 @@
=
public void addStatementWarnings() throws SQLException {
SQLWarning warning =3D this.statement.getWarnings();
- while (warning !=3D null) {
- SQLWarning toAdd =3D warning;
- warning =3D toAdd.getNextWarning();
- toAdd.setNextException(null);
- if (LogManager.isMessageToBeRecorded(LogConstants.CTX_CONNECTOR, Mes=
sageLevel.DETAIL)) {
- LogManager.logDetail(LogConstants.CTX_CONNECTOR, context.getRequest=
Id() + " Warning: ", warning); //$NON-NLS-1$
- }
- context.addWarning(toAdd);
- }
+ if (warning !=3D null) {
+ context.addWarning(warning);
+ if (LogManager.isMessageToBeRecorded(LogConstants.CTX_CONNECTOR, Messag=
eLevel.DETAIL)) {
+ while (warning !=3D null) {
+ LogManager.logDetail(LogConstants.CTX_CONNECTOR, context.getRequestId=
() + " Warning: ", warning); //$NON-NLS-1$
+ warning =3D warning.getNextWarning();
+ }
+ }
+ }
this.statement.clearWarnings();
}
}
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/JDBCExecutionFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/JDBCExecutionFactory.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/JDBCExecutionFactory.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -30,6 +30,7 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.sql.Statement;
import java.sql.Time;
import java.sql.Timestamp;
import java.text.MessageFormat;
@@ -325,16 +326,6 @@
}
=
@Override
- public boolean supportsBetweenCriteria() {
- return true;
- }
-
- @Override
- public boolean supportsCaseExpressions() {
- return true;
- }
-
- @Override
public boolean supportsCompareCriteriaEquals() {
return true;
}
@@ -1134,8 +1125,24 @@
return nameParts;
}
=
+ /**
+ * Get the predicate name for LIKE_REGEX
+ * @return =
+ */
public String getLikeRegexString() {
return SQLConstants.Reserved.LIKE_REGEX;
}
+
+ /**
+ * Set the fetch size on the given statement.
+ * @param context =
+ * @param command =
+ * @param statement
+ * @param fetchSize
+ * @throws SQLException
+ */
+ public void setFetchSize(Command command, ExecutionContext context, State=
ment statement, int fetchSize) throws SQLException {
+ statement.setFetchSize(fetchSize);
+ }
=
}
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/JDBCQueryExecution.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/JDBCQueryExecution.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/JDBCQueryExecution.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -52,7 +52,6 @@
// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
=
protected ResultSet results;
- protected Command command;
protected Class[] columnDataTypes;
=
// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
@@ -60,8 +59,7 @@
// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
=
public JDBCQueryExecution(Command command, Connection connection, Exec=
utionContext context, JDBCExecutionFactory env) {
- super(connection, context, env);
- this.command =3D command;
+ super(command, connection, context, env);
}
=
@Override
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/JDBCUpdateExecution.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/JDBCUpdateExecution.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/JDBCUpdateExecution.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -43,7 +43,6 @@
*/
public class JDBCUpdateExecution extends JDBCBaseExecution implements Upda=
teExecution {
=
- private Command command;
private int[] result;
=
/**
@@ -54,8 +53,7 @@
* @param id
*/
public JDBCUpdateExecution(Command command, Connection connection, Execut=
ionContext context, JDBCExecutionFactory env) {
- super(connection, context, env);
- this.command =3D command;
+ super(command, connection, context, env);
}
=
// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/SimpleJDBCExecutionFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/SimpleJDBCExecutionFactory.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/SimpleJDBCExecutionFactory.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -85,12 +85,6 @@
}
=
@Override
- public boolean supportsBetweenCriteria() {
- return false;
- }
-
-
- @Override
public boolean supportsLikeCriteriaEscapeCharacter() {
return false;
}
@@ -161,11 +155,6 @@
}
=
@Override
- public boolean supportsCaseExpressions() {
- return false;
- }
-
- @Override
public boolean supportsSearchedCaseExpressions() {
return false;
}
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/derby/DerbyExecutionFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/derby/DerbyExecutionFactory.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/derby/DerbyExecutionFactory.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -171,16 +171,7 @@
return supportedFunctions;
}
=
- /**
- * Derby supports only SearchedCaseExpression, not CaseExpression. =
- * @since 5.0
- */
@Override
- public boolean supportsCaseExpressions() {
- return false;
- }
- =
- @Override
public boolean supportsRowLimit() {
return this.getDatabaseVersion().compareTo(TEN_5) >=3D 0;
}
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/modeshape/ModeShapeExecutionFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/modeshape/ModeShapeExecutionFactory.java 2012-05-01 15:19:22 UTC (rev 404=
6)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/modeshape/ModeShapeExecutionFactory.java 2012-05-01 19:12:27 UTC (rev 404=
7)
@@ -194,11 +194,6 @@
}
=
@Override
- public boolean supportsCaseExpressions() {
- return false;
- }
- =
- @Override
public boolean supportsCorrelatedSubqueries() {
return false;
}
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/oracle/OracleExecutionFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/oracle/OracleExecutionFactory.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/oracle/OracleExecutionFactory.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -41,6 +41,7 @@
import org.teiid.language.visitor.CollectorVisitor;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
+import org.teiid.metadata.AbstractMetadataRecord;
import org.teiid.metadata.Column;
import org.teiid.translator.ExecutionContext;
import org.teiid.translator.SourceSystemFunctions;
@@ -493,6 +494,34 @@
super.visit(obj);
}
=
+ public void visit(NamedTable table) {
+ stripDualAlias(table);
+ super.visit(table);
+ }
+
+ private void stripDualAlias(NamedTable table) {
+ if (table.getCorrelationName() !=3D null) {
+ String groupName =3D null;
+ AbstractMetadataRecord groupID =3D table.getMetadataObject();
+ if(groupID !=3D null) { =
+ groupName =3D getName(groupID);
+ } else {
+ groupName =3D table.getName();
+ }
+ if (DUAL.equalsIgnoreCase(groupName)) {
+ table.setCorrelationName(null);
+ }
+ }
+ }
+ =
+ @Override
+ public void visit(ColumnReference obj) {
+ if (obj.getTable() !=3D null) {
+ stripDualAlias(obj.getTable());
+ }
+ super.visit(obj);
+ }
+ =
};
}
=
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/sqlserver/SQLServerExecutionFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/sqlserver/SQLServerExecutionFactory.java 2012-05-01 15:19:22 UTC (rev 404=
6)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/sqlserver/SQLServerExecutionFactory.java 2012-05-01 19:12:27 UTC (rev 404=
7)
@@ -287,4 +287,9 @@
return true;
}
=
+ @Override
+ protected boolean setFetchSizeOnCallableStatements() {
+ return true;
+ }
+ =
}
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/sybase/SybaseExecutionFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/sybase/SybaseExecutionFactory.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/sybase/SybaseExecutionFactory.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -24,7 +24,10 @@
*/
package org.teiid.translator.jdbc.sybase;
=
+import java.sql.CallableStatement;
import java.sql.Date;
+import java.sql.SQLException;
+import java.sql.Statement;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
@@ -34,13 +37,16 @@
import java.util.List;
import java.util.Map;
=
+import org.teiid.language.Command;
import org.teiid.language.Expression;
import org.teiid.language.Function;
import org.teiid.language.Literal;
import org.teiid.language.SQLConstants;
+import org.teiid.translator.ExecutionContext;
import org.teiid.translator.SourceSystemFunctions;
import org.teiid.translator.Translator;
import org.teiid.translator.TranslatorException;
+import org.teiid.translator.TranslatorProperty;
import org.teiid.translator.jdbc.AliasModifier;
import org.teiid.translator.jdbc.ConvertModifier;
import org.teiid.translator.jdbc.EscapeSyntaxModifier;
@@ -58,6 +64,7 @@
public static final String FIFTEEN_5 =3D "15.5"; //$NON-NLS-1$
=
protected Map formatMap =3D new HashMap=
();
+ protected boolean jtdsDriver;
=
public SybaseExecutionFactory() {
setDatabaseVersion(TWELVE_5);
@@ -365,5 +372,27 @@
public boolean supportsRowLimit() {
return getDatabaseVersion().compareTo(FIFTEEN_0_2) >=3D 0;
}
+
+ @TranslatorProperty(display=3D"JTDS Driver", description=3D"True if the d=
river is the JTDS driver",advanced=3Dtrue)
+ public boolean isJtdsDriver() {
+ return jtdsDriver;
+ }
+ =
+ public void setJtdsDriver(boolean jtdsDriver) {
+ this.jtdsDriver =3D jtdsDriver;
+ }
+ =
+ protected boolean setFetchSizeOnCallableStatements() {
+ return false;
+ }
+ =
+ @Override
+ public void setFetchSize(Command command, ExecutionContext context,
+ Statement statement, int fetchSize) throws SQLException {
+ if (!isJtdsDriver() && !setFetchSizeOnCallableStatements() && statement =
instanceof CallableStatement) {
+ return;
+ }
+ super.setFetchSize(command, context, statement, fetchSize);
+ }
=
}
Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/tei=
id/translator/jdbc/ingres
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/tra=
nslator/jdbc/ingres:3535-3555*
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres:3673-3711*,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres:3816-3868*,3876-3915*,3920-3983*
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/i=
ngres:3507-3666
+ /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/tra=
nslator/jdbc/ingres:3535-3555*
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres:3673-3711*,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres:4002-4046*
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/i=
ngres:3507-3666
Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/tei=
id/translator/jdbc/ingres/TestIngresConvertModifier.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/tra=
nslator/jdbc/ingres/TestIngresConvertModifier.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresConvertModifier.java:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresConvertModifier.java:3816-3868,3876-3915,3920-3983
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/i=
ngres/TestIngresConvertModifier.java:3507-3666
+ /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/tra=
nslator/jdbc/ingres/TestIngresConvertModifier.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresConvertModifier.java:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresConvertModifier.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresConvertModifier.java:4002-4046
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/i=
ngres/TestIngresConvertModifier.java:3507-3666
Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/tei=
id/translator/jdbc/ingres/TestIngresExecutionFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/tra=
nslator/jdbc/ingres/TestIngresExecutionFactory.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresExecutionFactory.java:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresExecutionFactory.java:3816-3868,3876-3915,3920-3983
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/i=
ngres/TestIngresExecutionFactory.java:3507-3666
+ /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/tra=
nslator/jdbc/ingres/TestIngresExecutionFactory.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresExecutionFactory.java:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresExecutionFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresExecutionFactory.java:4002-4046
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/i=
ngres/TestIngresExecutionFactory.java:3507-3666
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/oracle/TestOracleTranslator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdb=
c/oracle/TestOracleTranslator.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdb=
c/oracle/TestOracleTranslator.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -655,8 +655,8 @@
* @since 4.3
*/
@Test public void testDUAL() throws Exception {
- String input =3D "SELECT something FROM DUAL"; //$NON-NLS-1$
- String output =3D "SELECT something FROM DUAL"; //$NON-NLS-1$
+ String input =3D "SELECT something FROM DUAL as g0"; //$NON-NLS-1$
+ String output =3D "SELECT seq.nextval FROM DUAL"; //$NON-NLS-1$
=
helpTestVisitor(getOracleSpecificMetadata(),
input, =
@@ -776,14 +776,15 @@
cols.get(1).setNameInSource("ID:SEQUENCE=3DMYSEQUENCE.nextVal"); /=
/$NON-NLS-1$
cols.get(2).setNativeType("date"); //$NON-NLS-1$
cols.get(3).setNativeType("CHAR");
- RealMetadataFactory.createElements(dual, new String[] {"something"=
}, new String[] {DataTypeManager.DefaultDataTypes.STRING}); //$NON-NLS-1$
+ List dualCols =3D RealMetadataFactory.createElements(dual,=
new String[] {"something"}, new String[] {DataTypeManager.DefaultDataTypes=
.STRING}); //$NON-NLS-1$
+ dualCols.get(0).setNameInSource("seq.nextval");
=
ProcedureParameter in1 =3D RealMetadataFactory.createParameter("in=
1", SPParameter.IN, DataTypeManager.DefaultDataTypes.INTEGER); //$NON-NLS-1$
ColumnSet rs3 =3D RealMetadataFactory.createResultSet("proc.r=
s1", new String[] { "e1" }, new String[] { DataTypeManager.DefaultDataTypes=
.INTEGER }); //$NON-NLS-1$ //$NON-NLS-2$ =
Procedure p =3D RealMetadataFactory.createStoredProcedure("proc", =
foo, Arrays.asList(in1));
p.setResultSet(rs3);
p.setProperty(SQLConversionVisitor.TEIID_NATIVE_QUERY, "select x f=
rom y where z =3D $1");
- =
+
CompositeMetadataStore store =3D new CompositeMetadataStore(metada=
taStore);
return new TransformationMetadata(null, store, null, RealMetadataF=
actory.SFM.getSystemFunctions(), null);
}
Property changes on: trunk/connectors/translator-ldap/src/main/java/org/tei=
id/translator
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/tra=
nslator:3535-3555*
/branches/7.6.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or:3673-3711*,3754-3769
/branches/7.7.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or:3816-3868*,3876-3915*,3920-3983*
/trunk/connectors/translator-ldap/src/main/java/org/teiid/translator:3507-3=
666
+ /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/tra=
nslator:3535-3555*
/branches/7.6.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or:3673-3711*,3754-3769
/branches/7.7.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or:4002-4046*
/trunk/connectors/translator-ldap/src/main/java/org/teiid/translator:3507-3=
666
Property changes on: trunk/connectors/translator-ldap/src/main/java/org/tei=
id/translator/ldap
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/tra=
nslator/ldap:3535-3555
/branches/7.6.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or/ldap:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or/ldap:3816-3868,3876-3915,3920-3983
/trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3=
507-3666
+ /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/tra=
nslator/ldap:3535-3555
/branches/7.6.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or/ldap:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or/ldap:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or/ldap:4002-4046
/trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3=
507-3666
Modified: trunk/connectors/translator-loopback/src/main/java/org/teiid/tran=
slator/loopback/LoopbackExecutionFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/connectors/translator-loopback/src/main/java/org/teiid/translator=
/loopback/LoopbackExecutionFactory.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-loopback/src/main/java/org/teiid/translator=
/loopback/LoopbackExecutionFactory.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -27,11 +27,11 @@
=
import org.teiid.language.Command;
import org.teiid.metadata.RuntimeMetadata;
-import org.teiid.translator.Translator;
-import org.teiid.translator.TranslatorException;
import org.teiid.translator.Execution;
import org.teiid.translator.ExecutionContext;
import org.teiid.translator.ExecutionFactory;
+import org.teiid.translator.Translator;
+import org.teiid.translator.TranslatorException;
import org.teiid.translator.TranslatorProperty;
=
/**
@@ -111,8 +111,8 @@
} =
=
@Override
- public List getSupportedFunctions() {
- List functions =3D Arrays.asList(new String[] {
+ public List getSupportedFunctions() {
+ List functions =3D Arrays.asList(new String[] {
"+", "-", "*", "/", "abs", "acos", "asin", "atan", "atan2", "c=
eiling", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS=
-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"bitand", "bitnot", "bitor", "bitxor", "cos", "cot", "degrees"=
, "cos", "cot", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$=
NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
"degrees", "exp", "floor", "log", "log10", "mod", "pi", "power=
", "radians", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$N=
ON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
@@ -174,16 +174,6 @@
}
=
@Override
- public boolean supportsBetweenCriteria() {
- return true;
- }
-
- @Override
- public boolean supportsCaseExpressions() {
- return true;
- }
-
- @Override
public boolean supportsCompareCriteriaEquals() {
return true;
}
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/tr=
anslator/salesforce/MetadataProcessor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/translat=
or/salesforce/MetadataProcessor.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/translat=
or/salesforce/MetadataProcessor.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -188,102 +188,102 @@
}
String sfTypeName =3D fieldType.value();
Column column =3D null;
- if(sfTypeName.equals(FieldType.STRING) || //string
- sfTypeName.equals(FieldType.COMBOBOX) || //"combobox"
- sfTypeName.equals(FieldType.REFERENCE) || //"reference"
- sfTypeName.equals(FieldType.PHONE) || //"phone"
- sfTypeName.equals(FieldType.ID) || //"id"
- sfTypeName.equals(FieldType.URL) || //"url"
- sfTypeName.equals(FieldType.EMAIL) || //"email"
- sfTypeName.equals(FieldType.ENCRYPTEDSTRING) || //"encryptedstring"
- sfTypeName.equals(FieldType.ANY_TYPE)) { //"anytype"
+ if(sfTypeName.equals(FieldType.STRING.value()) || //string
+ sfTypeName.equals(FieldType.COMBOBOX.value()) || //"combobox"
+ sfTypeName.equals(FieldType.REFERENCE.value()) || //"reference"
+ sfTypeName.equals(FieldType.PHONE.value()) || //"phone"
+ sfTypeName.equals(FieldType.ID.value()) || //"id"
+ sfTypeName.equals(FieldType.URL.value()) || //"url"
+ sfTypeName.equals(FieldType.EMAIL.value()) || //"email"
+ sfTypeName.equals(FieldType.ENCRYPTEDSTRING.value()) || //"encrypteds=
tring"
+ sfTypeName.equals(FieldType.ANY_TYPE.value())) { //"anytype"
column =3D metadataFactory.addColumn(normalizedName, DataTypeManager.D=
efaultDataTypes.STRING, table);
column.setNativeType(sfTypeName);
- if(sfTypeName.equals(FieldType.ID)) {
+ if(sfTypeName.equals(FieldType.ID.value())) {
column.setNullType(NullType.No_Nulls);
ArrayList columnNames =3D new ArrayList();
columnNames.add(field.getName());
- metadataFactory.addPrimaryKey(field.getName()+"_PK", columnNames, tab=
le);
+ metadataFactory.addPrimaryKey(field.getName()+"_PK", columnNames, tab=
le); //$NON-NLS-1$
}
}
- else if(sfTypeName.equals(FieldType.PICKLIST)) { // "picklist"
+ else if(sfTypeName.equals(FieldType.PICKLIST.value())) { // "picklist"
column =3D metadataFactory.addColumn(normalizedName, DataTypeManager.D=
efaultDataTypes.STRING, table);
if(field.isRestrictedPicklist()) {
- column.setNativeType("restrictedpicklist");
+ column.setNativeType("restrictedpicklist"); //$NON-NLS-1$
} else {
column.setNativeType(sfTypeName);
}
=
column.setProperty(COLUMN_PICKLIST_VALUES, getPicklistValues(field));
}
- else if(sfTypeName.equals(FieldType.MULTIPICKLIST)) { //"multipicklist"
+ else if(sfTypeName.equals(FieldType.MULTIPICKLIST.value())) { //"multip=
icklist"
column =3D metadataFactory.addColumn(normalizedName, DataTypeManager.D=
efaultDataTypes.STRING, table);
if(field.isRestrictedPicklist()) {
- column.setNativeType("restrictedmultiselectpicklist");
+ column.setNativeType("restrictedmultiselectpicklist");//$NON-NLS-1$
} else {
column.setNativeType(sfTypeName);
}
column.setProperty(COLUMN_PICKLIST_VALUES, getPicklistValues(field));
}
- else if(sfTypeName.equals(FieldType.BASE_64)) { //"base64"
+ else if(sfTypeName.equals(FieldType.BASE_64.value())) { //"base64"
column =3D metadataFactory.addColumn(normalizedName, DataTypeManager.D=
efaultDataTypes.BLOB, table);
column.setNativeType(sfTypeName);
}
- else if(sfTypeName.equals(FieldType.BOOLEAN)) { //"boolean"
+ else if(sfTypeName.equals(FieldType.BOOLEAN.value())) { //"boolean"
column =3D metadataFactory.addColumn(normalizedName, DataTypeManager.D=
efaultDataTypes.BOOLEAN, table);
column.setNativeType(sfTypeName);
}
- else if(sfTypeName.equals(FieldType.CURRENCY)) { //"currency"
+ else if(sfTypeName.equals(FieldType.CURRENCY.value())) { //"currency"
column =3D metadataFactory.addColumn(normalizedName, DataTypeManager.D=
efaultDataTypes.DOUBLE, table);
column.setNativeType(sfTypeName);
column.setCurrency(true);
column.setScale(field.getScale());
column.setPrecision(field.getPrecision());
}
- else if(sfTypeName.equals(FieldType.TEXTAREA)) { //"textarea"
+ else if(sfTypeName.equals(FieldType.TEXTAREA.value())) { //"textarea"
column =3D metadataFactory.addColumn(normalizedName, DataTypeManager.D=
efaultDataTypes.STRING, table);
column.setNativeType(sfTypeName);
column.setSearchType(SearchType.Unsearchable);
}
- else if(sfTypeName.equals(FieldType.INT)) { //"int"
+ else if(sfTypeName.equals(FieldType.INT.value())) { //"int"
column =3D metadataFactory.addColumn(normalizedName, DataTypeManager.D=
efaultDataTypes.INTEGER, table);
column.setNativeType(sfTypeName);
column.setPrecision(field.getPrecision());
}
- else if(sfTypeName.equals(FieldType.DOUBLE) || //"double"
- sfTypeName.equals(FieldType.PERCENT)) { //"percent"
+ else if(sfTypeName.equals(FieldType.DOUBLE.value()) || //"double"
+ sfTypeName.equals(FieldType.PERCENT.value())) { //"percent"
column =3D metadataFactory.addColumn(normalizedName, DataTypeManager.D=
efaultDataTypes.DOUBLE, table);
column.setNativeType(sfTypeName);
column.setScale(field.getScale());
column.setPrecision(field.getPrecision());
}
- else if(sfTypeName.equals(FieldType.DATE)) { //"date"
+ else if(sfTypeName.equals(FieldType.DATE.value())) { //"date"
column =3D metadataFactory.addColumn(normalizedName, DataTypeManager.D=
efaultDataTypes.DATE, table);
column.setNativeType(sfTypeName);
}
- else if(sfTypeName.equals(FieldType.DATETIME)) { //"datetime"
+ else if(sfTypeName.equals(FieldType.DATETIME.value())) { //"datetime"
column =3D metadataFactory.addColumn(normalizedName, DataTypeManager.D=
efaultDataTypes.TIMESTAMP, table);
column.setNativeType(sfTypeName);
}
- else if(sfTypeName.equals(FieldType.TIME)) { //"time"
+ else if(sfTypeName.equals(FieldType.TIME.value())) { //"time"
column =3D metadataFactory.addColumn(normalizedName, DataTypeManager.D=
efaultDataTypes.TIME, table);
column.setNativeType(sfTypeName);
}
- if(null =3D=3D column) {
+ =
+ if(column =3D=3D null) {
LogManager.logError(LogConstants.CTX_CONNECTOR, SalesForcePlugin.Util.=
gs(SalesForcePlugin.Event.TEIID13001, sfTypeName));
continue;
- } else {
- column.setNameInSource(field.getName());
- column.setLength(field.getLength());
- if(field.isUpdateable()) {
- column.setUpdatable(true);
- hasUpdateableColumn =3D true;
- }
- column.setProperty(COLUMN_CALCULATED, String.valueOf(field.isCalculate=
d()));
- column.setProperty(COLUMN_CUSTOM, String.valueOf(field.isCustom()));
- column.setProperty(COLUMN_DEFAULTED, String.valueOf(field.isDefaultedO=
nCreate()));
+ } =
+ =
+ column.setNameInSource(field.getName());
+ column.setLength(field.getLength());
+ if(field.isUpdateable()) {
+ column.setUpdatable(true);
+ hasUpdateableColumn =3D true;
}
- =
+ column.setProperty(COLUMN_CALCULATED, String.valueOf(field.isCalculated=
()));
+ column.setProperty(COLUMN_CUSTOM, String.valueOf(field.isCustom()));
+ column.setProperty(COLUMN_DEFAULTED, String.valueOf(field.isDefaultedOn=
Create()));
} =
}
=
Property changes on: trunk/documentation/javadocs
___________________________________________________________________
Added: svn:ignore
+ .project
.settings
Modified: trunk/documentation/javadocs/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/documentation/javadocs/pom.xml 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/documentation/javadocs/pom.xml 2012-05-01 19:12:27 UTC (rev 4047)
@@ -10,421 +10,6 @@
Teiid Javadocs
Javadocs for the Teiid project
-
- org.jboss.teiid
- teiid-adminshell
- ${project.version}
-
-
- org.jboss.teiid
- teiid-api
- ${project.version}
-
-
- org.jboss.teiid
- teiid-cache-jbosscache
- ${project.version}
-
-
- org.jboss.teiid
- teiid-client
- ${project.version}
-
-
- org.jboss.teiid
- teiid-client-jdk15
- ${project.version}
-
-
- org.jboss.teiid
- teiid-common-core
- ${project.version}
-
-
- org.jboss.teiid.connectors
- salesforce-api
- ${project.version}
-
-
- org.jboss.teiid.connectors
- translator-file
- ${project.version}
-
-
- org.jboss.teiid.connectors
- translator-hive
- ${project.version}
-
-
- org.jboss.teiid.connectors
- translator-jdbc
- ${project.version}
-
-
- org.jboss.teiid.connectors
- translator-ldap
- ${project.version}
-
-
- org.jboss.teiid.connectors
- translator-loopback
- ${project.version}
-
-
- org.jboss.teiid.connectors
- translator-olap
- ${project.version}
-
-
- org.jboss.teiid.connectors
- translator-salesforce
- ${project.version}
-
-
- org.jboss.teiid.connectors
- translator-ws
- ${project.version}
-
-
- org.jboss.teiid
- teiid-console
- ${project.version}
-
-
- org.jboss.teiid
- teiid-engine
- ${project.version}
-
-
- org.jboss.teiid
- teiid-hibernate-dialect
- ${project.version}
-
-
- org.jboss.teiid
- teiid-jboss-integration
- ${project.version}
-
-
- org.jboss.teiid
- teiid-metadata
- ${project.version}
-
-
- org.jboss.teiid
- teiid-runtime
- ${project.version}
-
-
- org.jboss.teiid
- test-integration-common
- ${project.version}
-
-
- org.jboss.teiid.teiid-test-integration
- test-integration-db
- ${project.version}
-
-
- org.codehaus.groovy
- groovy-all
- 1.7.2
-
-
- junit
- junit
- 3.8.1
-
-
- jline
- jline
- 0.9.94
-
-
- org.fusesource.jansi
- jansi
- 1.2.1
-
-
- commons-cli
- commons-cli
- 1.2
-
-
- javax.resource
- connector-api
-
-
- net.sf.retrotranslator
- retrotranslator-runtime
- 1.2.9
-
-
- net.sf.retrotranslator
- retrotranslator-transformer
- 1.2.9
-
-
- org.jboss.cache
- jbosscache-core
-
-
- commons-logging
- commons-logging
-
-
- org.jboss.man
- jboss-managed
-
-
- org.apache.cxf
- cxf-rt-frontend-jaxws
- 2.2.2
-
-
- org.apache.cxf
- cxf-rt-transports-http
- 2.2.2
-
-
- org.apache.cxf
- cxf-rt-ws-security
- 2.2.2
-
-
- org.apache.cxf
- cxf-rt-ws-policy
- 2.2.2
-
-
- org.jboss
- jboss-vfs
-
-
- javax.transaction
- jta
- 1.1
-
-
- org.mockito
- mockito-all
- 1.5
-
-
- org.olap4j
- olap4j
- 0.9.8.343
-
-
- log4j
- log4j
-
-
- org.rhq
- rhq-core-domain
- ${org.rhq.version}
-
-
- org.rhq
- rhq-core-plugin-api
- ${org.rhq.version}
-
-
- org.rhq
- rhq-core-native-system
- ${org.rhq.version}
-
-
- org.rhq
- rhq-jmx-plugin
- ${org.rhq.version}
-
-
- org.rhq
- rhq-core-util
- ${org.rhq.version}
-
-
- mc4j
- org-mc4j-ems
- 1.2.6
-
-
- javax.persistence
- persistence-api
- 1.0
-
-
- jboss.jboss-embeddable-ejb3
- hibernate-all
- 1.0.0.Alpha9
-
-
- org.jboss.integration
- jboss-profileservice-spi
- 5.1.0.CR2
-
-
- org.apache.ant
- ant
-
-
- org.apache.commons
- commons-io
- 1.3.2
-
-
- org.jboss.deployers
- jboss-deployers-vfs-spi
-
-
- org.jboss.deployers
- jboss-deployers-vfs
-
-
- net.sourceforge.saxon
- saxonhe
-
-
- com.googlecode.json-simple
- json-simple
-
-
- nux
- nux
- 1.6
-
-
- xom
- xom
- 1.2
-
-
- org.hibernate
- hibernate-core
- 3.5.2-Final
-
-
- org.jboss
- jboss-reflect
-
-
- org.jboss.jbossas
- jboss-as-connector
-
-
- org.jboss.microcontainer
- jboss-aop-mc-int
- 2.0.6.GA
-
-
- org.jboss.security
- jbosssx
- 2.0.3.SP1
-
-
- org.jboss.naming
- jnp-client
- 5.0.3.GA
-
-
- org.jboss.remoting
- jboss-remoting
- 2.5.1
-
-
- org.jboss.aspects
- jboss-security-aspects
- 1.0.0.GA
-
-
- org.jboss.aspects
- jboss-remoting-aspects
- 1.0.1.GA
-
-
- oswego-concurrent
- concurrent
- 1.3.4-jboss-update1
-
-
- org.jboss.jbossas
- jboss-as-server
- 5.1.0.GA
-
-
- org.jboss.jbossas
- jboss-as-profileservice
- 5.1.0.GA
-
-
- org.jboss.netty
- netty
-
-
- postgresql
- postgresql
- 8.3-606.jdbc3
-
-
- com.h2database
- h2
- 1.2.147
-
-
- jgroups
- jgroups
-
-
- org.apache.ant
- ant-launcher
- 1.7.0
-
-
- ant-contrib
- ant-contrib
- 1.0b3
-
-
- ant-contrib
- cpptasks
- 1.0b3
-
-
- org.dbunit
- dbunit
- 2.2
-
-
- commons-collections
- commons-collections
- 3.2.1
-
-
- org.slf4j
- slf4j-api
- 1.5.6
-
-
- org.apache.poi
- poi
- 3.2-FINAL
-
-
- jdom
- jdom
- 1.0
-
-
- org.apache.derby
- derby
- ${derby.version}
-
-
- mysql
- mysql-connector-java
- ${mysql.connector.version}
-
Property changes on: trunk/engine/src/main/java/org/teiid/api
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api:3816-3868*,3876-3915*,39=
20-3983*
/trunk/engine/src/main/java/org/teiid/api:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api:3816-3868*,3876-3915*,39=
20-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/api:4002-4046*
/trunk/engine/src/main/java/org/teiid/api:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception:3673-3711*,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception:3816-3868*,387=
6-3915*,3920-3983*
/trunk/engine/src/main/java/org/teiid/api/exception:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception:3673-3711*,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception:3816-3868*,387=
6-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception:4002-4046*
/trunk/engine/src/main/java/org/teiid/api/exception:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query:353=
5-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query:3673-371=
1*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query:3816-386=
8*,3876-3915*,3920-3983*
/trunk/engine/src/main/java/org/teiid/api/exception/query:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query:353=
5-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query:3673-371=
1*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query:3816-386=
8*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query:4002-404=
6*
/trunk/engine/src/main/java/org/teiid/api/exception/query:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/ExpressionEvaluationException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Exp=
ressionEvaluationException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/Expressi=
onEvaluationException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/Expressi=
onEvaluationException.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluat=
ionException.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Exp=
ressionEvaluationException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/Expressi=
onEvaluationException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/Expressi=
onEvaluationException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/Expressi=
onEvaluationException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluat=
ionException.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/FunctionExecutionException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Fun=
ctionExecutionException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/Function=
ExecutionException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/Function=
ExecutionException.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecution=
Exception.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Fun=
ctionExecutionException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/Function=
ExecutionException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/Function=
ExecutionException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/Function=
ExecutionException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecution=
Exception.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/FunctionMetadataException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Fun=
ctionMetadataException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/Function=
MetadataException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/Function=
MetadataException.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataE=
xception.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Fun=
ctionMetadataException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/Function=
MetadataException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/Function=
MetadataException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/Function=
MetadataException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataE=
xception.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/InvalidFunctionException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Inv=
alidFunctionException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/InvalidF=
unctionException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/InvalidF=
unctionException.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionEx=
ception.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Inv=
alidFunctionException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/InvalidF=
unctionException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/InvalidF=
unctionException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/InvalidF=
unctionException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionEx=
ception.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/QueryMetadataException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryMetadataException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryMet=
adataException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryMet=
adataException.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataExce=
ption.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryMetadataException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryMet=
adataException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryMet=
adataException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryMet=
adataException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataExce=
ption.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/QueryParserException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryParserException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryPar=
serException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryPar=
serException.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryParserExcept=
ion.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryParserException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryPar=
serException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryPar=
serException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryPar=
serException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryParserExcept=
ion.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/QueryPlannerException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryPlannerException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryPla=
nnerException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryPla=
nnerException.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerExcep=
tion.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryPlannerException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryPla=
nnerException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryPla=
nnerException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryPla=
nnerException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerExcep=
tion.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/QueryProcessingException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryProcessingException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryPro=
cessingException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryPro=
cessingException.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingEx=
ception.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryProcessingException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryPro=
cessingException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryPro=
cessingException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryPro=
cessingException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingEx=
ception.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/QueryResolverException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryResolverException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryRes=
olverException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryRes=
olverException.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverExce=
ption.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryResolverException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryRes=
olverException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryRes=
olverException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryRes=
olverException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverExce=
ption.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/QueryValidatorException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryValidatorException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryVal=
idatorException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryVal=
idatorException.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorExc=
eption.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryValidatorException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryVal=
idatorException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryVal=
idatorException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryVal=
idatorException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorExc=
eption.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/UnresolvedSymbolDescription.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Unr=
esolvedSymbolDescription.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/Unresolv=
edSymbolDescription.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/Unresolv=
edSymbolDescription.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolD=
escription.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Unr=
esolvedSymbolDescription.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/Unresolv=
edSymbolDescription.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/Unresolv=
edSymbolDescription.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/Unresolv=
edSymbolDescription.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolD=
escription.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/common:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common:3816-3868*,3876-3915*=
,3920-3983*
/trunk/engine/src/main/java/org/teiid/common:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/common:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common:3816-3868*,3876-3915*=
,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/common:4002-4046*
/trunk/engine/src/main/java/org/teiid/common:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer:3673-3711*,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer:3816-3868*,387=
6-3915*,3920-3983*
/trunk/engine/src/main/java/org/teiid/common/buffer:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer:3673-3711*,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer:3816-3868*,387=
6-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer:4002-4046*
/trunk/engine/src/main/java/org/teiid/common/buffer:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Abs=
tractTupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AbstractT=
upleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleS=
ource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleS=
ource.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.jav=
a:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AbstractT=
upleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleS=
ource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleS=
ource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleS=
ource.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.jav=
a:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Aut=
oCleanupUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AutoClean=
upUtil.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUti=
l.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUti=
l.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:35=
07-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AutoClean=
upUtil.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUti=
l.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUti=
l.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUti=
l.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:35=
07-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Bas=
eCacheEntry.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BaseCache=
Entry.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry=
.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry=
.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:350=
7-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BaseCache=
Entry.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry=
.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry=
.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:350=
7-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Bat=
chManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BatchMana=
ger.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.j=
ava:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.j=
ava:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3507-=
3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BatchMana=
ger.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.j=
ava:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.j=
ava:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3507-=
3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Blo=
ckedException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BlockedEx=
ception.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BlockedExcepti=
on.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BlockedExcepti=
on.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3=
188-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BlockedEx=
ception.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BlockedExcepti=
on.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BlockedExcepti=
on.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BlockedExcepti=
on.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3=
188-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Buf=
ferManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BufferMan=
ager.java:3220-3275,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.=
java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.=
java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3188=
-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BufferMan=
ager.java:3220-3275,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.=
java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.=
java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3188=
-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Cac=
he.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Cache.jav=
a:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:381=
6-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/Cache.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Cache.jav=
a:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:400=
2-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/Cache.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Cac=
heEntry.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheEntr=
y.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.jav=
a:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3507-36=
66
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheEntr=
y.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.jav=
a:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3507-36=
66
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Cac=
heKey.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.=
java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:=
3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:=
3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.=
java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:=
3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:=
4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Ext=
ensibleBufferedInputStream.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Extensibl=
eBufferedInputStream.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBuff=
eredInputStream.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInput=
Stream.java:3507-3666
+ /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Extensibl=
eBufferedInputStream.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBuff=
eredInputStream.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBuff=
eredInputStream.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInput=
Stream.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Fil=
eStore.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStore=
.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java=
:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java=
:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStore=
.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java=
:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java=
:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Fil=
eStoreInputStreamFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStore=
InputStreamFactory.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInput=
StreamFactory.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInput=
StreamFactory.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFac=
tory.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStore=
InputStreamFactory.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInput=
StreamFactory.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInput=
StreamFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInput=
StreamFactory.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFac=
tory.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Ind=
exedTupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/IndexedTu=
pleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSo=
urce.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSo=
urce.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java=
:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/IndexedTu=
pleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSo=
urce.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSo=
urce.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSo=
urce.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java=
:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Lig=
htWeightCopyOnWriteList.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LightWeig=
htCopyOnWriteList.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCop=
yOnWriteList.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCop=
yOnWriteList.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteL=
ist.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LightWeig=
htCopyOnWriteList.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCop=
yOnWriteList.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCop=
yOnWriteList.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCop=
yOnWriteList.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteL=
ist.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Lob=
Manager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LobManage=
r.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/LobManager.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/LobManager.jav=
a:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3507-36=
66
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LobManage=
r.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/LobManager.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/LobManager.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/LobManager.jav=
a:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3507-36=
66
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/SPa=
ge.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/SPage.jav=
a:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:381=
6-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/SPage.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/SPage.jav=
a:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:400=
2-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/SPage.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/STr=
ee.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/STree.jav=
a:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/STree.java:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/STree.java:381=
6-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/STree.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/STree.jav=
a:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/STree.java:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/STree.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/STree.java:400=
2-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/STree.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Ser=
ializer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Serialize=
r.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Serializer.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/Serializer.jav=
a:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3507-36=
66
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Serialize=
r.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Serializer.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/Serializer.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/Serializer.jav=
a:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3507-36=
66
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Sto=
rageManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/StorageMa=
nager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/StorageManager=
.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/StorageManager=
.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:350=
7-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/StorageMa=
nager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/StorageManager=
.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/StorageManager=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/StorageManager=
.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:350=
7-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Tup=
leBatch.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBatc=
h.java:3220-3275,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.jav=
a:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3188-34=
50,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBatc=
h.java:3220-3275,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.jav=
a:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3188-34=
50,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Tup=
leBrowser.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBrow=
ser.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.j=
ava:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.j=
ava:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3507-=
3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBrow=
ser.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.j=
ava:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.j=
ava:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3507-=
3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Tup=
leBuffer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBuff=
er.java:3149-3217,3220-3275,3340-3349,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.ja=
va:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.ja=
va:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3188-3=
450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBuff=
er.java:3149-3217,3220-3275,3340-3349,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.ja=
va:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.ja=
va:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3188-3=
450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Tup=
leBufferCache.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBuff=
erCache.java:3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBufferCac=
he.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java:3=
507-3666
+ /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBuff=
erCache.java:3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBufferCac=
he.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBufferCac=
he.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java:3=
507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Tup=
leSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleSour=
ce.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.ja=
va:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.ja=
va:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3507-3=
666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleSour=
ce.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.ja=
va:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.ja=
va:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3507-3=
666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/impl
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/impl:3535=
-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/impl:3673-3711=
,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/impl:3816-3868=
,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/common/buffer/impl:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/impl:3535=
-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/impl:3673-3711=
,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/impl:3816-3868=
,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/impl:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/impl:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/core:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/core:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/core:3816-3868*,3876-3915*,3=
920-3983*
/trunk/engine/src/main/java/org/teiid/core:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/core:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/core:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/core:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/core:4002-4046*
/trunk/engine/src/main/java/org/teiid/core:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/core/id
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/core/id:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/core/id:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/core/id:3816-3868,3876-3915,=
3920-3983
/trunk/engine/src/main/java/org/teiid/core/id:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/core/id:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/core/id:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/core/id:3816-3868,3876-3915,=
3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/core/id:4002-4046
/trunk/engine/src/main/java/org/teiid/core/id:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/Capabil=
itiesConverter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/CapabilitiesC=
onverter.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/CapabilitiesC=
onverter.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -81,7 +81,6 @@
tgtCaps.setCapabilitySupport(Capability.QUERY_AGGREGATES_DISTINCT,=
srcCaps.supportsAggregatesDistinct());
tgtCaps.setCapabilitySupport(Capability.QUERY_SUBQUERIES_SCALAR, s=
rcCaps.supportsScalarSubqueries());
tgtCaps.setCapabilitySupport(Capability.QUERY_SUBQUERIES_CORRELATE=
D, srcCaps.supportsCorrelatedSubqueries());
- tgtCaps.setCapabilitySupport(Capability.QUERY_CASE, srcCaps.suppor=
tsCaseExpressions());
tgtCaps.setCapabilitySupport(Capability.QUERY_SEARCHED_CASE, srcCa=
ps.supportsSearchedCaseExpressions());
tgtCaps.setCapabilitySupport(Capability.QUERY_UNION, srcCaps.suppo=
rtsUnions());
tgtCaps.setCapabilitySupport(Capability.QUERY_INTERSECT, srcCaps.s=
upportsIntersect());
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/Connect=
orWorkItem.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWork=
Item.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWork=
Item.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -64,7 +64,7 @@
private AtomicRequestID id;
private ConnectorManager manager;
private AtomicRequestMessage requestMsg;
- private ExecutionFactory connector;
+ private ExecutionFactory connector;
private QueryMetadataInterface queryMetadata;
=
/* Created on new request */
@@ -212,6 +212,9 @@
// Translate the command
Command command =3D this.requestMsg.getCommand();
this.expectedColumns =3D command.getProjectedSymbols().size();
+ if (command instanceof StoredProcedure) {
+ this.expectedColumns =3D ((StoredProcedure)command).getResultSet=
Columns().size();
+ }
LanguageBridgeFactory factory =3D new LanguageBridgeFactory(query=
Metadata);
factory.setConvertIn(!this.connector.supportsInCriteria());
org.teiid.language.Command translatedCommand =3D factory.translat=
e(command);
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/AccessI=
nfo.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/AccessInfo.ja=
va 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/AccessInfo.ja=
va 2012-05-01 19:12:27 UTC (rev 4047)
@@ -139,10 +139,10 @@
}
this.objectsAccessed.add(id);
} else {
- Schema s =3D tm.getMetadataStore().getSchema(key.get(0).toUpperCase()=
);
- Modifiable m =3D s.getTables().get(key.get(1).toUpperCase());
+ Schema s =3D tm.getMetadataStore().getSchema(key.get(0));
+ Modifiable m =3D s.getTables().get(key.get(1));
if (m =3D=3D null) {
- m =3D s.getProcedures().get(key.get(1).toUpperCase());
+ m =3D s.getProcedures().get(key.get(1));
}
if (m !=3D null) {
this.objectsAccessed.add(m);
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/Authori=
zationValidator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/Authorization=
Validator.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/Authorization=
Validator.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -33,8 +33,34 @@
*/
public interface AuthorizationValidator {
=
- void validate(Command command, QueryMetadataInterface metadata, CommandCo=
ntext commandContext) throws QueryValidatorException, TeiidComponentExcepti=
on;
+ enum CommandType {
+ USER,
+ PREPARED,
+ CACHED
+ }
=
+ /**
+ * Validates the given command. If the command is not a {@link CommandTy=
pe#USER} command, the command object should not be modified.
+ * Any modification must be fully resolved using the associated {@link Qu=
eryMetadataInterface}. Returning true for a =
+ * {@link CommandType#PREPARED} or {@link CommandType#CACHED} commands =
means that the matching prepared plan or cache entry
+ * will not be used.
+ * @param originalSql array of commands will typically contain only a sin=
gle string, but may have multiple for batched updates.
+ * @param command the parsed and resolved command. =
+ * @param metadata
+ * @param commandContext
+ * @param commandType
+ * @return true if the USER command was modified, or if the non-USER comm=
and should be modified.
+ * @throws QueryValidatorException
+ * @throws TeiidComponentException
+ */
+ boolean validate(String[] originalSql, Command command, QueryMetadataInte=
rface metadata, CommandContext commandContext, CommandType commandType) thr=
ows QueryValidatorException, TeiidComponentException;
+ =
+ /**
+ * =
+ * @param roleName
+ * @param commandContext
+ * @return true if the current user has the given role
+ */
boolean hasRole(String roleName, CommandContext commandContext);
=
boolean isEnabled();
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java =
2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java =
2012-05-01 19:12:27 UTC (rev 4047)
@@ -49,6 +49,7 @@
import org.teiid.client.DQP;
import org.teiid.client.RequestMessage;
import org.teiid.client.ResultsMessage;
+import org.teiid.client.RequestMessage.StatementType;
import org.teiid.client.lob.LobChunk;
import org.teiid.client.metadata.MetadataResult;
import org.teiid.client.plan.PlanNode;
@@ -485,21 +486,6 @@
return resultsFuture;
}
=
-// /**
-// * Cancels a node in the request. (This request is called by the =
-// * client directly using the admin API), so if this does not support
-// * partial results then remove the original request.
-// * @throws MetaMatrixComponentException =
-// */
-// public void cancelAtomicRequest(AtomicRequestID requestID) throws Me=
taMatrixComponentException { =
-// RequestWorkItem workItem =3D safeGetWorkItem(requestID.getReques=
tID());
-// if (workItem =3D=3D null) {
-// LogManager.logDetail(LogConstants.CTX_DQP, "Could not cancel", req=
uestID, "parent request does not exist"); //$NON-NLS-1$ //$NON-NLS-2$
-// return;
-// }
-// workItem.requestAtomicRequestCancel(requestID);
-// }
- =
RequestWorkItem getRequestWorkItem(RequestID reqID) throws TeiidProces=
singException {
RequestWorkItem result =3D this.requests.get(reqID);
if (result =3D=3D null) {
@@ -695,7 +681,27 @@
=
DataTierManagerImpl processorDataManager =3D new DataTierManagerIm=
pl(this, this.bufferManager, this.config.isDetectingChangeEvents());
processorDataManager.setEventDistributor(eventDistributor);
- dataTierMgr =3D new TempTableDataManager(processorDataManager, this.buff=
erManager, this.processWorkerPool, this.rsCache);
+ dataTierMgr =3D new TempTableDataManager(processorDataManager, this.buff=
erManager, this.rsCache);
+ dataTierMgr.setExecutor(new TempTableDataManager.RequestExecutor() {
+ =
+ @Override
+ public void execute(String command, List parameters) {
+ final String sessionId =3D DQPWorkContext.getWorkContext().getSessionI=
d();
+ RequestMessage request =3D new RequestMessage(command);
+ request.setParameterValues(parameters);
+ request.setStatementType(StatementType.PREPARED);
+ ResultsFuture result =3D executeRequest(0, request);
+ result.addCompletionListener(new ResultsFuture.CompletionListener() {
+
+ @Override
+ public void onCompletion(
+ ResultsFuture future) {
+ terminateSession(sessionId);
+ }
+ =
+ });
+ }
+ });
dataTierMgr.setEventDistributor(eventDistributor);
=
LogManager.logDetail(LogConstants.CTX_DQP, "DQPCore started maxThr=
eads", this.config.getMaxThreads(), "maxActivePlans", this.maxActivePlans, =
"source concurrency", this.userRequestSourceConcurrency); //$NON-NLS-1$ //$=
NON-NLS-2$ //$NON-NLS-3$
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPWork=
Context.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContex=
t.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContex=
t.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -117,6 +117,7 @@
private HashMap policies;
private boolean useCallingThread;
private Version clientVersion =3D Version.SEVEN_4;
+ private boolean admin;
=
public DQPWorkContext() {
}
@@ -141,6 +142,10 @@
public void setSecurityHelper(SecurityHelper securityHelper) {
this.securityHelper =3D securityHelper;
}
+ =
+ public SecurityHelper getSecurityHelper() {
+ return securityHelper;
+ }
=
/**
* @return
@@ -150,10 +155,7 @@
}
=
public Subject getSubject() {
- if (session.getSubject() !=3D null) {
- return session.getSubject();
- }
- return null;
+ return session.getSubject();
}
=
/**
@@ -311,4 +313,13 @@
public void setClientVersion(Version clientVersion) {
this.clientVersion =3D clientVersion;
}
+ =
+ public void setAdmin(boolean admin) {
+ this.admin =3D admin;
+ }
+ =
+ public boolean isAdmin() {
+ return admin;
+ }
+
}
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTie=
rManagerImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManag=
erImpl.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManag=
erImpl.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -61,19 +61,7 @@
import org.teiid.events.EventDistributor;
import org.teiid.logging.LogManager;
import org.teiid.logging.MessageLevel;
-import org.teiid.metadata.AbstractMetadataRecord;
-import org.teiid.metadata.Column;
-import org.teiid.metadata.ColumnStats;
-import org.teiid.metadata.Datatype;
-import org.teiid.metadata.ForeignKey;
-import org.teiid.metadata.FunctionMethod;
-import org.teiid.metadata.KeyRecord;
-import org.teiid.metadata.MetadataRepository;
-import org.teiid.metadata.Procedure;
-import org.teiid.metadata.ProcedureParameter;
-import org.teiid.metadata.Schema;
-import org.teiid.metadata.Table;
-import org.teiid.metadata.TableStats;
+import org.teiid.metadata.*;
import org.teiid.query.QueryPlugin;
import org.teiid.query.metadata.CompositeMetadataStore;
import org.teiid.query.metadata.TempMetadataID;
@@ -182,7 +170,7 @@
return processSystemQuery(context, command, workItem.getDqpWorkContext(=
));
}
=
- AtomicRequestMessage aqr =3D createRequest(context.getProcessorID(), com=
mand, modelName, connectorBindingId, nodeID);
+ AtomicRequestMessage aqr =3D createRequest(workItem, command, modelName,=
connectorBindingId, nodeID);
aqr.setCommandContext(context);
SourceHint sh =3D context.getSourceHint();
if (sh !=3D null) {
@@ -572,11 +560,9 @@
return result;
}
=
- private AtomicRequestMessage createRequest(Object processorId,
+ private AtomicRequestMessage createRequest(RequestWorkItem workItem,
Command command, String modelName, String connectorBindingId, int nodeI=
D)
- throws TeiidProcessingException, TeiidComponentException {
- RequestWorkItem workItem =3D requestMgr.getRequestWorkItem((RequestID)pr=
ocessorId);
- =
+ throws TeiidComponentException {
RequestMessage request =3D workItem.requestMsg;
// build the atomic request based on original request + context info
AtomicRequestMessage aqr =3D new AtomicRequestMessage(request, wor=
kItem.getDqpWorkContext(), nodeID);
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/Default=
AuthorizationValidator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DefaultAuthor=
izationValidator.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DefaultAuthor=
izationValidator.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -41,11 +41,15 @@
}
=
@Override
- public void validate(Command command, QueryMetadataInterface metadata, Co=
mmandContext commandContext) throws QueryValidatorException, TeiidComponent=
Exception {
+ public boolean validate(String[] originalSql, Command command,
+ QueryMetadataInterface metadata, CommandContext commandContext,
+ CommandType commandType) throws QueryValidatorException,
+ TeiidComponentException {
if (enabled && policyDecider.validateCommand(commandContext)) {
AuthorizationValidationVisitor visitor =3D new AuthorizationValidationV=
isitor(this.policyDecider, commandContext);
Request.validateWithVisitor(visitor, metadata, command);
} =
+ return false;
}
=
@Override
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/Prepare=
dStatementRequest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/PreparedState=
mentRequest.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/PreparedState=
mentRequest.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -35,6 +35,7 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
import org.teiid.core.types.DataTypeManager;
+import org.teiid.dqp.internal.process.AuthorizationValidator.CommandType;
import org.teiid.dqp.internal.process.SessionAwareCache.CacheID;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
@@ -131,6 +132,21 @@
String sqlQuery =3D requestMsg.getCommands()[0];
CacheID id =3D new CacheID(this.workContext, Request.createParseInfo(=
this.requestMsg), sqlQuery);
prepPlan =3D prepPlanCache.get(id);
+ =
+ if (prepPlan !=3D null) {
+ ProcessorPlan cachedPlan =3D prepPlan.getPlan();
+ this.userCommand =3D prepPlan.getCommand();
+ if (validateAccess(requestMsg.getCommands(), userCommand, Command=
Type.PREPARED)) {
+ LogManager.logDetail(LogConstants.CTX_DQP, requestId, "Authoriza=
tionValidator indicates that the prepared plan for command will not be used=
"); //$NON-NLS-1$
+ prepPlan =3D null;
+ } else {
+ LogManager.logTrace(LogConstants.CTX_DQP, new Object[] { "Query =
exist in cache: ", sqlQuery }); //$NON-NLS-1$
+ processPlan =3D cachedPlan.clone();
+ //already in cache. obtain the values from cache
+ analysisRecord =3D prepPlan.getAnalysisRecord();
+ }
+ }
+ =
if (prepPlan =3D=3D null) {
//if prepared plan does not exist, create one
prepPlan =3D new PreparedPlan();
@@ -149,15 +165,7 @@
} =
=
this.prepPlanCache.put(id, determinismLevel, prepPlan, userComma=
nd.getCacheHint() !=3D null?userCommand.getCacheHint().getTtl():null);
- }
- } else {
- ProcessorPlan cachedPlan =3D prepPlan.getPlan();
- this.userCommand =3D prepPlan.getCommand();
- validateAccess(userCommand); =
- LogManager.logTrace(LogConstants.CTX_DQP, new Object[] { "Query e=
xist in cache: ", sqlQuery }); //$NON-NLS-1$
- processPlan =3D cachedPlan.clone();
- //already in cache. obtain the values from cache
- analysisRecord =3D prepPlan.getAnalysisRecord();
+ }
}
=
if (requestMsg.isBatchedUpdate()) {
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java =
2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java =
2012-05-01 19:12:27 UTC (rev 4047)
@@ -30,9 +30,7 @@
import java.util.concurrent.Executor;
=
import org.teiid.adminapi.impl.VDBMetaData;
-import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.api.exception.query.QueryParserException;
-import org.teiid.api.exception.query.QueryPlannerException;
import org.teiid.api.exception.query.QueryResolverException;
import org.teiid.api.exception.query.QueryValidatorException;
import org.teiid.client.RequestMessage;
@@ -46,6 +44,7 @@
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.util.Assertion;
import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
+import org.teiid.dqp.internal.process.AuthorizationValidator.CommandType;
import org.teiid.dqp.internal.process.multisource.MultiSourceCapabilitiesF=
inder;
import org.teiid.dqp.internal.process.multisource.MultiSourceMetadataWrapp=
er;
import org.teiid.dqp.internal.process.multisource.MultiSourcePlanToProcess=
Converter;
@@ -283,8 +282,6 @@
//ensure that the user command is distinct from the processing command
//rewrite and planning may alter options, symbols, etc.
QueryResolver.resolveCommand(command, metadata);
- =
- this.userCommand =3D (Command)command.clone();
}
=
private void validateQuery(Command command)
@@ -386,8 +383,10 @@
=
resolveCommand(command);
=
- validateAccess(userCommand);
+ validateAccess(requestMsg.getCommands(), command, CommandType.USER=
);
=
+ this.userCommand =3D (Command) command.clone();
+ =
Collection groups =3D GroupCollectorVisitor.getGroups=
(command, true);
for (GroupSymbol groupSymbol : groups) {
if (groupSymbol.isTempTable()) {
@@ -412,36 +411,32 @@
}
}
=
+ // If using multi-source models, insert a proxy to simplify the suppo=
rted capabilities. This is =
+ // done OUTSIDE the cache (wrapped around the cache) intentionally=
to avoid caching the simplified
+ // capabilities which may be different for the same model in a dif=
ferent VDB used by this same DQP.
+ CapabilitiesFinder finder =3D this.capabilitiesFinder;
+ if(this.multiSourceModels !=3D null) {
+ finder =3D new MultiSourceCapabilitiesFinder(finder, this.mult=
iSourceModels);
+ }
+ =
+ boolean debug =3D analysisRecord.recordDebug();
+ if(debug) {
+ analysisRecord.println("\n=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D"); //$NON-NLS-1$
+ analysisRecord.println("USER COMMAND:\n" + command); //$NON-=
NLS-1$
+ }
+ // Run the optimizer
try {
- // If using multi-source models, insert a proxy to simplify the s=
upported capabilities. This is =
- // done OUTSIDE the cache (wrapped around the cache) intention=
ally to avoid caching the simplified
- // capabilities which may be different for the same model in a=
different VDB used by this same DQP.
- CapabilitiesFinder finder =3D this.capabilitiesFinder;
- if(this.multiSourceModels !=3D null) {
- finder =3D new MultiSourceCapabilitiesFinder(finder, this.=
multiSourceModels);
+ processPlan =3D QueryOptimizer.optimizePlan(command, metadata,=
idGenerator, finder, analysisRecord, context);
+ } finally {
+ String debugLog =3D analysisRecord.getDebugLog();
+ if(debugLog !=3D null && debugLog.length() > 0) {
+ LogManager.log(requestMsg.getShowPlan()=3D=3DShowPlan.DEBU=
G?MessageLevel.INFO:MessageLevel.TRACE, LogConstants.CTX_QUERY_PLANNER, deb=
ugLog); =
}
- =
- boolean debug =3D analysisRecord.recordDebug();
- if(debug) {
- analysisRecord.println("\n=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D"); //$NON-NLS-1$
- analysisRecord.println("USER COMMAND:\n" + command); //$=
NON-NLS-1$
+ if (analysisRecord.recordAnnotations() && analysisRecord.getAn=
notations() !=3D null && !analysisRecord.getAnnotations().isEmpty()) {
+ LogManager.logDetail(LogConstants.CTX_QUERY_PLANNER, analysis=
Record.getAnnotations());
}
- // Run the optimizer
- try {
- processPlan =3D QueryOptimizer.optimizePlan(command, metad=
ata, idGenerator, finder, analysisRecord, context);
- } finally {
- String debugLog =3D analysisRecord.getDebugLog();
- if(debugLog !=3D null && debugLog.length() > 0) {
- LogManager.log(requestMsg.getShowPlan()=3D=3DShowPlan.=
DEBUG?MessageLevel.INFO:MessageLevel.TRACE, LogConstants.CTX_QUERY_PLANNER,=
debugLog); =
- }
- if (analysisRecord.recordAnnotations() && analysisRecord.g=
etAnnotations() !=3D null && !analysisRecord.getAnnotations().isEmpty()) {
- LogManager.logDetail(LogConstants.CTX_QUERY_PLANNER, anal=
ysisRecord.getAnnotations());
- }
- }
- LogManager.logDetail(LogConstants.CTX_DQP, new Object[] { Quer=
yPlugin.Util.getString("BasicInterceptor.ProcessTree_for__4"), requestId, p=
rocessPlan }); //$NON-NLS-1$
- } catch (QueryMetadataException e) {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30494,=
e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30494, requestId));
}
+ LogManager.logDetail(LogConstants.CTX_DQP, new Object[] { QueryPlu=
gin.Util.getString("BasicInterceptor.ProcessTree_for__4"), requestId, proce=
ssPlan }); //$NON-NLS-1$
}
=
public void processRequest() =
@@ -465,11 +460,14 @@
this.context.setValidateXML(requestMsg.getValidationMode());
}
=
- protected void validateAccess(Command command) throws QueryValidatorExcep=
tion, TeiidComponentException {
- createCommandContext(command);
- if (this.authorizationValidator !=3D null) {
- this.authorizationValidator.validate(command, metadata, context);
+ protected boolean validateAccess(String[] commandStr, Command command, Co=
mmandType type) throws QueryValidatorException, TeiidComponentException {
+ if (context =3D=3D null) {
+ createCommandContext(command);
}
+ if (!this.workContext.isAdmin() && this.authorizationValidator !=3D null=
) {
+ return this.authorizationValidator.validate(commandStr, command, metada=
ta, context, type);
+ }
+ return false;
}
=
public void setExecutor(Executor executor) {
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request=
WorkItem.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkIt=
em.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkIt=
em.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -45,12 +45,12 @@
import org.teiid.common.buffer.TupleBatch;
import org.teiid.common.buffer.TupleBuffer;
import org.teiid.common.buffer.BufferManager.TupleSourceType;
-import org.teiid.core.BundleUtil;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidException;
import org.teiid.core.TeiidProcessingException;
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.types.DataTypeManager;
+import org.teiid.dqp.internal.process.AuthorizationValidator.CommandType;
import org.teiid.dqp.internal.process.DQPCore.CompletionListener;
import org.teiid.dqp.internal.process.DQPCore.FutureWork;
import org.teiid.dqp.internal.process.SessionAwareCache.CacheID;
@@ -520,9 +520,11 @@
this.resultsBuffer =3D cr.getResults();
request.initMetadata();
this.originalCommand =3D cr.getCommand(requestMsg.getCommandString()=
, request.metadata, pi);
- request.validateAccess(this.originalCommand);
- this.doneProducingBatches();
- return;
+ if (!request.validateAccess(requestMsg.getCommands(), this.originalC=
ommand, CommandType.CACHED)) {
+ this.doneProducingBatches();
+ return;
+ }
+ LogManager.logDetail(LogConstants.CTX_DQP, requestID, "Cached result=
command to be modified, will not use the cached results", cacheId); //$NON=
-NLS-1$
} =
} else {
LogManager.logDetail(LogConstants.CTX_DQP, requestID, "Parameters are=
not serializable - cache cannot be used for", cacheId); //$NON-NLS-1$
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/multiso=
urce/MultiSourcePlanToProcessConverter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/M=
ultiSourcePlanToProcessConverter.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/M=
ultiSourcePlanToProcessConverter.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -281,5 +281,11 @@
=
return command;
}
+ =
+ @Override
+ protected boolean minimizeProject() {
+ //running minimize twice is not allowed as the original command is modif=
ied
+ return false;
+ }
=
}
Property changes on: trunk/engine/src/main/java/org/teiid/query
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query:3816-3868*,3876-3915*,=
3920-3983*
/trunk/engine/src/main/java/org/teiid/query:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query:3816-3868*,3876-3915*,=
3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query:4002-4046*
/trunk/engine/src/main/java/org/teiid/query:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/ObjectRepli=
cator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/ObjectReplicator.=
java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:=
3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:=
3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/ObjectReplicator.=
java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:=
3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:=
4002-4046
/trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java 2012-05-01 =
15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java 2012-05-01 =
19:12:27 UTC (rev 4047)
@@ -535,7 +535,6 @@
TEIID30491,
TEIID30492,
TEIID30493,
- TEIID30494,
TEIID30495,
TEIID30496,
TEIID30497,
Property changes on: trunk/engine/src/main/java/org/teiid/query/QueryPlugin=
.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:=
3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3673-=
3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3816-=
3868,3920-3983
/trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:=
3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3673-=
3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3816-=
3868,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:4002-=
4046
/trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/ReplicatedO=
bject.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/ReplicatedObject.=
java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:=
3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:=
3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/ReplicatedObject.=
java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:=
3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:=
4002-4046
/trunk/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/analysis
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/analysis:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/analysis:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/analysis:3816-3868,387=
6-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/analysis:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/analysis:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/analysis:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/analysis:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/analysis:4002-4046
/trunk/engine/src/main/java/org/teiid/query/analysis:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/eval
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/eval:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/eval:3673-3711,3754-37=
69
/branches/7.7.x/engine/src/main/java/org/teiid/query/eval:3816-3868,3876-39=
15,3920-3983
/trunk/engine/src/main/java/org/teiid/query/eval:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/eval:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/eval:3673-3711,3754-37=
69
/branches/7.7.x/engine/src/main/java/org/teiid/query/eval:3816-3868,3876-39=
15,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/eval:4002-4046
/trunk/engine/src/main/java/org/teiid/query/eval:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function:3535-355=
5*
/branches/7.6.x/engine/src/main/java/org/teiid/query/function:3673-3711*,37=
54-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function:3816-3868*,38=
76-3915*,3920-3983*
/trunk/engine/src/main/java/org/teiid/query/function:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function:3535-355=
5*
/branches/7.6.x/engine/src/main/java/org/teiid/query/function:3673-3711*,37=
54-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function:3816-3868*,38=
76-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/function:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/function:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/Ch=
arsetUtils.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/CharsetU=
tils.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.=
java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.=
java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3507=
-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/CharsetU=
tils.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.=
java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.=
java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3507=
-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/Fu=
nctionDescriptor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
Descriptor.java:3149-3171,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionDescr=
iptor.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionDescr=
iptor.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.jav=
a:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
Descriptor.java:3149-3171,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionDescr=
iptor.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionDescr=
iptor.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionDescr=
iptor.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.jav=
a:3188-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/Fu=
nctionForm.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
Form.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionForm.=
java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionForm.=
java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3507=
-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
Form.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionForm.=
java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionForm.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionForm.=
java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3507=
-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/Fu=
nctionLibrary.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
Library.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionLibra=
ry.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionLibra=
ry.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3=
507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
Library.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionLibra=
ry.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionLibra=
ry.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionLibra=
ry.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3=
507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/Fu=
nctionMetadataSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
MetadataSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionMetad=
ataSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionMetad=
ataSource.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource=
.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
MetadataSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionMetad=
ataSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionMetad=
ataSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionMetad=
ataSource.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource=
.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/Fu=
nctionMethods.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
Methods.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionMetho=
ds.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionMetho=
ds.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3=
507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
Methods.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionMetho=
ds.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionMetho=
ds.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionMetho=
ds.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3=
507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/Fu=
nctionTree.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
Tree.java:3149-3171,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionTree.=
java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionTree.=
java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3188=
-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
Tree.java:3149-3171,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionTree.=
java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionTree.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionTree.=
java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3188=
-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/Sy=
stemFunctionManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/SystemFu=
nctionManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/SystemFunctio=
nManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/SystemFunctio=
nManager.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.=
java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/SystemFu=
nctionManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/SystemFunctio=
nManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/SystemFunctio=
nManager.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/SystemFunctio=
nManager.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.=
java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/UD=
FSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/UDFSourc=
e.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/UDFSource.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/UDFSource.jav=
a:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/function/UDFSource.java:3507-36=
66
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/UDFSourc=
e.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/UDFSource.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/UDFSource.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/UDFSource.jav=
a:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/UDFSource.java:3507-36=
66
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/ag=
gregate
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/aggregat=
e:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/aggregate:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/aggregate:381=
6-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/function/aggregate:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/aggregat=
e:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/aggregate:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/aggregate:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/aggregate:400=
2-4046
/trunk/engine/src/main/java/org/teiid/query/function/aggregate:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/me=
tadata
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/metadata=
:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/metadata:3673=
-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/metadata:3816=
-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/function/metadata:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/metadata=
:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/metadata:3673=
-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/metadata:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/metadata:4002=
-4046
/trunk/engine/src/main/java/org/teiid/query/function/metadata:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/function/metadata/Func=
tionMetadataReader.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/function/metadata/FunctionMe=
tadataReader.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/query/function/metadata/FunctionMe=
tadataReader.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -7,9 +7,6 @@
import java.util.List;
import java.util.Map;
=
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
@@ -19,11 +16,8 @@
import org.teiid.metadata.FunctionMethod;
import org.teiid.metadata.FunctionParameter;
=
-(a)XmlType
-(a)XmlRootElement(namespace=3D"http://www.omg.org/XMI", name=3D"XMI")
public class FunctionMetadataReader {
=
- @XmlElement(namespace=3D"http://www.metamatrix.com/metamodels/MetaMatrixF=
unction", name=3D"ScalarFunction")
List functionMethods =3D new ArrayList();
=
public static List loadFunctionMethods(InputStream source=
) throws XMLStreamException {
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/so=
urce
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/source:3=
535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/source:3673-3=
711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/source:3816-3=
868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/function/source:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/source:3=
535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/source:3673-3=
711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/source:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/source:4002-4=
046
/trunk/engine/src/main/java/org/teiid/query/function/source:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/mapping
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping:3673-3711*,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/mapping:3816-3868*,387=
6-3915*,3920-3983*
/trunk/engine/src/main/java/org/teiid/query/mapping:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping:3673-3711*,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/mapping:3816-3868*,387=
6-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/mapping:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/mapping:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/mapping/rel=
ational
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/relationa=
l:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping/relational:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/mapping/relational:381=
6-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/mapping/relational:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/relationa=
l:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping/relational:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/mapping/relational:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/relational:400=
2-4046
/trunk/engine/src/main/java/org/teiid/query/mapping/relational:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/mapping/xml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/xml:3535-=
3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping/xml:3673-3711,=
3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/mapping/xml:3816-3868,=
3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/mapping/xml:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/xml:3535-=
3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping/xml:3673-3711,=
3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/mapping/xml:3816-3868,=
3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/xml:4002-4046
/trunk/engine/src/main/java/org/teiid/query/mapping/xml:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/metadata
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/metadata:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/metadata:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/metadata:3816-3868,387=
6-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/metadata:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/metadata:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/metadata:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/metadata:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/metadata:4002-4046
/trunk/engine/src/main/java/org/teiid/query/metadata:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/metadata/MetadataValid=
ator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/metadata/MetadataValidator.j=
ava 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/query/metadata/MetadataValidator.j=
ava 2012-05-01 19:12:27 UTC (rev 4047)
@@ -145,6 +145,13 @@
ModelMetaData model =3D vdb.getModel(schema.getName());
=
for (Table t:schema.getTables().values()) {
+ // no need to verify the transformation of the xml mapping document, =
+ // as this is very specific and designer already validates it.
+ if (t.getTableType() =3D=3D Table.Type.Document
+ || t.getTableType() =3D=3D Table.Type.XmlMappingClass
+ || t.getTableType() =3D=3D Table.Type.XmlStagingTable) {
+ continue;
+ }
if (t.isVirtual()) {
if (t.getSelectTransformation() =3D=3D null) {
log(report, model, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID31079=
, t.getName(), model.getName()));
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer:3535-35=
55*
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer:3673-3711*,3=
754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer:3816-3868*,3=
876-3915*,3920-3983*
/trunk/engine/src/main/java/org/teiid/query/optimizer:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer:3535-35=
55*
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer:3673-3711*,3=
754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/optimizer:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/B=
atchedUpdatePlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/Batched=
UpdatePlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdat=
ePlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdat=
ePlanner.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.=
java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/Batched=
UpdatePlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdat=
ePlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdat=
ePlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdat=
ePlanner.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.=
java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/C=
ommandPlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/Command=
Planner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlann=
er.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlann=
er.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3=
507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/Command=
Planner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlann=
er.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlann=
er.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlann=
er.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3=
507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/D=
dlPlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlan=
ner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.j=
ava:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.j=
ava:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3507-=
3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlan=
ner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.j=
ava:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.j=
ava:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3507-=
3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/P=
rocedurePlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/Procedu=
rePlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePla=
nner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePla=
nner.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java=
:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/Procedu=
rePlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePla=
nner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePla=
nner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePla=
nner.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java=
:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/Q=
ueryOptimizer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/QueryOp=
timizer.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimiz=
er.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimiz=
er.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3=
507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/QueryOp=
timizer.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimiz=
er.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimiz=
er.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimiz=
er.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3=
507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/T=
riggerActionPlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/Trigger=
ActionPlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActio=
nPlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActio=
nPlanner.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.=
java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/Trigger=
ActionPlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActio=
nPlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActio=
nPlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActio=
nPlanner.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.=
java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/c=
apabilities
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/capabil=
ities:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/capabilities=
:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/capabilities=
:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/capabil=
ities:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/capabilities=
:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/capabilities=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/capabilities=
:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/r=
elational
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational:3=
673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational:3=
816-3868*,3876-3915*,3920-3983*
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational:3=
673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational:3=
816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational:4=
002-4046*
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/r=
elational/AliasGenerator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/AliasGenerator.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/A=
liasGenerator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/A=
liasGenerator.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGener=
ator.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/AliasGenerator.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/A=
liasGenerator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/A=
liasGenerator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/A=
liasGenerator.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGener=
ator.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/r=
elational/OptimizerRule.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/OptimizerRule.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/O=
ptimizerRule.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/O=
ptimizerRule.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerR=
ule.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/OptimizerRule.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/O=
ptimizerRule.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/O=
ptimizerRule.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/O=
ptimizerRule.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerR=
ule.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/r=
elational/PartitionAnalyzer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/PartitionAnalyzer.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
artitionAnalyzer.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
artitionAnalyzer.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionA=
nalyzer.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/PartitionAnalyzer.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
artitionAnalyzer.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
artitionAnalyzer.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
artitionAnalyzer.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionA=
nalyzer.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/r=
elational/PlanHints.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/PlanHints.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanHints.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanHints.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.=
java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/PlanHints.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanHints.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanHints.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanHints.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.=
java:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanToProcessConverter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToP=
rocessConverter.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToP=
rocessConverter.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -326,7 +326,7 @@
}
}
aNode.setCommand(command);
- if (!aNode.isShouldEvaluate()) {
+ if (minimizeProject() && !aNode.isShouldEvaluate()) {
aNode.minimizeProject(command);
}
setRoutingName(aNode, node);
@@ -576,5 +576,9 @@
throw new QueryPlannerException(QueryPlugin.Event.TEIID30251,=
e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30251));
}
}
+ =
+ protected boolean minimizeProject() {
+ return true;
+ }
=
}
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/r=
elational/PlanToProcessConverter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/PlanToProcessConverter.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanToProcessConverter.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanToProcessConverter.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProc=
essConverter.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/PlanToProcessConverter.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanToProcessConverter.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanToProcessConverter.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanToProcessConverter.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProc=
essConverter.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/r=
elational/RelationalPlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/RelationalPlanner.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
elationalPlanner.java:3673-3711,3754-3769,3776-3813
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
elationalPlanner.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/Relational=
Planner.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/RelationalPlanner.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
elationalPlanner.java:3673-3711,3754-3769,3776-3813
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
elationalPlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
elationalPlanner.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/Relational=
Planner.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/r=
elational/RuleStack.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/RuleStack.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
uleStack.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
uleStack.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.=
java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/RuleStack.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
uleStack.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
uleStack.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
uleStack.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.=
java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/r=
elational/plantree
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/plantree:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/p=
lantree:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/p=
lantree:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3=
507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/plantree:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/p=
lantree:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/p=
lantree:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/p=
lantree:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3=
507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/r=
elational/rules
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/rules:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/r=
ules:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/r=
ules:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3507=
-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/rules:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/r=
ules:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/r=
ules:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/r=
ules:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3507=
-3666
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/r=
ules/RulePlanSorts.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/R=
ulePlanSorts.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/R=
ulePlanSorts.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -80,6 +80,7 @@
switch (node.getType()) {
case NodeConstants.Types.SORT:
parentBlocking =3D true;
+ boolean raisedAccess =3D false;
if (node.hasBooleanProperty(NodeConstants.Info.IS_DUP_REMOVAL)) {
break;
}
@@ -87,6 +88,7 @@
node.setProperty(NodeConstants.Info.IS_DUP_REMOVAL, true);
} else {
root =3D checkForProjectOptimization(node, root, metadata, capFinder, =
record);
+ raisedAccess =3D NodeEditor.findParent(node, NodeConstants.Types.ACCES=
S) !=3D null;
}
OrderBy orderBy =3D (OrderBy)node.getProperty(NodeConstants.Info.SORT_O=
RDER);
List orderColumns =3D orderBy.getSortKeys();
@@ -120,8 +122,10 @@
}
possibleSort.setProperty(Info.SORT_ORDER, orderBy);
}
- break;
} =
+ if (raisedAccess) {
+ return root;
+ }
break;
case NodeConstants.Types.DUP_REMOVE:
if (parentBlocking) {
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/x=
ml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/xml:353=
5-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/xml:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/xml:3816-386=
8,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/optimizer/xml:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/xml:353=
5-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/xml:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/xml:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/xml:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/parser
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/parser:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/parser:3673-3711,3754-=
3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/parser:3816-3868,3876-=
3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/parser:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/parser:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/parser:3673-3711,3754-=
3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/parser:3816-3868,3876-=
3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/parser:4002-4046
/trunk/engine/src/main/java/org/teiid/query/parser:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor:3535-35=
55*
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor:3673-3711*,3=
754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor:3816-3868*,3=
876-3915*,3920-3983*
/trunk/engine/src/main/java/org/teiid/query/processor:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor:3535-35=
55*
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor:3673-3711*,3=
754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/processor:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/B=
atchCollector.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchCo=
llector.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchCollect=
or.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchCollect=
or.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3=
507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchCo=
llector.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchCollect=
or.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchCollect=
or.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/BatchCollect=
or.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3=
507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/B=
atchIterator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchIt=
erator.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchIterato=
r.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchIterato=
r.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:35=
07-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchIt=
erator.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchIterato=
r.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchIterato=
r.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/BatchIterato=
r.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:35=
07-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/B=
atchedUpdatePlan.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/Batched=
UpdatePlan.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdat=
ePlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdat=
ePlan.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.jav=
a:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/Batched=
UpdatePlan.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdat=
ePlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdat=
ePlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdat=
ePlan.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.jav=
a:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/C=
ollectionTupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/Collect=
ionTupleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/CollectionTu=
pleSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/CollectionTu=
pleSource.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource=
.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/Collect=
ionTupleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/CollectionTu=
pleSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/CollectionTu=
pleSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/CollectionTu=
pleSource.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource=
.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/D=
dlPlan.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/DdlPlan=
.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java=
:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java=
:3816-3868,3920-3983
/trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/DdlPlan=
.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java=
:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java=
:3816-3868,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java=
:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/P=
rocessorDataManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/Process=
orDataManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/ProcessorDat=
aManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/ProcessorDat=
aManager.java:3816-3868,3920-3983
/trunk/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.=
java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/Process=
orDataManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/ProcessorDat=
aManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/ProcessorDat=
aManager.java:3816-3868,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/ProcessorDat=
aManager.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.=
java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/P=
rocessorPlan.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/Process=
orPlan.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/ProcessorPla=
n.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/ProcessorPla=
n.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:35=
07-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/Process=
orPlan.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/ProcessorPla=
n.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/ProcessorPla=
n.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/ProcessorPla=
n.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:35=
07-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/Q=
ueryProcessor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/QueryPr=
ocessor.java:3220-3275,3340-3349,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/QueryProcess=
or.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/QueryProcess=
or.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3=
188-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/QueryPr=
ocessor.java:3220-3275,3340-3349,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/QueryProcess=
or.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/QueryProcess=
or.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/QueryProcess=
or.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3=
188-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/p=
roc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/proc:35=
35-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/proc:3673-37=
11,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/proc:3816-38=
68,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/processor/proc:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/proc:35=
35-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/proc:3673-37=
11,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/proc:3816-38=
68,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/proc:4002-40=
46
/trunk/engine/src/main/java/org/teiid/query/processor/proc:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/r=
elational
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relatio=
nal:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/relational:3=
673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational:3=
816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/processor/relational:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relatio=
nal:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/relational:3=
673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/relational:4=
002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/relational:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/x=
ml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/xml:353=
5-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/xml:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/xml:3816-386=
8,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/processor/xml:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/xml:353=
5-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/xml:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/xml:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/xml:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/xml:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/report
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/report:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/report:3673-3711,3754-=
3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/report:3816-3868,3876-=
3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/report:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/report:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/report:3673-3711,3754-=
3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/report:3816-3868,3876-=
3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/report:4002-4046
/trunk/engine/src/main/java/org/teiid/query/report:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver:3535-355=
5*
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver:3673-3711*,37=
54-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver:3816-3868*,38=
76-3915*,3920-3983*
/trunk/engine/src/main/java/org/teiid/query/resolver:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver:3535-355=
5*
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver:3673-3711*,37=
54-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver:3816-3868*,38=
76-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/resolver:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/Co=
mmandResolver.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/CommandR=
esolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/CommandResolv=
er.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/CommandResolv=
er.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3=
507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/CommandR=
esolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/CommandResolv=
er.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/CommandResolv=
er.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/CommandResolv=
er.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3=
507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/Pr=
ocedureContainerResolver.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/Procedur=
eContainerResolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/ProcedureCont=
ainerResolver.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/ProcedureCont=
ainerResolver.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerReso=
lver.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/Procedur=
eContainerResolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/ProcedureCont=
ainerResolver.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/ProcedureCont=
ainerResolver.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/ProcedureCont=
ainerResolver.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerReso=
lver.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/Qu=
eryResolver.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/QueryRes=
olver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver=
.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver=
.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:350=
7-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/QueryRes=
olver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver=
.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver=
.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:350=
7-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/Va=
riableResolver.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/Variable=
Resolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/VariableResol=
ver.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/VariableResol=
ver.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:=
3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/Variable=
Resolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/VariableResol=
ver.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/VariableResol=
ver.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/VariableResol=
ver.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:=
3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/co=
mmand
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/command:=
3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/command:3673-=
3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/command:3816-=
3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/resolver/command:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/command:=
3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/command:3673-=
3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/command:3816-=
3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/command:4002-=
4046
/trunk/engine/src/main/java/org/teiid/query/resolver/command:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/ut=
il
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/util:353=
5-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/util:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/util:3816-386=
8,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/resolver/util:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/util:353=
5-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/util:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/util:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/util:4002-4046
/trunk/engine/src/main/java/org/teiid/query/resolver/util:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/rewriter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/rewriter:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/rewriter:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/rewriter:3816-3868,387=
6-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/rewriter:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/rewriter:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/rewriter:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/rewriter:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/rewriter:4002-4046
/trunk/engine/src/main/java/org/teiid/query/rewriter:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql:3673-3711*,3754-37=
69
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql:3816-3868*,3876-39=
15*,3920-3983*
/trunk/engine/src/main/java/org/teiid/query/sql:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql:3673-3711*,3754-37=
69
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql:3816-3868*,3876-39=
15*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/sql:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/Languag=
eObject.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageObjec=
t.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.jav=
a:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3188-34=
50,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageObjec=
t.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.jav=
a:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3188-34=
50,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/Languag=
eVisitor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageVisit=
or.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.ja=
va:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.ja=
va:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3507-3=
666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageVisit=
or.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.ja=
va:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.ja=
va:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3507-3=
666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/Procedu=
reReservedWords.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/ProcedureRese=
rvedWords.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedW=
ords.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedW=
ords.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java=
:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/ProcedureRese=
rvedWords.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedW=
ords.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedW=
ords.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedW=
ords.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java=
:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/lang
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/lang:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/lang:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/lang:3816-3868,387=
6-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/sql/lang:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/lang:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/lang:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/lang:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/lang:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/lang:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/sql/lang/StoredProcedu=
re.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/sql/lang/StoredProcedure.jav=
a 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/query/sql/lang/StoredProcedure.jav=
a 2012-05-01 19:12:27 UTC (rev 4047)
@@ -192,7 +192,7 @@
if(resultSetParameter !=3D null){
List result =3D new LinkedList();
for (Iterator i =3D resultSetParameter.getResul=
tSetColumns().iterator(); i.hasNext();) {
- ElementSymbol symbol =3D (ElementSymbol)i.next().clone();
+ ElementSymbol symbol =3D i.next().clone();
symbol.setGroupSymbol(getGroup());
result.add(symbol);
}
@@ -250,13 +250,11 @@
* @return Ordered list of SingleElementSymbol
*/
public List getProjectedSymbols(){
- List result =3D new ArrayList();
- //add result set columns
- List rsColumns =3D getResultSetColumns();
- result.addAll(rsColumns);
if (!returnParameters()) {
- return result;
+ return getResultSetColumns();
}
+ //add result set columns
+ List result =3D new ArrayList(getResultSet=
Columns());
//add out/inout parameter symbols
for (SPParameter parameter : mapOfParameters.values()) {
if(parameter.getParameterType() =3D=3D ParameterInfo.RETURN_VALUE){
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/navigat=
or
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/navigator:353=
5-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/navigator:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/navigator:3816-386=
8,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/sql/navigator:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/navigator:353=
5-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/navigator:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/navigator:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/navigator:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/navigator:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/proc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/proc:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/proc:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/proc:3816-3868,387=
6-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/sql/proc:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/proc:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/proc:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/proc:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/proc:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/proc:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/symbol
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/symbol:3535-3=
555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/symbol:3673-3711,3=
754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/symbol:3816-3868,3=
876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/sql/symbol:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/symbol:3535-3=
555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/symbol:3673-3711,3=
754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/symbol:3816-3868,3=
876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/symbol:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/symbol:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/util:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/util:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/util:3816-3868,387=
6-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/sql/util:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/util:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/util:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/util:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/util:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/util:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/visitor
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/visitor:3535-=
3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/visitor:3673-3711,=
3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/visitor:3816-3868,=
3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/sql/visitor:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/visitor:3535-=
3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/visitor:3673-3711,=
3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/visitor:3816-3868,=
3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/visitor:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/visitor:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/tempdata
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/tempdata:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/tempdata:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/tempdata:3816-3868,387=
6-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/tempdata:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/tempdata:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/tempdata:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/tempdata:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/tempdata:4002-4046
/trunk/engine/src/main/java/org/teiid/query/tempdata:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/tempdata/GlobalTableSt=
oreImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/tempdata/GlobalTableStoreImp=
l.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/query/tempdata/GlobalTableStoreImp=
l.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -79,6 +79,7 @@
private Serializable loadingAddress;
private long ttl =3D -1;
private boolean valid;
+ private boolean asynch; //sub state of loading
=
protected MatTableInfo() {}
=
@@ -96,7 +97,9 @@
}
return true;
case LOADING:
- if (!firstPass && localAddress instanceof Comparable && ((Comparabl=
e)localAddress).compareTo(possibleLoadingAddress) < 0) {
+ if ((!firstPass && localAddress instanceof Comparable && ((Comparab=
le)localAddress).compareTo(possibleLoadingAddress) < 0)
+ || (refresh && asynch)) {
+ this.asynch =3D false;
this.loadingAddress =3D possibleLoadingAddress; //ties go to the lowe=
st address
return true;
}
@@ -130,6 +133,11 @@
notifyAll();
}
=
+ public synchronized void setAsynchLoad() {
+ assert state =3D=3D MatState.LOADING;
+ asynch =3D true;
+ }
+ =
public synchronized void setTtl(long ttl) {
this.ttl =3D ttl;
}
Modified: trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableData=
Manager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManage=
r.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManage=
r.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -27,15 +27,15 @@
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Executor;
-import java.util.concurrent.FutureTask;
=
+import org.teiid.adminapi.impl.SessionMetadata;
+import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.api.exception.query.ExpressionEvaluationException;
import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.api.exception.query.QueryProcessingException;
import org.teiid.api.exception.query.QueryResolverException;
import org.teiid.api.exception.query.QueryValidatorException;
+import org.teiid.client.security.SessionToken;
import org.teiid.common.buffer.BlockedException;
import org.teiid.common.buffer.BufferManager;
import org.teiid.common.buffer.TupleBuffer;
@@ -47,13 +47,14 @@
import org.teiid.core.util.Assertion;
import org.teiid.core.util.StringUtil;
import org.teiid.dqp.internal.process.CachedResults;
+import org.teiid.dqp.internal.process.DQPWorkContext;
import org.teiid.dqp.internal.process.SessionAwareCache;
import org.teiid.dqp.internal.process.SessionAwareCache.CacheID;
import org.teiid.events.EventDistributor;
+import org.teiid.language.SQLConstants;
import org.teiid.language.SQLConstants.Reserved;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.metadata.MetadataRepository;
import org.teiid.metadata.FunctionMethod.Determinism;
import org.teiid.query.QueryPlugin;
import org.teiid.query.eval.Evaluator;
@@ -85,25 +86,33 @@
*/
public class TempTableDataManager implements ProcessorDataManager {
=
- private static final String REFRESHMATVIEWROW =3D ".refreshmatviewrow"=
; //$NON-NLS-1$
+ public interface RequestExecutor {
+ void execute(String command, List parameters);
+ }
+ =
+ private static final String REFRESHMATVIEWROW =3D ".refreshmatviewrow"; /=
/$NON-NLS-1$
private static final String REFRESHMATVIEW =3D ".refreshmatview"; //$NON-=
NLS-1$
public static final String CODE_PREFIX =3D "#CODE_"; //$NON-NLS-1$
- =
+ private static String REFRESH_SQL =3D SQLConstants.Reserved.CALL + ' ' + =
CoreConstants.SYSTEM_ADMIN_MODEL + REFRESHMATVIEW + "(?, ?)"; //$NON-NLS-1$
+
private ProcessorDataManager processorDataManager;
private BufferManager bufferManager;
private SessionAwareCache cache;
- private Executor executor;
+ private RequestExecutor executor;
=
private EventDistributor eventDistributor;
-
+ =
public TempTableDataManager(ProcessorDataManager processorDataManager,=
BufferManager bufferManager, =
- Executor executor, SessionAwareCache cache){
+ SessionAwareCache cache){
this.processorDataManager =3D processorDataManager;
this.bufferManager =3D bufferManager;
- this.executor =3D executor;
this.cache =3D cache;
}
=
+ public void setExecutor(RequestExecutor executor) {
+ this.executor =3D executor;
+ }
+ =
public void setEventDistributor(EventDistributor eventDistributor) {
this.eventDistributor =3D eventDistributor;
}
@@ -396,11 +405,12 @@
}
}
if (load) {
- if (!info.isValid()) {
+ if (!info.isValid() || executor =3D=3D null) {
//blocking load
loadGlobalTable(context, group, tableName, globalStore);
} else {
- loadAsynch(context, group, tableName, globalStore);
+ info.setAsynchLoad();
+ loadAsynch(context, tableName);
}
} =
table =3D globalStore.getTempTableStore().getOrCreateTempTable(tableNam=
e, query, bufferManager, false, false, context);
@@ -417,16 +427,25 @@
return table.createTupleSource(query.getProjectedSymbols(), query.getCri=
teria(), query.getOrderBy());
}
=
- private void loadAsynch(final CommandContext context,
- final GroupSymbol group, final String tableName, final GlobalTableStore=
globalStore) {
- Callable toCall =3D new Callable() {
+ private void loadAsynch(final CommandContext context, final String tableN=
ame) {
+ SessionMetadata session =3D createTemporarySession(context.getUserName()=
, "asynch-mat-view-load", context.getDQPWorkContext().getVDB()); //$NON-NLS=
-1$
+ session.setSubject(context.getSubject());
+ session.setSecurityDomain(context.getSession().getSecurityDomain());
+ DQPWorkContext workContext =3D new DQPWorkContext();
+ workContext.setAdmin(true);
+ DQPWorkContext current =3D context.getDQPWorkContext();
+ workContext.setSession(session);
+ workContext.setPolicies(current.getAllowedDataPolicies());
+ workContext.setSecurityHelper(current.getSecurityHelper());
+ final String viewName =3D tableName.substring(RelationalPlanner.MAT_PREF=
IX.length());
+ workContext.runInContext(new Runnable() {
+
@Override
- public Integer call() throws Exception {
- return loadGlobalTable(context, group, tableName, globalStore);
+ public void run() {
+ executor.execute(REFRESH_SQL, Arrays.asList(viewName, Boolean.FALSE.to=
String()));
}
- };
- FutureTask task =3D new FutureTask(toCall);
- executor.execute(task);
+ =
+ });
}
=
private int loadGlobalTable(CommandContext context,
@@ -515,4 +534,26 @@
public EventDistributor getEventDistributor() {
return this.eventDistributor;
}
+
+ /**
+ * Create an unauthenticated session
+ * @param userName
+ * @param app
+ * @param vdb
+ * @return
+ */
+ public static SessionMetadata createTemporarySession(String userName, Str=
ing app, VDBMetaData vdb) {
+ long creationTime =3D System.currentTimeMillis();
+ SessionMetadata newSession =3D new SessionMetadata();
+ newSession.setSessionToken(new SessionToken(userName));
+ newSession.setSessionId(newSession.getSessionToken().getSessionID());
+ newSession.setUserName(userName);
+ newSession.setCreatedTime(creationTime);
+ newSession.setApplicationName(app); =
+ newSession.setVDBName(vdb.getName());
+ newSession.setVDBVersion(vdb.getVersion());
+ newSession.setVdb(vdb);
+ newSession.setEmbedded(true);
+ return newSession;
+ }
}
Property changes on: trunk/engine/src/main/java/org/teiid/query/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/util:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/util:3673-3711,3754-37=
69
/branches/7.7.x/engine/src/main/java/org/teiid/query/util:3816-3868,3876-39=
15,3920-3983
/trunk/engine/src/main/java/org/teiid/query/util:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/util:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/util:3673-3711,3754-37=
69
/branches/7.7.x/engine/src/main/java/org/teiid/query/util:3816-3868,3876-39=
15,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/util:4002-4046
/trunk/engine/src/main/java/org/teiid/query/util:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/validator
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/validator:3535-35=
55
/branches/7.6.x/engine/src/main/java/org/teiid/query/validator:3673-3711,37=
54-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/validator:3816-3868,38=
76-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/validator:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/validator:3535-35=
55
/branches/7.6.x/engine/src/main/java/org/teiid/query/validator:3673-3711,37=
54-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/validator:3816-3868,38=
76-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/validator:4002-4046
/trunk/engine/src/main/java/org/teiid/query/validator:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/xquery
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/xquery:3673-3711*,3754=
-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/xquery:3816-3868*,3876=
-3915*,3920-3983*
/trunk/engine/src/main/java/org/teiid/query/xquery:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/xquery:3673-3711*,3754=
-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/xquery:3816-3868*,3876=
-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/xquery:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/xquery:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/xquery/saxon
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery/saxon:3535=
-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/xquery/saxon:3673-3711=
,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/xquery/saxon:3816-3868=
,3876-3915,3920-3983
/trunk/engine/src/main/java/org/teiid/query/xquery/saxon:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery/saxon:3535=
-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/xquery/saxon:3673-3711=
,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/xquery/saxon:3816-3868=
,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/xquery/saxon:4002-4046
/trunk/engine/src/main/java/org/teiid/query/xquery/saxon:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/vdb
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/vdb:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/vdb:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/vdb:3816-3868*,3876-3915*,39=
20-3983*
/trunk/engine/src/main/java/org/teiid/vdb:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/vdb:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/vdb:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/vdb:3816-3868*,3876-3915*,39=
20-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/vdb:4002-4046*
/trunk/engine/src/main/java/org/teiid/vdb:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/vdb/runtime
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/vdb/runtime:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/vdb/runtime:3673-3711,3754-3=
769
/branches/7.7.x/engine/src/main/java/org/teiid/vdb/runtime:3816-3868,3876-3=
915,3920-3983
/trunk/engine/src/main/java/org/teiid/vdb/runtime:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/vdb/runtime:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/vdb/runtime:3673-3711,3754-3=
769
/branches/7.7.x/engine/src/main/java/org/teiid/vdb/runtime:3816-3868,3876-3=
915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/vdb/runtime:4002-4046
/trunk/engine/src/main/java/org/teiid/vdb/runtime:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/vdb/runtime/VDBKey.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/vdb/runtime/VDBKey.java 2012-05-01=
15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/vdb/runtime/VDBKey.java 2012-05-01=
19:12:27 UTC (rev 4047)
@@ -32,16 +32,17 @@
=
private String name;
private int version;
+ private int hashCode;
=
public VDBKey(String name, String version) {
- this.name =3D name.toUpperCase();
+ this.name =3D name;
if (version !=3D null) {
this.version =3D Integer.parseInt(version);
}
}
=
public VDBKey(String name, int version) {
- this.name =3D name.toUpperCase();
+ this.name =3D name;
this.version =3D version;
} =
=
@@ -57,7 +58,10 @@
* @see java.lang.Object#hashCode()
*/
public int hashCode() {
- return HashCodeUtil.hashCode(name.hashCode(), version);
+ if (hashCode =3D=3D 0) {
+ hashCode =3D HashCodeUtil.hashCode(HashCodeUtil.expHashCode(name, fa=
lse), version); =
+ }
+ return hashCode;
}
=
/** =
@@ -74,8 +78,8 @@
=
VDBKey other =3D (VDBKey)obj;
=
- return other.name.equals(this.name) =
- && version =3D=3D other.version;
+ return version =3D=3D other.version =
+ && other.name.equalsIgnoreCase(this.name);
}
=
/** =
@@ -87,11 +91,11 @@
=
@Override
public int compareTo(VDBKey o) {
- int compare =3D name.compareTo(o.name);
+ int compare =3D String.CASE_INSENSITIVE_ORDER.compare(name, o.name);
if (compare =3D=3D 0) {
return version - o.version;
}
return compare;
}
- =
+ =
}
Modified: trunk/engine/src/main/resources/org/teiid/query/i18n.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2012-05=
-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2012-05=
-01 19:12:27 UTC (rev 4047)
@@ -73,6 +73,7 @@
QueryParser.nullSqlCrit=3DParser cannot parse a null sql criteria.
QueryParser.lexicalError=3DLexical error: {0}
QueryParser.nullSqlExpr=3DParser cannot parse a null sql expression.
+TEIID30378=3DDirect usage of XQuery is no longer supported, use XMLQUERY i=
nstead.
TEIID30379=3DDirect usage of XQuery is no longer supported, use XMLQUERY i=
nstead.
=
# processor (006)
@@ -859,7 +860,6 @@
TEIID30548=3DProperty value length exceeds max of {0}.
TEIID30549=3DCould not find a metadata record with uuid {0}.
TEIID30489=3DUnable to load metadata for VDB name
-TEIID30494=3DUnknown query metadata exception while registering query: {0}.
DQPCore.Clearing_prepared_plan_cache=3DClearing prepared plan cache
DQPCore.Clearing_prepared_plan_cache_for_vdb=3DClearing prepared plan cach=
e for vdb {0}.{1} =
DQPCore.clearing_resultset_cache=3DClearing the resultset cache for vdb {0=
}.{1}
Property changes on: trunk/engine/src/test/java/org/teiid/cache
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/cache:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/cache:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/cache:3816-3868*,3876-3915*,=
3920-3983*
/trunk/engine/src/test/java/org/teiid/cache:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/cache:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/cache:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/cache:3816-3868*,3876-3915*,=
3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/cache:4002-4046*
/trunk/engine/src/test/java/org/teiid/cache:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/cache/TestDefault=
Cache.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.=
java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:=
3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:=
3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.=
java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:=
3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:=
4002-4046
/trunk/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/common
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/common:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/common:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/common:3816-3868*,3876-3915*=
,3920-3983*
/trunk/engine/src/test/java/org/teiid/common:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/common:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/common:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/common:3816-3868*,3876-3915*=
,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/common:4002-4046*
/trunk/engine/src/test/java/org/teiid/common:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/common/buffer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/common/buffer:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/common/buffer:3673-3711,3754=
-3769
/branches/7.7.x/engine/src/test/java/org/teiid/common/buffer:3816-3868,3876=
-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/common/buffer:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/common/buffer:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/common/buffer:3673-3711,3754=
-3769
/branches/7.7.x/engine/src/test/java/org/teiid/common/buffer:3816-3868,3876=
-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/common/buffer:4002-4046
/trunk/engine/src/test/java/org/teiid/common/buffer:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/common/queue
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/common/queue:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/common/queue:3673-3711,3754-=
3769
/branches/7.7.x/engine/src/test/java/org/teiid/common/queue:3816-3868,3876-=
3915,3920-3983
/trunk/engine/src/test/java/org/teiid/common/queue:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/common/queue:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/common/queue:3673-3711,3754-=
3769
/branches/7.7.x/engine/src/test/java/org/teiid/common/queue:3816-3868,3876-=
3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/common/queue:4002-4046
/trunk/engine/src/test/java/org/teiid/common/queue:3507-3666
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestReq=
uest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestRequest.j=
ava 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestRequest.j=
ava 2012-05-01 19:12:27 UTC (rev 4047)
@@ -35,6 +35,7 @@
import org.teiid.core.TeiidProcessingException;
import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
import org.teiid.dqp.internal.datamgr.FakeTransactionService;
+import org.teiid.dqp.internal.process.AuthorizationValidator.CommandType;
import org.teiid.dqp.service.AutoGenDataService;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.parser.QueryParser;
@@ -88,10 +89,9 @@
drpd.setAllowFunctionCallsByDefault(true);
drav.setPolicyDecider(drpd);
request.setAuthorizationValidator(drav);
- request.validateAccess(command);
+ request.validateAccess(new String[] {QUERY}, command, CommandType.=
USER);
}
=
- =
/**
* Test Request.processRequest().
* Test processing the same query twice, and make sure that doesn't ca=
use problems. =
@@ -165,7 +165,7 @@
DQPWorkContext workContext =3D RealMetadataFactory.buildWorkContex=
t(metadata, RealMetadataFactory.example1VDB());
=
message.setStatementType(StatementType.PREPARED);
- message.setParameterValues(new ArrayList());
+ message.setParameterValues(new ArrayList());
=
helpProcessMessage(message, cache, workContext);
=
@@ -173,7 +173,7 @@
//If this doesn't throw an exception, assume it was successful.
message =3D new RequestMessage(QUERY);
message.setStatementType(StatementType.PREPARED);
- message.setParameterValues(new ArrayList());
+ message.setParameterValues(new ArrayList());
=
helpProcessMessage(message, cache, workContext);
}
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/multiso=
urce/TestMultiSourcePlanToProcessConverter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/T=
estMultiSourcePlanToProcessConverter.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/T=
estMultiSourcePlanToProcessConverter.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -232,6 +232,23 @@
helpTestMultiSourcePlan(metadata, userSql, multiModel, sources, da=
taMgr, expected, RealMetadataFactory.exampleMultiBindingVDB());
}
=
+ @Test public void testMultiReplacementWithProjectConstantLimit() throw=
s Exception {
+ final QueryMetadataInterface metadata =3D RealMetadataFactory.exam=
pleMultiBinding();
+ final String userSql =3D "SELECT a, b, source_name || a, '1' FROM =
MultiModel.Phys"; //$NON-NLS-1$
+ final String multiModel =3D "MultiModel"; //$NON-NLS-1$
+ final int sources =3D 2;
+ final List[] expected =3D new List[] {
+ Arrays.asList("x", "z", "ax", "1"),
+ };
+ final HardcodedDataManager dataMgr =3D new HardcodedDataManager();
+ dataMgr.addData("SELECT g_0.a, g_0.b, concat('a', g_0.a) FROM Mult=
iModel.Phys AS g_0", //$NON-NLS-1$
+ new List[] {
+ Arrays.asList("x", "z", "ax")}); //$NON-NLS-1$ //$NON-=
NLS-2$ //$NON-NLS-3$
+ dataMgr.addData("SELECT g_0.a, g_0.b, concat('b', g_0.a) FROM Mult=
iModel.Phys AS g_0", //$NON-NLS-1$
+ new List[] {});
+ helpTestMultiSourcePlan(metadata, userSql, multiModel, sources, da=
taMgr, expected, RealMetadataFactory.exampleMultiBindingVDB());
+ }
+ =
@Test public void testMultiDependentJoin() throws Exception {
QueryMetadataInterface metadata =3D RealMetadataFactory.exampleMul=
tiBinding();
=
Property changes on: trunk/engine/src/test/java/org/teiid/query
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query:3816-3868*,3876-3915*,=
3920-3983*
/trunk/engine/src/test/java/org/teiid/query:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query:3816-3868*,3876-3915*,=
3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query:4002-4046*
/trunk/engine/src/test/java/org/teiid/query:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/analysis
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/analysis:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/analysis:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/analysis:3816-3868,387=
6-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/analysis:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/analysis:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/analysis:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/analysis:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/analysis:4002-4046
/trunk/engine/src/test/java/org/teiid/query/analysis:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function:3535-355=
5*
/branches/7.6.x/engine/src/test/java/org/teiid/query/function:3673-3711*,37=
54-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function:3816-3868*,38=
76-3915*,3920-3983*
/trunk/engine/src/test/java/org/teiid/query/function:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function:3535-355=
5*
/branches/7.6.x/engine/src/test/java/org/teiid/query/function:3673-3711*,37=
54-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function:3816-3868*,38=
76-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/function:4002-4046*
/trunk/engine/src/test/java/org/teiid/query/function:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/Te=
stFunction.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunc=
tion.java:3281-3325,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunction.=
java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunction.=
java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java:3188=
-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunc=
tion.java:3281-3325,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunction.=
java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunction.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunction.=
java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java:3188=
-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/Te=
stFunctionLibrary.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunc=
tionLibrary.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionL=
ibrary.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionL=
ibrary.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.ja=
va:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunc=
tionLibrary.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionL=
ibrary.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionL=
ibrary.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionL=
ibrary.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.ja=
va:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/Te=
stFunctionMetadataReader.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunc=
tionMetadataReader.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
etadataReader.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
etadataReader.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataRe=
ader.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunc=
tionMetadataReader.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
etadataReader.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
etadataReader.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
etadataReader.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataRe=
ader.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/Te=
stFunctionMethods.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunc=
tionMethods.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
ethods.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
ethods.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.ja=
va:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunc=
tionMethods.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
ethods.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
ethods.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
ethods.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.ja=
va:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/Te=
stFunctionTree.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunc=
tionTree.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionT=
ree.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionT=
ree.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:=
3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunc=
tionTree.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionT=
ree.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionT=
ree.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionT=
ree.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:=
3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/Te=
stResolvedFunctions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestReso=
lvedFunctions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestResolvedF=
unctions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestResolvedF=
unctions.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.=
java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestReso=
lvedFunctions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestResolvedF=
unctions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestResolvedF=
unctions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestResolvedF=
unctions.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.=
java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/me=
tadata
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/metadata=
:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/metadata:3673=
-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/metadata:3816=
-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/function/metadata:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/metadata=
:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/metadata:3673=
-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/metadata:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/metadata:4002=
-4046
/trunk/engine/src/test/java/org/teiid/query/function/metadata:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/so=
urce
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/source:3=
535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/source:3673-3=
711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/source:3816-3=
868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/function/source:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/source:3=
535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/source:3673-3=
711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/source:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/source:4002-4=
046
/trunk/engine/src/test/java/org/teiid/query/function/source:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/mapping
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/mapping:3673-3711*,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/mapping:3816-3868*,387=
6-3915*,3920-3983*
/trunk/engine/src/test/java/org/teiid/query/mapping:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/mapping:3673-3711*,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/mapping:3816-3868*,387=
6-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/mapping:4002-4046*
/trunk/engine/src/test/java/org/teiid/query/mapping:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/mapping/xml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping/xml:3535-=
3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/mapping/xml:3673-3711,=
3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/mapping/xml:3816-3868,=
3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/mapping/xml:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping/xml:3535-=
3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/mapping/xml:3673-3711,=
3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/mapping/xml:3816-3868,=
3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/mapping/xml:4002-4046
/trunk/engine/src/test/java/org/teiid/query/mapping/xml:3507-3666
Modified: trunk/engine/src/test/java/org/teiid/query/mapping/xml/TestMappin=
gOutputter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/test/java/org/teiid/query/mapping/xml/TestMappingOutpu=
tter.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/test/java/org/teiid/query/mapping/xml/TestMappingOutpu=
tter.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -29,8 +29,6 @@
import java.io.StringWriter;
import java.util.ArrayList;
=
-import javax.xml.bind.JAXBException;
-
import org.teiid.query.mapping.xml.MappingAttribute;
import org.teiid.query.mapping.xml.MappingChoiceNode;
import org.teiid.query.mapping.xml.MappingCriteriaNode;
Property changes on: trunk/engine/src/test/java/org/teiid/query/metadata
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/metadata:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/metadata:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/metadata:3816-3868,387=
6-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/metadata:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/metadata:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/metadata:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/metadata:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/metadata:4002-4046
/trunk/engine/src/test/java/org/teiid/query/metadata:3507-3666
Modified: trunk/engine/src/test/java/org/teiid/query/metadata/TestMetadataV=
alidator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/test/java/org/teiid/query/metadata/TestMetadataValidat=
or.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/test/java/org/teiid/query/metadata/TestMetadataValidat=
or.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -32,6 +32,7 @@
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.metadata.MetadataFactory;
import org.teiid.metadata.MetadataStore;
+import org.teiid.metadata.Table;
import org.teiid.query.function.SystemFunctionManager;
import org.teiid.query.parser.TestDDLParser;
import org.teiid.query.validator.ValidatorFailure;
@@ -266,4 +267,34 @@
assertEquals("G1", store.getSchema("vm1").getTable("G2").getMaterialized=
Table().getName());
} =
=
+ =
+ @Test
+ public void testSkipDocumentModel() throws Exception {
+ ModelMetaData model =3D new ModelMetaData();
+ model.setName("xmlstuff"); =
+ model.setModelType(Model.Type.VIRTUAL);
+ vdb.addModel(model);
+ =
+ MetadataFactory mf =3D new MetadataFactory("myVDB",1, "xmlstuff", TestDD=
LParser.getDataTypes(), new Properties(), null);
+ mf.setPhysical(false);
+ =
+ Table t =3D mf.addTable("xmldoctable");
+ t.setTableType(Table.Type.Document);
+ mf.addColumn("c1", "string", t);
+ t.setSelectTransformation("some dummy stuff, should not be validated");
+ t.setVirtual(true);
+ =
+ Table t2 =3D mf.addTable("xmldoctable2");
+ t2.setTableType(Table.Type.XmlMappingClass);
+ mf.addColumn("c1", "string", t2);
+ t2.setSelectTransformation("some dummy stuff, should not be validated"); =
+ t2.setVirtual(true);
+ mf.mergeInto(store); =
+ =
+ buildTransformationMetadata();
+ =
+ ValidatorReport report =3D new ValidatorReport();
+ report =3D MetadataValidator.validate(this.vdb, this.store);
+ assertFalse(printError(report), report.hasItems());
+ } =
}
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer:3535-35=
55*
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer:3673-3711*,3=
754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer:3816-3868*,3=
876-3915*,3920-3983*
/trunk/engine/src/test/java/org/teiid/query/optimizer:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer:3535-35=
55*
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer:3673-3711*,3=
754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer:4002-4046*
/trunk/engine/src/test/java/org/teiid/query/optimizer:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/F=
akeFunctionMetadataSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/FakeFun=
ctionMetadataSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunction=
MetadataSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunction=
MetadataSource.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataS=
ource.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/FakeFun=
ctionMetadataSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunction=
MetadataSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunction=
MetadataSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunction=
MetadataSource.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataS=
ource.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/I=
nlineViewCase.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/InlineV=
iewCase.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCa=
se.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCa=
se.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3=
507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/InlineV=
iewCase.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCa=
se.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCa=
se.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCa=
se.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3=
507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estAccessPatterns.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAcc=
essPatterns.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPa=
tterns.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPa=
tterns.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.ja=
va:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAcc=
essPatterns.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPa=
tterns.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPa=
tterns.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPa=
tterns.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.ja=
va:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estAggregatePushdown.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAgg=
regatePushdown.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregat=
ePushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregat=
ePushdown.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown=
.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAgg=
regatePushdown.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregat=
ePushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregat=
ePushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregat=
ePushdown.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown=
.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estAnsiJoinPushdown.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAns=
iJoinPushdown.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoin=
Pushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoin=
Pushdown.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.=
java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAns=
iJoinPushdown.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoin=
Pushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoin=
Pushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoin=
Pushdown.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.=
java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estBatchedUpdatePlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestBat=
chedUpdatePlanner.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedU=
pdatePlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedU=
pdatePlanner.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlan=
ner.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestBat=
chedUpdatePlanner.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedU=
pdatePlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedU=
pdatePlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedU=
pdatePlanner.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlan=
ner.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estComparableMetadataPushdown.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestCom=
parableMetadataPushdown.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestComparab=
leMetadataPushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestComparab=
leMetadataPushdown.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadat=
aPushdown.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestCom=
parableMetadataPushdown.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestComparab=
leMetadataPushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestComparab=
leMetadataPushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestComparab=
leMetadataPushdown.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadat=
aPushdown.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estDependentJoins.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestDep=
endentJoins.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestDependen=
tJoins.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestDependen=
tJoins.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.ja=
va:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestDep=
endentJoins.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestDependen=
tJoins.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestDependen=
tJoins.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestDependen=
tJoins.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.ja=
va:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estExpressionsInGroupBy.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestExp=
ressionsInGroupBy.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressi=
onsInGroupBy.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressi=
onsInGroupBy.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGrou=
pBy.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestExp=
ressionsInGroupBy.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressi=
onsInGroupBy.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressi=
onsInGroupBy.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressi=
onsInGroupBy.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGrou=
pBy.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estInlineView.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestInl=
ineView.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineVi=
ew.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineVi=
ew.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3=
188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestInl=
ineView.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineVi=
ew.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineVi=
ew.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineVi=
ew.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3=
188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estJoinOptimization.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoi=
nOptimization.java:3149-3217,3535-3555,3558-3585
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOpti=
mization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOpti=
mization.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.=
java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoi=
nOptimization.java:3149-3217,3535-3555,3558-3585
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOpti=
mization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOpti=
mization.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOpti=
mization.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.=
java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estJoinPushdownRestrictions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoi=
nPushdownRestrictions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPush=
downRestrictions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPush=
downRestrictions.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestr=
ictions.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoi=
nPushdownRestrictions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPush=
downRestrictions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPush=
downRestrictions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPush=
downRestrictions.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestr=
ictions.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estJoinWithFunction.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoi=
nWithFunction.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWith=
Function.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWith=
Function.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.=
java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoi=
nWithFunction.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWith=
Function.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWith=
Function.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWith=
Function.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.=
java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estLimit.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestLim=
it.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.ja=
va:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.ja=
va:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3188-3=
450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestLim=
it.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.ja=
va:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.ja=
va:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3188-3=
450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estOptimizer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOpt=
imizer.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimize=
r.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimize=
r.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:31=
88-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOpt=
imizer.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimize=
r.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimize=
r.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimize=
r.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:31=
88-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estOptionalJoins.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOpt=
ionalJoins.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestOptional=
Joins.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestOptional=
Joins.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.jav=
a:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOpt=
ionalJoins.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestOptional=
Joins.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestOptional=
Joins.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestOptional=
Joins.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.jav=
a:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estPartitionedJoinPlanning.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestPar=
titionedJoinPlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitio=
nedJoinPlanning.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitio=
nedJoinPlanning.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPl=
anning.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestPar=
titionedJoinPlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitio=
nedJoinPlanning.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitio=
nedJoinPlanning.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitio=
nedJoinPlanning.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPl=
anning.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estRuleMergeVirtual.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRul=
eMergeVirtual.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMerg=
eVirtual.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMerg=
eVirtual.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.=
java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRul=
eMergeVirtual.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMerg=
eVirtual.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMerg=
eVirtual.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMerg=
eVirtual.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.=
java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estRuleRaiseNull.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRul=
eRaiseNull.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRais=
eNull.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRais=
eNull.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.jav=
a:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRul=
eRaiseNull.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRais=
eNull.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRais=
eNull.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRais=
eNull.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.jav=
a:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estRuleRemoveSorts.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRul=
eRemoveSorts.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemo=
veSorts.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemo=
veSorts.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.j=
ava:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRul=
eRemoveSorts.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemo=
veSorts.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemo=
veSorts.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemo=
veSorts.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.j=
ava:3188-3450,3452-3666
Modified: trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOpti=
mization.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimizati=
on.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimizati=
on.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -286,6 +286,40 @@
helpPlan(sql, RealMetadataFactory.example1Cached(), null, capFinde=
r, =
new String[] {"SELECT g_0.e1 AS c_0,=
g_0.e2 AS c_1 FROM pm1.g1 AS g_0 ORDER BY c_0 LIMIT 1"}, ComparisonMode.EX=
ACT_COMMAND_STRING); //$NON-NLS-1$
}
+ =
+ //TODO this should trigger another view removal and thus the combinati=
on of the grouping/dup operation
+ @Test public void testGroupDupCombination1Pushdown() { =
+ FakeCapabilitiesFinder capFinder =3D new FakeCapabilitiesFinder();
+ BasicSourceCapabilities caps =3D getTypicalCapabilities();
+ caps.setCapabilitySupport(Capability.QUERY_SELECT_DISTINCT, true);
+ caps.setCapabilitySupport(Capability.QUERY_FROM_INLINE_VIEWS, true=
);
+ caps.setCapabilitySupport(Capability.QUERY_GROUP_BY, true);
+ capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$
+ capFinder.addCapabilities("pm2", caps); //$NON-NLS-1$
=
+ // Create query =
+ String sql =3D "select e1, (select e1 from pm2.g1 where e2 =3D x.e=
2) as z from (select distinct e1, e2 from pm1.g1) as x group by e1, e2 orde=
r by e1"; //$NON-NLS-1$
=
+ ProcessorPlan plan =3D helpPlan(sql, RealMetadataFactory.example1C=
ached(), null, capFinder, =
+ new String[] {"SELECT v_0.c_0, v_0.c=
_1 FROM (SELECT DISTINCT g_0.e1 AS c_0, g_0.e2 AS c_1 FROM pm1.g1 AS g_0) A=
S v_0 GROUP BY v_0.c_0, v_0.c_1"}, TestOptimizer.SHOULD_SUCCEED); //$NON-NL=
S-1$ =
+ =
+ checkNodeTypes(plan, new int[] {
+ 1, // Access
+ 0, // DependentAccess
+ 0, // DependentSelect
+ 1, // DependentProject
+ 0, // DupRemove
+ 0, // Grouping
+ 0, // NestedLoopJoinStrategy
+ 0, // MergeJoinStrategy
+ 0, // Null
+ 0, // PlanExecution
+ 0, // Project
+ 0, // Select
+ 0, // Sort
+ 0 // UnionAll
+ });
+ checkNodeTypes(plan, new int[] {0}, new Class[] {DupRemoveSortNode=
.class});
+ }
+
}
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estSortOptimization.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSor=
tOptimization.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOpti=
mization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOpti=
mization.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.=
java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSor=
tOptimization.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOpti=
mization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOpti=
mization.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOpti=
mization.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.=
java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estStoredProcedurePlanning.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSto=
redProcedurePlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredPr=
ocedurePlanning.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredPr=
ocedurePlanning.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePl=
anning.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSto=
redProcedurePlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredPr=
ocedurePlanning.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredPr=
ocedurePlanning.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredPr=
ocedurePlanning.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePl=
anning.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estSubqueryPushdown.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSub=
queryPushdown.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestSubquery=
Pushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestSubquery=
Pushdown.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.=
java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSub=
queryPushdown.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestSubquery=
Pushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestSubquery=
Pushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestSubquery=
Pushdown.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.=
java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estUnionPlanning.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestUni=
onPlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPla=
nning.java:3673-3711,3754-3769,3776-3813
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPla=
nning.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.jav=
a:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestUni=
onPlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPla=
nning.java:3673-3711,3754-3769,3776-3813
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPla=
nning.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPla=
nning.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.jav=
a:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/c=
apabilities
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/capabil=
ities:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/capabilities=
:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/capabilities=
:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/capabilities:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/capabil=
ities:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/capabilities=
:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/capabilities=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/capabilities=
:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/capabilities:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/p=
roc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/proc:35=
35-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/proc:3673-37=
11,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/proc:3816-38=
68,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/proc:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/proc:35=
35-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/proc:3673-37=
11,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/proc:3816-38=
68,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/proc:4002-40=
46
/trunk/engine/src/test/java/org/teiid/query/optimizer/proc:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/r=
elational
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational:3=
673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational:3=
816-3868*,3876-3915*,3920-3983*
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational:3=
673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational:3=
816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational:4=
002-4046*
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/r=
elational/TestAliasGenerator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal/TestAliasGenerator.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estAliasGenerator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estAliasGenerator.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasG=
enerator.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal/TestAliasGenerator.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estAliasGenerator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estAliasGenerator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estAliasGenerator.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasG=
enerator.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/r=
elational/TestMaterialization.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal/TestMaterialization.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estMaterialization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estMaterialization.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMateri=
alization.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal/TestMaterialization.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estMaterialization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estMaterialization.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estMaterialization.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMateri=
alization.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/r=
elational/TestRuleStack.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal/TestRuleStack.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estRuleStack.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estRuleStack.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleSt=
ack.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal/TestRuleStack.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estRuleStack.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estRuleStack.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estRuleStack.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleSt=
ack.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/r=
elational/plantree
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal/plantree:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/p=
lantree:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/p=
lantree:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3=
507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal/plantree:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/p=
lantree:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/p=
lantree:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/p=
lantree:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3=
507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/r=
elational/rules
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal/rules:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/r=
ules:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/r=
ules:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3507=
-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal/rules:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/r=
ules:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/r=
ules:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/r=
ules:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3507=
-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/x=
ml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/xml:353=
5-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/xml:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/xml:3816-386=
8,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/optimizer/xml:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/xml:353=
5-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/xml:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/xml:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/xml:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/xml:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/parser
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/parser:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/parser:3673-3711,3754-=
3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/parser:3816-3868,3876-=
3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/parser:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/parser:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/parser:3673-3711,3754-=
3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/parser:3816-3868,3876-=
3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/parser:4002-4046
/trunk/engine/src/test/java/org/teiid/query/parser:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor:3535-35=
55*
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor:3673-3711*,3=
754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor:3816-3868*,3=
876-3915*,3920-3983*
/trunk/engine/src/test/java/org/teiid/query/processor:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor:3535-35=
55*
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor:3673-3711*,3=
754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor:4002-4046*
/trunk/engine/src/test/java/org/teiid/query/processor:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/F=
akeDataManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDat=
aManager.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeDataMana=
ger.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeDataMana=
ger.java:3816-3868,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:=
3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDat=
aManager.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeDataMana=
ger.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeDataMana=
ger.java:3816-3868,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeDataMana=
ger.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:=
3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/F=
akeDataStore.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDat=
aStore.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeDataStor=
e.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeDataStor=
e.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:31=
88-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDat=
aStore.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeDataStor=
e.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeDataStor=
e.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeDataStor=
e.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:31=
88-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/F=
akeProcessorPlan.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakePro=
cessorPlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeProcesso=
rPlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeProcesso=
rPlan.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.jav=
a:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakePro=
cessorPlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeProcesso=
rPlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeProcesso=
rPlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeProcesso=
rPlan.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.jav=
a:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/F=
akeTupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeTup=
leSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSou=
rce.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSou=
rce.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:=
3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeTup=
leSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSou=
rce.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSou=
rce.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSou=
rce.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:=
3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/H=
ardcodedDataManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/Hardcod=
edDataManager.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/HardcodedDat=
aManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/HardcodedDat=
aManager.java:3816-3868,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.=
java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/Hardcod=
edDataManager.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/HardcodedDat=
aManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/HardcodedDat=
aManager.java:3816-3868,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/HardcodedDat=
aManager.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.=
java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estAggregateProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestAgg=
regateProcessing.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestAggregat=
eProcessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestAggregat=
eProcessing.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessi=
ng.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestAgg=
regateProcessing.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestAggregat=
eProcessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestAggregat=
eProcessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestAggregat=
eProcessing.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessi=
ng.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estArrayTable.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestArr=
ayTable.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestArrayTab=
le.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestArrayTab=
le.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3=
507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestArr=
ayTable.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestArrayTab=
le.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestArrayTab=
le.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestArrayTab=
le.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3=
507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estBaseProcessorPlan.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBas=
eProcessorPlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBaseProc=
essorPlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBaseProc=
essorPlan.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan=
.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBas=
eProcessorPlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBaseProc=
essorPlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBaseProc=
essorPlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestBaseProc=
essorPlan.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan=
.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estBatchIterator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBat=
chIterator.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBatchIte=
rator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBatchIte=
rator.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.jav=
a:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBat=
chIterator.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBatchIte=
rator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBatchIte=
rator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestBatchIte=
rator.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.jav=
a:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estBatchedUpdatePlan.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBat=
chedUpdatePlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBatchedU=
pdatePlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBatchedU=
pdatePlan.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan=
.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBat=
chedUpdatePlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBatchedU=
pdatePlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBatchedU=
pdatePlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestBatchedU=
pdatePlan.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan=
.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estCollectionTupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestCol=
lectionTupleSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestCollecti=
onTupleSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestCollecti=
onTupleSource.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSo=
urce.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestCol=
lectionTupleSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestCollecti=
onTupleSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestCollecti=
onTupleSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestCollecti=
onTupleSource.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSo=
urce.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estDependentJoins.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestDep=
endentJoins.java:3149-3217,3535-3555,3558-3585
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestDependen=
tJoins.java:3673-3711,3754-3769,3776-3813
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestDependen=
tJoins.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.ja=
va:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestDep=
endentJoins.java:3149-3217,3535-3555,3558-3585
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestDependen=
tJoins.java:3673-3711,3754-3769,3776-3813
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestDependen=
tJoins.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestDependen=
tJoins.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.ja=
va:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estFunctionPushdown.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestFun=
ctionPushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestFunction=
Pushdown.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.=
java:3507-3666
+ /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestFun=
ctionPushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestFunction=
Pushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestFunction=
Pushdown.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.=
java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estInherintlyUpdatableViews.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestInh=
erintlyUpdatableViews.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestInherint=
lyUpdatableViews.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestInherint=
lyUpdatableViews.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatab=
leViews.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestInh=
erintlyUpdatableViews.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestInherint=
lyUpdatableViews.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestInherint=
lyUpdatableViews.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestInherint=
lyUpdatableViews.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatab=
leViews.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estInsertProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestIns=
ertProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestInsertPr=
ocessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestInsertPr=
ocessing.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.=
java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestIns=
ertProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestInsertPr=
ocessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestInsertPr=
ocessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestInsertPr=
ocessing.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.=
java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estJoinWithFunction.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestJoi=
nWithFunction.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestJoinWith=
Function.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestJoinWith=
Function.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.=
java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestJoi=
nWithFunction.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestJoinWith=
Function.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestJoinWith=
Function.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestJoinWith=
Function.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.=
java:3188-3450,3452-3666
Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestMaterial=
ization.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/test/java/org/teiid/query/processor/TestMaterializatio=
n.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/test/java/org/teiid/query/processor/TestMaterializatio=
n.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -35,7 +35,6 @@
import org.teiid.common.buffer.BufferManager;
import org.teiid.common.buffer.BufferManagerFactory;
import org.teiid.core.TeiidProcessingException;
-import org.teiid.core.util.ExecutorUtils;
import org.teiid.dqp.internal.process.CachedResults;
import org.teiid.dqp.internal.process.QueryProcessorFactoryImpl;
import org.teiid.dqp.internal.process.SessionAwareCache;
@@ -75,7 +74,7 @@
=
SessionAwareCache cache =3D new SessionAwareCache();
cache.setTupleBufferCache(bm);
- dataManager =3D new TempTableDataManager(hdm, bm, ExecutorUtils.getDirec=
tExecutor(), cache);
+ dataManager =3D new TempTableDataManager(hdm, bm, cache);
}
=
private void execute(String sql, List... expectedResults) throws Excep=
tion {
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estMaterialization.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestMat=
erialization.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestMaterial=
ization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestMaterial=
ization.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.j=
ava:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestMat=
erialization.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestMaterial=
ization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestMaterial=
ization.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestMaterial=
ization.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.j=
ava:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estOptionalJoins.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOpt=
ionalJoins.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestOptional=
Joins.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestOptional=
Joins.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.jav=
a:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOpt=
ionalJoins.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestOptional=
Joins.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestOptional=
Joins.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestOptional=
Joins.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.jav=
a:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estOrderByProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOrd=
erByProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestOrderByP=
rocessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestOrderByP=
rocessing.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing=
.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOrd=
erByProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestOrderByP=
rocessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestOrderByP=
rocessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestOrderByP=
rocessing.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing=
.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estProcedureRelational.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestPro=
cedureRelational.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcedur=
eRelational.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestProcedur=
eRelational.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelation=
al.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestPro=
cedureRelational.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcedur=
eRelational.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestProcedur=
eRelational.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestProcedur=
eRelational.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelation=
al.java:3188-3450,3452-3666
Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestProcesso=
r.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java=
2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java=
2012-05-01 19:12:27 UTC (rev 4047)
@@ -46,7 +46,6 @@
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.types.XMLType;
-import org.teiid.core.util.ExecutorUtils;
import org.teiid.dqp.internal.process.CachedResults;
import org.teiid.dqp.internal.process.PreparedPlan;
import org.teiid.dqp.internal.process.QueryProcessorFactoryImpl;
@@ -247,7 +246,7 @@
if (!(dataManager instanceof TempTableDataManager)) {
SessionAwareCache cache =3D new SessionAwareCache<=
CachedResults>();
cache.setTupleBufferCache(bufferMgr);
- dataManager =3D new TempTableDataManager(dataManager, bufferMgr, =
ExecutorUtils.getDirectExecutor(), cache);
+ dataManager =3D new TempTableDataManager(dataManager, bufferMgr, =
cache);
} =
if (context.getQueryProcessorFactory() =3D=3D null) {
context.setQueryProcessorFactory(new QueryProcessorFactoryImpl(bu=
fferMgr, dataManager, new DefaultCapabilitiesFinder(), null, context.getMet=
adata()));
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estProcessor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestPro=
cessor.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcesso=
r.java:3673-3711,3714-3752,3754-3769,3776-3813
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestProcesso=
r.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:31=
88-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestPro=
cessor.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcesso=
r.java:3673-3711,3714-3752,3754-3769,3776-3813
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestProcesso=
r.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestProcesso=
r.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:31=
88-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estQueryProcessor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestQue=
ryProcessor.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestQueryPro=
cessor.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestQueryPro=
cessor.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.ja=
va:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestQue=
ryProcessor.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestQueryPro=
cessor.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestQueryPro=
cessor.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestQueryPro=
cessor.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.ja=
va:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estSQLXMLProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSQL=
XMLProcessing.java:3149-3217,3220-3275,3281-3325,3340-3349,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLPr=
ocessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLPr=
ocessing.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.=
java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSQL=
XMLProcessing.java:3149-3217,3220-3275,3281-3325,3340-3349,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLPr=
ocessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLPr=
ocessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLPr=
ocessing.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.=
java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estSecurityFunctions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSec=
urityFunctions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSecurity=
Functions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSecurity=
Functions.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions=
.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSec=
urityFunctions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSecurity=
Functions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSecurity=
Functions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSecurity=
Functions.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions=
.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estSetProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSet=
Processing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSetProce=
ssing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSetProce=
ssing.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.jav=
a:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSet=
Processing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSetProce=
ssing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSetProce=
ssing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSetProce=
ssing.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.jav=
a:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estSourceHints.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSou=
rceHints.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSourceHi=
nts.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:=
3598-3666
+ /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSou=
rceHints.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSourceHi=
nts.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSourceHi=
nts.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:=
3598-3666
Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestTempTabl=
es.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.jav=
a 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.jav=
a 2012-05-01 19:12:27 UTC (rev 4047)
@@ -43,7 +43,6 @@
import org.teiid.common.buffer.BufferManager;
import org.teiid.common.buffer.BufferManagerFactory;
import org.teiid.core.TeiidProcessingException;
-import org.teiid.core.util.ExecutorUtils;
import org.teiid.dqp.internal.process.CachedResults;
import org.teiid.dqp.internal.process.SessionAwareCache;
import org.teiid.dqp.service.TransactionContext;
@@ -94,7 +93,7 @@
BufferManager bm =3D BufferManagerFactory.getStandaloneBufferManager(=
);
SessionAwareCache cache =3D new SessionAwareCache();
cache.setTupleBufferCache(bm);
- dataManager =3D new TempTableDataManager(fdm, bm, ExecutorUtils.getDirec=
tExecutor(), cache);
+ dataManager =3D new TempTableDataManager(fdm, bm, cache);
}
=
@Test public void testRollbackNoExisting() throws Exception {
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estTempTables.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTem=
pTables.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTempTabl=
es.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTempTabl=
es.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3=
188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTem=
pTables.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTempTabl=
es.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTempTabl=
es.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestTempTabl=
es.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3=
188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estTextTable.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTex=
tTable.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTextTabl=
e.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTextTabl=
e.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:31=
88-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTex=
tTable.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTextTabl=
e.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTextTabl=
e.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestTextTabl=
e.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:31=
88-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estTriggerActions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTri=
ggerActions.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTriggerA=
ctions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTriggerA=
ctions.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.ja=
va:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTri=
ggerActions.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTriggerA=
ctions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTriggerA=
ctions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestTriggerA=
ctions.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.ja=
va:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estVirtualDepJoin.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestVir=
tualDepJoin.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestVirtualD=
epJoin.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestVirtualD=
epJoin.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.ja=
va:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestVir=
tualDepJoin.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestVirtualD=
epJoin.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestVirtualD=
epJoin.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestVirtualD=
epJoin.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.ja=
va:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estWindowFunctions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWin=
dowFunctions.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestWindowFu=
nctions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestWindowFu=
nctions.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.j=
ava:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWin=
dowFunctions.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestWindowFu=
nctions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestWindowFu=
nctions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestWindowFu=
nctions.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.j=
ava:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estWithClauseProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWit=
hClauseProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestWithClau=
seProcessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestWithClau=
seProcessing.java:3816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcess=
ing.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWit=
hClauseProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestWithClau=
seProcessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestWithClau=
seProcessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestWithClau=
seProcessing.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcess=
ing.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/e=
val
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/eval:35=
35-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/eval:3673-37=
11,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/eval:3816-38=
68,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/eval:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/eval:35=
35-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/eval:3673-37=
11,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/eval:3816-38=
68,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/eval:4002-40=
46
/trunk/engine/src/test/java/org/teiid/query/processor/eval:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/p=
roc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/proc:35=
35-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/proc:3673-37=
11,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/proc:3816-38=
68,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/proc:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/proc:35=
35-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/proc:3673-37=
11,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/proc:3816-38=
68,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/proc:4002-40=
46
/trunk/engine/src/test/java/org/teiid/query/processor/proc:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/r=
elational
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/relatio=
nal:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/relational:3=
673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/relational:3=
816-3868,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/relational:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/relatio=
nal:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/relational:3=
673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/relational:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/relational:4=
002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/relational:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/x=
ml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/xml:353=
5-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/xml:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/xml:3816-386=
8,3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/processor/xml:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/xml:353=
5-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/xml:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/xml:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/xml:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/xml:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/resolver
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/resolver:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/resolver:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/resolver:3816-3868,387=
6-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/resolver:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/resolver:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/resolver:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/resolver:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/resolver:4002-4046
/trunk/engine/src/test/java/org/teiid/query/resolver:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/rewriter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/rewriter:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/rewriter:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/rewriter:3816-3868,387=
6-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/rewriter:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/rewriter:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/rewriter:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/rewriter:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/rewriter:4002-4046
/trunk/engine/src/test/java/org/teiid/query/rewriter:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/sql:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql:3673-3711*,3754-37=
69
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql:3816-3868*,3876-39=
15*,3920-3983*
/trunk/engine/src/test/java/org/teiid/query/sql:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/sql:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql:3673-3711*,3754-37=
69
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql:3816-3868*,3876-39=
15*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql:4002-4046*
/trunk/engine/src/test/java/org/teiid/query/sql:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/lang
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/lang:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/lang:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/lang:3816-3868,387=
6-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/sql/lang:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/lang:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/lang:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/lang:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/lang:4002-4046
/trunk/engine/src/test/java/org/teiid/query/sql/lang:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/proc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/proc:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/proc:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/proc:3816-3868,387=
6-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/sql/proc:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/proc:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/proc:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/proc:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/proc:4002-4046
/trunk/engine/src/test/java/org/teiid/query/sql/proc:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/symbol
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/symbol:3535-3=
555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/symbol:3673-3711,3=
754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/symbol:3816-3868,3=
876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/sql/symbol:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/symbol:3535-3=
555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/symbol:3673-3711,3=
754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/symbol:3816-3868,3=
876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/symbol:4002-4046
/trunk/engine/src/test/java/org/teiid/query/sql/symbol:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/util:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/util:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/util:3816-3868,387=
6-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/sql/util:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/util:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/util:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/util:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/util:4002-4046
/trunk/engine/src/test/java/org/teiid/query/sql/util:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/visitor
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/visitor:3535-=
3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/visitor:3673-3711,=
3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/visitor:3816-3868,=
3876-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/sql/visitor:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/visitor:3535-=
3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/visitor:3673-3711,=
3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/visitor:3816-3868,=
3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/visitor:4002-4046
/trunk/engine/src/test/java/org/teiid/query/sql/visitor:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/unittest
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/unittest:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/unittest:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/unittest:3816-3868,387=
6-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/unittest:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/unittest:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/unittest:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/unittest:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/unittest:4002-4046
/trunk/engine/src/test/java/org/teiid/query/unittest:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/util:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/util:3673-3711,3754-37=
69
/branches/7.7.x/engine/src/test/java/org/teiid/query/util:3816-3868,3876-39=
15,3920-3983
/trunk/engine/src/test/java/org/teiid/query/util:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/util:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/util:3673-3711,3754-37=
69
/branches/7.7.x/engine/src/test/java/org/teiid/query/util:3816-3868,3876-39=
15,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/util:4002-4046
/trunk/engine/src/test/java/org/teiid/query/util:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/validator
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/validator:3535-35=
55
/branches/7.6.x/engine/src/test/java/org/teiid/query/validator:3673-3711,37=
54-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/validator:3816-3868,38=
76-3915,3920-3983
/trunk/engine/src/test/java/org/teiid/query/validator:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/validator:3535-35=
55
/branches/7.6.x/engine/src/test/java/org/teiid/query/validator:3673-3711,37=
54-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/validator:3816-3868,38=
76-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/validator:4002-4046
/trunk/engine/src/test/java/org/teiid/query/validator:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/vdb
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/vdb:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/vdb:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/vdb:3816-3868*,3876-3915*,39=
20-3983*
/trunk/engine/src/test/java/org/teiid/vdb:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/vdb:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/vdb:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/vdb:3816-3868*,3876-3915*,39=
20-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/vdb:4002-4046*
/trunk/engine/src/test/java/org/teiid/vdb:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/vdb/runtime
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/vdb/runtime:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/vdb/runtime:3673-3711,3754-3=
769
/branches/7.7.x/engine/src/test/java/org/teiid/vdb/runtime:3816-3868,3876-3=
915,3920-3983
/trunk/engine/src/test/java/org/teiid/vdb/runtime:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/vdb/runtime:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/vdb/runtime:3673-3711,3754-3=
769
/branches/7.7.x/engine/src/test/java/org/teiid/vdb/runtime:3816-3868,3876-3=
915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/vdb/runtime:4002-4046
/trunk/engine/src/test/java/org/teiid/vdb/runtime:3507-3666
Property changes on: trunk/engine/src/test/resources/text
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/resources/text:3535-3555*
/branches/7.6.x/engine/src/test/resources/text:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/resources/text:3816-3868*,3876-3915*,3920-3=
983*
/trunk/engine/src/test/resources/text:3507-3666
+ /branches/7.4.x/engine/src/test/resources/text:3535-3555*
/branches/7.6.x/engine/src/test/resources/text:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/resources/text:3816-3868*,3876-3915*,3920-3=
983*
/branches/8.0.x/engine/src/test/resources/text:4002-4046*
/trunk/engine/src/test/resources/text:3507-3666
Property changes on: trunk/engine/src/test/resources/text/TextParts_HeaderR=
ow2.csv
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/resources/text/TextParts_HeaderRow2.cs=
v:3535-3555
/branches/7.6.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:381=
6-3868,3876-3915,3920-3983
/trunk/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3507-3666
+ /branches/7.4.x/engine/src/test/resources/text/TextParts_HeaderRow2.cs=
v:3535-3555
/branches/7.6.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:400=
2-4046
/trunk/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3507-3666
Property changes on: trunk/engine/src/test/resources/text/cdm_dos.txt
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/resources/text/cdm_dos.txt:3535-3555
/branches/7.6.x/engine/src/test/resources/text/cdm_dos.txt:3673-3711,3754-3=
769
/branches/7.7.x/engine/src/test/resources/text/cdm_dos.txt:3816-3868,3876-3=
915,3920-3983
/trunk/engine/src/test/resources/text/cdm_dos.txt:3507-3666
+ /branches/7.4.x/engine/src/test/resources/text/cdm_dos.txt:3535-3555
/branches/7.6.x/engine/src/test/resources/text/cdm_dos.txt:3673-3711,3754-3=
769
/branches/7.7.x/engine/src/test/resources/text/cdm_dos.txt:3816-3868,3876-3=
915,3920-3983
/branches/8.0.x/engine/src/test/resources/text/cdm_dos.txt:4002-4046
/trunk/engine/src/test/resources/text/cdm_dos.txt:3507-3666
Property changes on: trunk/engine/src/test/resources/text/cdm_dos_win.txt
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/resources/text/cdm_dos_win.txt:3149-31=
64,3172-3217,3535-3555
/branches/7.6.x/engine/src/test/resources/text/cdm_dos_win.txt:3673-3711,37=
54-3769
/branches/7.7.x/engine/src/test/resources/text/cdm_dos_win.txt:3816-3868,38=
76-3915,3920-3983
/trunk/engine/src/test/resources/text/cdm_dos_win.txt:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/resources/text/cdm_dos_win.txt:3149-31=
64,3172-3217,3535-3555
/branches/7.6.x/engine/src/test/resources/text/cdm_dos_win.txt:3673-3711,37=
54-3769
/branches/7.7.x/engine/src/test/resources/text/cdm_dos_win.txt:3816-3868,38=
76-3915,3920-3983
/branches/8.0.x/engine/src/test/resources/text/cdm_dos_win.txt:4002-4046
/trunk/engine/src/test/resources/text/cdm_dos_win.txt:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/resources/text/test-file.txt.csv
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/resources/text/test-file.txt.csv:3535-=
3555
/branches/7.6.x/engine/src/test/resources/text/test-file.txt.csv:3673-3711,=
3754-3769
/branches/7.7.x/engine/src/test/resources/text/test-file.txt.csv:3816-3868,=
3876-3915,3920-3983
/trunk/engine/src/test/resources/text/test-file.txt.csv:3507-3666
+ /branches/7.4.x/engine/src/test/resources/text/test-file.txt.csv:3535-=
3555
/branches/7.6.x/engine/src/test/resources/text/test-file.txt.csv:3673-3711,=
3754-3769
/branches/7.7.x/engine/src/test/resources/text/test-file.txt.csv:3816-3868,=
3876-3915,3920-3983
/branches/8.0.x/engine/src/test/resources/text/test-file.txt.csv:4002-4046
/trunk/engine/src/test/resources/text/test-file.txt.csv:3507-3666
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperat=
ionHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHan=
dler.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHan=
dler.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -63,7 +63,6 @@
import org.teiid.client.RequestMessage;
import org.teiid.client.ResultsMessage;
import org.teiid.client.plan.PlanNode;
-import org.teiid.client.security.SessionToken;
import org.teiid.client.util.ResultsFuture;
import org.teiid.core.TeiidComponentException;
import org.teiid.deployers.ExtendedPropertyMetadata;
@@ -75,6 +74,7 @@
import org.teiid.dqp.internal.process.SessionAwareCache;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
+import org.teiid.query.tempdata.TempTableDataManager;
=
abstract class TeiidOperationHandler extends BaseOperationHandler=
{
List transports =3D new ArrayList();
@@ -721,11 +721,16 @@
String user =3D "CLI ADMIN"; //$NON-NLS-1$
LogManager.logDetail(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.ge=
tString("admin_executing", user, command)); //$NON-NLS-1$
=
- SessionMetadata session =3D createTemporarySession(vdbName, version, use=
r);
+ VDBMetaData vdb =3D this.vdbRepo.getVDB(vdbName, version);
+ if (vdb =3D=3D null) {
+ throw new OperationFailedException(new ModelNode().set(Integratio=
nPlugin.Util.getString("wrong_vdb")));//$NON-NLS-1$
+ }
+ final SessionMetadata session =3D TempTableDataManager.createTempo=
rarySession(user, "admin-console", vdb); //$NON-NLS-1$
=
final long requestID =3D 0L;
=
DQPWorkContext context =3D new DQPWorkContext();
+ context.setUseCallingThread(true);
context.setSession(session);
=
try {
@@ -735,7 +740,7 @@
=
long start =3D System.currentTimeMillis();
RequestMessage request =3D new RequestMessage(command);
- request.setExecutionId(0L);
+ request.setExecutionId(requestID);
request.setRowLimit(engine.getMaxRowsFetchSize()); // this would limi=
t the number of rows that are returned.
Future message =3D engine.executeRequest(requestID, r=
equest);
ResultsMessage rm =3D null;
@@ -770,7 +775,19 @@
});
} catch (Throwable t) {
throw new OperationFailedException(new ModelNode().set(t.getMessage()));
- } =
+ } finally {
+ try {
+ context.runInContext(new Callable() {
+ @Override
+ public Void call() throws Exception {
+ engine.terminateSession(session.getSessionId());
+ return null;
+ }
+ });
+ } catch (Throwable e) {
+ throw new OperationFailedException(new ModelNode().set(e.getMessage())=
);
+ }
+ }
}
=
private void writeResults(ModelNode resultsNode, List columns, L=
ist> results) throws SQLException {
@@ -826,27 +843,6 @@
}
}
=
- private SessionMetadata createTemporarySession(final String vdbName, fina=
l int version, final String userName) throws OperationFailedException{
- =
- long creationTime =3D System.currentTimeMillis();
-
- // Return a new session info object
- SessionMetadata newSession =3D new SessionMetadata();
- newSession.setSessionToken(new SessionToken(userName));
- newSession.setSessionId(newSession.getSessionToken().getSessionID(=
));
- newSession.setUserName(userName);
- newSession.setCreatedTime(creationTime);
- newSession.setApplicationName("admin-console"); //$NON-NLS-1$
- newSession.setVDBName(vdbName);
- newSession.setVDBVersion(version);
- =
- VDBMetaData vdb =3D this.vdbRepo.getVDB(vdbName, version);
- if (vdb =3D=3D null) {
- throw new OperationFailedException(new ModelNode().set(Integratio=
nPlugin.Util.getString("wrong_vdb")));//$NON-NLS-1$
- }
- newSession.setVdb(vdb);
- return newSession;
- } =
}
=
class GetVDB extends BaseOperationHandler{
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java =
2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java =
2012-05-01 19:12:27 UTC (rev 4047)
@@ -21,6 +21,7 @@
*/
package org.teiid.jboss;
=
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.ServiceLoader;
import java.util.StringTokenizer;
@@ -39,14 +40,14 @@
import org.jboss.msc.service.AbstractServiceListener;
import org.jboss.msc.service.Service;
import org.jboss.msc.service.ServiceBuilder;
-import org.jboss.msc.service.ServiceBuilder.DependencyType;
import org.jboss.msc.service.ServiceController;
-import org.jboss.msc.service.ServiceController.Mode;
-import org.jboss.msc.service.ServiceController.State;
import org.jboss.msc.service.ServiceName;
import org.jboss.msc.service.StartContext;
import org.jboss.msc.service.StartException;
import org.jboss.msc.service.StopContext;
+import org.jboss.msc.service.ServiceBuilder.DependencyType;
+import org.jboss.msc.service.ServiceController.Mode;
+import org.jboss.msc.service.ServiceController.State;
import org.teiid.adminapi.Model;
import org.teiid.adminapi.Translator;
import org.teiid.adminapi.impl.ModelMetaData;
@@ -65,6 +66,7 @@
import org.teiid.query.ObjectReplicator;
import org.teiid.query.metadata.DDLMetadataRepository;
import org.teiid.query.metadata.NativeMetadataRepository;
+import org.teiid.query.metadata.TransformationMetadata.Resource;
=
=
class VDBDeployer implements DeploymentUnitProcessor {
@@ -113,6 +115,19 @@
}
}
=
+ // make sure the translator defined exists in configuration.
+ for (ModelMetaData model:deployment.getModelMetaDatas().values()) {
+ if (model.isSource() && !model.getSourceNames().isEmpty()) {
+ for (String source:model.getSourceNames()) {
+ String translatorName =3D model.getSourceTranslatorName(source);
+ Translator parent =3D this.translatorRepository.getTranslatorMetaData=
(translatorName);
+ if ( parent =3D=3D null) { =
+ throw new DeploymentUnitProcessingException(IntegrationPlugin.Util.g=
s(IntegrationPlugin.Event.TEIID50077, translatorName, deploymentName));
+ } =
+ }
+ }
+ } =
+ =
// check if this is a VDB with index files, if there are then build the =
TransformationMetadata
UDFMetaData udf =3D deploymentUnit.removeAttachment(TeiidAttachments.UDF=
_METADATA);
if (udf !=3D null) {
@@ -126,8 +141,10 @@
// set up the metadata repositories for each models
IndexMetadataRepository indexRepo =3D null;
IndexMetadataStore indexFactory =3D deploymentUnit.removeAttachment(Teii=
dAttachments.INDEX_METADATA);
+ LinkedHashMap visibilityMap =3D null;
if (indexFactory !=3D null) {
indexRepo =3D new IndexMetadataRepository(indexFactory);
+ visibilityMap =3D indexFactory.getEntriesPlusVisibilities();
}
=
for (ModelMetaData model:deployment.getModelMetaDatas().values()) {
@@ -139,7 +156,7 @@
}
=
// build a VDB service
- VDBService vdb =3D new VDBService(deployment);
+ VDBService vdb =3D new VDBService(deployment, visibilityMap);
final ServiceBuilder vdbService =3D context.getServiceTarge=
t().addService(TeiidServiceNames.vdbServiceName(deployment.getName(), deplo=
yment.getVersion()), vdb);
=
// add dependencies to data-sources
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBParserDe=
ployer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBParserDeployer=
.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBParserDeployer=
.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -27,7 +27,11 @@
=
import javax.xml.stream.XMLStreamException;
=
-import org.jboss.as.server.deployment.*;
+import org.jboss.as.server.deployment.Attachments;
+import org.jboss.as.server.deployment.DeploymentPhaseContext;
+import org.jboss.as.server.deployment.DeploymentUnit;
+import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
+import org.jboss.as.server.deployment.DeploymentUnitProcessor;
import org.jboss.msc.service.ServiceController;
import org.jboss.vfs.VirtualFile;
import org.teiid.adminapi.Model;
@@ -39,7 +43,6 @@
import org.teiid.logging.LogManager;
import org.teiid.metadata.VdbConstants;
import org.teiid.metadata.index.IndexMetadataStore;
-import org.teiid.runtime.RuntimePlugin;
=
=
/**
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2=
012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2=
012-05-01 19:12:27 UTC (rev 4047)
@@ -28,6 +28,7 @@
import java.util.Date;
import java.util.HashSet;
import java.util.IdentityHashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -71,6 +72,7 @@
import org.teiid.metadata.index.IndexMetadataRepository;
import org.teiid.query.ObjectReplicator;
import org.teiid.query.metadata.TransformationMetadata;
+import org.teiid.query.metadata.TransformationMetadata.Resource;
import org.teiid.query.tempdata.GlobalTableStore;
import org.teiid.query.tempdata.GlobalTableStoreImpl;
import org.teiid.translator.DelegatingExecutionFactory;
@@ -86,9 +88,11 @@
protected final InjectedValue bufferManagerInjector =3D ne=
w InjectedValue();
protected final InjectedValue objectReplicatorInjector =
=3D new InjectedValue();
private VDBLifeCycleListener vdbListener;
+ private LinkedHashMap visibilityMap;
=
- public VDBService(VDBMetaData metadata) {
+ public VDBService(VDBMetaData metadata, LinkedHashMap v=
isibilityMap) {
this.vdb =3D metadata;
+ this.visibilityMap =3D visibilityMap;
}
=
@Override
@@ -109,6 +113,7 @@
String type =3D data.getType();
VDBTranslatorMetaData parent =3D getTranslatorRepository().getTranslato=
rMetaData(type);
data.setModuleName(parent.getModuleName());
+ data.addAttchment(ClassLoader.class, parent.getAttachment(ClassLoader.c=
lass));
=
Set keys =3D parent.getProperties().stringPropertyNames();
for (String key:keys) {
@@ -135,12 +140,13 @@
if (!name.equals(VDBService.this.vdb.getName()) || version !=3D VDBSer=
vice.this.vdb.getVersion()) {
return;
}
+ VDBMetaData vdbInstance =3D vdb.getVDB();
// add object replication to temp/matview tables
- GlobalTableStore gts =3D new GlobalTableStoreImpl(getBuffermanager(), =
vdb.getVDB().getAttachment(TransformationMetadata.class));
+ GlobalTableStore gts =3D new GlobalTableStoreImpl(getBuffermanager(), =
vdbInstance.getAttachment(TransformationMetadata.class));
if (objectReplicatorInjector.getValue() !=3D null) {
try {
gts =3D objectReplicatorInjector.getValue().replicate(name + version=
, GlobalTableStore.class, gts, 300000);
- vdb.getVDB().addAttchment(GlobalTableStore.class, gts);
+ vdbInstance.addAttchment(GlobalTableStore.class, gts);
} catch (Exception e) {
LogManager.logError(LogConstants.CTX_RUNTIME, e, IntegrationPlugin.U=
til.gs(IntegrationPlugin.Event.TEIID50023, gts)); =
}
@@ -156,7 +162,7 @@
=
try {
// add transformation metadata to the repository.
- getVDBRepository().addVDB(this.vdb, store, udf, cmr);
+ getVDBRepository().addVDB(this.vdb, store, visibilityMap, udf, cmr);
} catch (VirtualDatabaseException e) {
throw new StartException(IntegrationPlugin.Event.TEIID50032.name(), e);
} =
@@ -170,8 +176,13 @@
throw new StartException(IntegrationPlugin.Util.gs(IntegrationPlugin.E=
vent.TEIID50086, model.getName(), vdb.getName(), vdb.getVersion()));
}
model.addAttchment(MetadataRepository.class, metadataRepository);
- loadMetadata(this.vdb, model, cmr, metadataRepository, store);
- LogManager.logTrace(LogConstants.CTX_RUNTIME, "Model ", model.getName()=
, "in VDB ", vdb.getName(), " was being loaded from its repository in separ=
ate thread"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ if (model.getModelType() =3D=3D Model.Type.PHYSICAL || model.getModelTy=
pe() =3D=3D Model.Type.VIRTUAL) {
+ loadMetadata(this.vdb, model, cmr, metadataRepository, store);
+ LogManager.logTrace(LogConstants.CTX_RUNTIME, "Model ", model.getName(=
), "in VDB ", vdb.getName(), " was being loaded from its repository in sepa=
rate thread"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+ else {
+ LogManager.logTrace(LogConstants.CTX_RUNTIME, "Model ", model.getName(=
), "in VDB ", vdb.getName(), " skipped being loaded because of its type ", =
model.getModelType()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ =
+ }
}
=
synchronized (this.vdb) {
Property changes on: trunk/jboss-integration/src/main/java/org/teiid/replic=
ation/jboss/AddressWrapper.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/j=
boss/AddressWrapper.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/AddressWrapper.java:3816-3868,3876-3915,3920-3983
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWr=
apper.java:3507-3666
+ /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/j=
boss/AddressWrapper.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/AddressWrapper.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/AddressWrapper.java:4002-4046
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWr=
apper.java:3507-3666
Property changes on: trunk/jboss-integration/src/main/java/org/teiid/replic=
ation/jboss/JGroupsInputStream.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/j=
boss/JGroupsInputStream.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/=
JGroupsInputStream.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/JGroupsInputStream.java:3816-3868,3876-3915,3920-3983
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsIn=
putStream.java:3507-3666
+ /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/j=
boss/JGroupsInputStream.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/=
JGroupsInputStream.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/JGroupsInputStream.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/JGroupsInputStream.java:4002-4046
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsIn=
putStream.java:3507-3666
Property changes on: trunk/jboss-integration/src/main/java/org/teiid/replic=
ation/jboss/JGroupsObjectReplicator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/j=
boss/JGroupsObjectReplicator.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/=
JGroupsObjectReplicator.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/JGroupsObjectReplicator.java:3816-3868,3876-3915,3920-3983
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOb=
jectReplicator.java:3507-3666
+ /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/j=
boss/JGroupsObjectReplicator.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/=
JGroupsObjectReplicator.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/JGroupsObjectReplicator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/JGroupsObjectReplicator.java:4002-4046
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOb=
jectReplicator.java:3507-3666
Property changes on: trunk/jboss-integration/src/main/java/org/teiid/replic=
ation/jboss/JGroupsOutputStream.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/j=
boss/JGroupsOutputStream.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/=
JGroupsOutputStream.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/JGroupsOutputStream.java:3816-3868,3876-3915,3920-3983
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOu=
tputStream.java:3507-3666
+ /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/j=
boss/JGroupsOutputStream.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/=
JGroupsOutputStream.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/JGroupsOutputStream.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/JGroupsOutputStream.java:4002-4046
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOu=
tputStream.java:3507-3666
Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetada=
taStore.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStor=
e.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStor=
e.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -28,7 +28,15 @@
import java.io.InputStreamReader;
import java.net.URISyntaxException;
import java.nio.charset.Charset;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
import java.util.concurrent.Semaphore;
=
import org.jboss.vfs.VirtualFile;
@@ -375,19 +383,6 @@
=
List records =3D recs;
=
- //load non-materialized first, so that the uuid->table cache is populated
- Collections.sort(records, new Comparator() {
- @Override
- public int compare(Table o1, Table o2) {
- if (!o1.isMaterialized()) {
- return -1;
- }
- if (!o2.isMaterialized()) {
- return 1;
- }
- return 0;
- }
- });
for (Table tableRecord : records) {
List columns =3D new ArrayList(getByParent(tableReco=
rd.getUUID(), MetadataConstants.RECORD_TYPE.COLUMN, Column.class, false));
for (Column columnRecordImpl : columns) {
Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFacto=
ry.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.jav=
a 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.jav=
a 2012-05-01 19:12:27 UTC (rev 4047)
@@ -806,6 +806,8 @@
case MetadataConstants.PARAMETER_TYPES.RETURN_VALUE:
type =3D ProcedureParameter.Type.ReturnValue;
break;
+ default:
+ throw new IllegalArgumentException("Invalid parameter type, please e=
nsure all parameter types are valid in Designer."); //$NON-NLS-1$
}
paramRd.setType(type);
=
Property changes on: trunk/metadata/src/test/java/org/teiid/cdk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/cdk:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk:3673-3711*,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/cdk:3816-3868*,3876-3915*,=
3920-3983*
/trunk/metadata/src/test/java/org/teiid/cdk:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/cdk:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk:3673-3711*,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/cdk:3816-3868*,3876-3915*,=
3920-3983*
/branches/8.0.x/metadata/src/test/java/org/teiid/cdk:4002-4046*
/trunk/metadata/src/test/java/org/teiid/cdk:3507-3666
Property changes on: trunk/metadata/src/test/java/org/teiid/cdk/api
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/api:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk/api:3673-3711,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/cdk/api:3816-3868,3876-391=
5,3920-3983
/trunk/metadata/src/test/java/org/teiid/cdk/api:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/api:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk/api:3673-3711,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/cdk/api:3816-3868,3876-391=
5,3920-3983
/branches/8.0.x/metadata/src/test/java/org/teiid/cdk/api:4002-4046
/trunk/metadata/src/test/java/org/teiid/cdk/api:3507-3666
Property changes on: trunk/metadata/src/test/java/org/teiid/cdk/unittest
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/unittest:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk/unittest:3673-3711,375=
4-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/cdk/unittest:3816-3868,387=
6-3915,3920-3983
/trunk/metadata/src/test/java/org/teiid/cdk/unittest:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/unittest:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk/unittest:3673-3711,375=
4-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/cdk/unittest:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/metadata/src/test/java/org/teiid/cdk/unittest:4002-4046
/trunk/metadata/src/test/java/org/teiid/cdk/unittest:3507-3666
Property changes on: trunk/metadata/src/test/java/org/teiid/core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/core:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/core:3673-3711*,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/core:3816-3868*,3876-3915*=
,3920-3983*
/trunk/metadata/src/test/java/org/teiid/core:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/core:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/core:3673-3711*,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/core:3816-3868*,3876-3915*=
,3920-3983*
/branches/8.0.x/metadata/src/test/java/org/teiid/core:4002-4046*
/trunk/metadata/src/test/java/org/teiid/core:3507-3666
Property changes on: trunk/metadata/src/test/java/org/teiid/core/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/core/util:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/core/util:3673-3711,3754-3=
769
/branches/7.7.x/metadata/src/test/java/org/teiid/core/util:3816-3868,3876-3=
915,3920-3983
/trunk/metadata/src/test/java/org/teiid/core/util:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/core/util:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/core/util:3673-3711,3754-3=
769
/branches/7.7.x/metadata/src/test/java/org/teiid/core/util:3816-3868,3876-3=
915,3920-3983
/branches/8.0.x/metadata/src/test/java/org/teiid/core/util:4002-4046
/trunk/metadata/src/test/java/org/teiid/core/util:3507-3666
Property changes on: trunk/metadata/src/test/java/org/teiid/internal
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/internal:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/internal:3673-3711*,3754-3=
769
/branches/7.7.x/metadata/src/test/java/org/teiid/internal:3816-3868*,3876-3=
915*,3920-3983*
/trunk/metadata/src/test/java/org/teiid/internal:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/internal:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/internal:3673-3711*,3754-3=
769
/branches/7.7.x/metadata/src/test/java/org/teiid/internal:3816-3868*,3876-3=
915*,3920-3983*
/branches/8.0.x/metadata/src/test/java/org/teiid/internal:4002-4046*
/trunk/metadata/src/test/java/org/teiid/internal:3507-3666
Property changes on: trunk/metadata/src/test/java/org/teiid/internal/core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core:3535-35=
55*
/branches/7.6.x/metadata/src/test/java/org/teiid/internal/core:3673-3711*,3=
754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/internal/core:3816-3868*,3=
876-3915*,3920-3983*
/trunk/metadata/src/test/java/org/teiid/internal/core:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core:3535-35=
55*
/branches/7.6.x/metadata/src/test/java/org/teiid/internal/core:3673-3711*,3=
754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/internal/core:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/metadata/src/test/java/org/teiid/internal/core:4002-4046*
/trunk/metadata/src/test/java/org/teiid/internal/core:3507-3666
Property changes on: trunk/metadata/src/test/java/org/teiid/internal/core/i=
ndex
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core/index:3=
535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/internal/core/index:3673-3=
711,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/internal/core/index:3816-3=
868,3876-3915,3920-3983
/trunk/metadata/src/test/java/org/teiid/internal/core/index:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core/index:3=
535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/internal/core/index:3673-3=
711,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/internal/core/index:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/metadata/src/test/java/org/teiid/internal/core/index:4002-4=
046
/trunk/metadata/src/test/java/org/teiid/internal/core/index:3507-3666
Modified: trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java 2012-=
05-01 15:19:22 UTC (rev 4046)
+++ trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java 2012-=
05-01 19:12:27 UTC (rev 4047)
@@ -36,18 +36,7 @@
import org.teiid.core.CoreConstants;
import org.teiid.dqp.internal.datamgr.ConnectorManager;
import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
-import org.teiid.metadata.AbstractMetadataRecord;
-import org.teiid.metadata.Column;
-import org.teiid.metadata.ColumnStats;
-import org.teiid.metadata.DefaultMetadataRepository;
-import org.teiid.metadata.FunctionMethod;
-import org.teiid.metadata.MetadataRepository;
-import org.teiid.metadata.MetadataStore;
-import org.teiid.metadata.Procedure;
-import org.teiid.metadata.Schema;
-import org.teiid.metadata.Table;
-import org.teiid.metadata.TableStats;
-import org.teiid.metadata.index.IndexMetadataStore;
+import org.teiid.metadata.*;
import org.teiid.query.function.FunctionTree;
import org.teiid.query.function.UDFSource;
import org.teiid.query.metadata.CompositeMetadataStore;
@@ -68,20 +57,20 @@
private ConnectorManagerRepository cmr;
private FunctionTree systemFunctions;
private boolean metadataloadFinished =3D false;
+ private boolean modified;
=
// used as cached item to avoid rebuilding
- private VDBMetaData mergedVDB;
+ private volatile VDBMetaData mergedVDB;
=
- public CompositeVDB(VDBMetaData vdb, MetadataStore metadataStore, UDFMeta=
Data udf, FunctionTree systemFunctions, ConnectorManagerRepository cmr, Met=
adataStore... additionalStores) {
+ public CompositeVDB(VDBMetaData vdb, MetadataStore metadataStore, LinkedH=
ashMap visibilityMap, UDFMetaData udf, FunctionTree syste=
mFunctions, ConnectorManagerRepository cmr, MetadataStore... additionalStor=
es) {
this.vdb =3D vdb;
this.store =3D metadataStore;
- if (metadataStore instanceof IndexMetadataStore) {
- this.visibilityMap =3D ((IndexMetadataStore)metadataStore).getEntriesPl=
usVisibilities();
- }
+ this.visibilityMap =3D visibilityMap;
this.udf =3D udf;
this.systemFunctions =3D systemFunctions;
this.cmr =3D cmr;
- this.additionalStores =3D additionalStores; =
+ this.additionalStores =3D additionalStores;
+ this.mergedVDB =3D buildVDB();
}
=
synchronized void addChild(CompositeVDB child) {
@@ -90,35 +79,42 @@
}
VDBMetaData childVDB =3D child.getVDB();
this.children.put(new VDBKey(childVDB.getName(), childVDB.getVersion()),=
child);
- this.mergedVDB =3D null;
+ modified =3D true;
+ update();
}
=
synchronized void removeChild(VDBKey child) {
if (this.children !=3D null) {
this.children.remove(child);
}
- this.mergedVDB =3D null;
+ modified =3D true;
+ update();
} =
=
private synchronized void update() {
- if (this.mergedVDB =3D=3D null && this.metadataloadFinished) {
- =
- this.mergedVDB =3D buildVDB();
- =
- MetadataStore mergedStore =3D getMetadataStore();
- =
- for (ModelMetaData model:this.mergedVDB.getModelMetaDatas().values()) {
- MetadataRepository repo =3D model.getAttachment(MetadataRepository.cla=
ss);
- if (repo instanceof DefaultMetadataRepository) {
- updateFromMetadataRepository(this.mergedVDB, mergedStore.getSchema(mo=
del.getName()), (DefaultMetadataRepository)repo);
- }
+ if (!this.metadataloadFinished) {
+ return;
+ }
+ VDBMetaData newVDB =3D mergedVDB;
+ if (modified) {
+ newVDB =3D buildVDB();
+ }
+ =
+ MetadataStore mergedStore =3D getMetadataStore();
+ =
+ for (ModelMetaData model:newVDB.getModelMetaDatas().values()) {
+ MetadataRepository repo =3D model.getAttachment(MetadataRepository.clas=
s);
+ if (repo instanceof DefaultMetadataRepository) {
+ updateFromMetadataRepository(newVDB, mergedStore.getSchema(model.getNa=
me()), (DefaultMetadataRepository)repo);
}
- =
- TransformationMetadata metadata =3D buildTransformationMetaData(this.me=
rgedVDB, getVisibilityMap(), mergedStore, getUDF(), systemFunctions, this.a=
dditionalStores);
- this.mergedVDB.addAttchment(QueryMetadataInterface.class, metadata);
- this.mergedVDB.addAttchment(TransformationMetadata.class, metadata);
- this.mergedVDB.addAttchment(MetadataStore.class, mergedStore);
}
+ =
+ TransformationMetadata metadata =3D buildTransformationMetaData(newVDB, =
getVisibilityMap(), mergedStore, getUDF(), systemFunctions, this.additional=
Stores);
+ newVDB.addAttchment(QueryMetadataInterface.class, metadata);
+ newVDB.addAttchment(TransformationMetadata.class, metadata);
+ newVDB.addAttchment(MetadataStore.class, mergedStore);
+ this.mergedVDB =3D newVDB;
+ this.modified =3D false;
}
=
private static TransformationMetadata buildTransformationMetaData(VDBMeta=
Data vdb, LinkedHashMap visibilityMap, MetadataStore stor=
e, UDFMetaData udf, FunctionTree systemFunctions, MetadataStore[] additiona=
lStores) {
@@ -144,10 +140,7 @@
return metadata;
}
=
- public synchronized VDBMetaData getVDB() {
- if (this.mergedVDB =3D=3D null && this.metadataloadFinished) { =
- update();
- }
+ public VDBMetaData getVDB() {
return this.mergedVDB;
}
=
@@ -340,11 +333,11 @@
metadataRepository.endLoadVdb(vdbName, vdbVersion);
} =
=
- public void setMetaloadFinished(boolean flag) {
- this.metadataloadFinished =3D flag;
+ public synchronized void metadataLoadFinished() {
+ if (!this.metadataloadFinished) {
+ this.metadataloadFinished =3D true;
+ update();
+ }
}
=
- public boolean isMetadataloadFinished() {
- return this.metadataloadFinished;
- }
}
Modified: trunk/runtime/src/main/java/org/teiid/deployers/EventDistributorI=
mpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/src/main/java/org/teiid/deployers/EventDistributorImpl.ja=
va 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/runtime/src/main/java/org/teiid/deployers/EventDistributorImpl.ja=
va 2012-05-01 19:12:27 UTC (rev 4047)
@@ -76,7 +76,7 @@
}
long ts =3D System.currentTimeMillis();
for (String name:objectNames) {
- Table table =3D s.getTables().get(name.toUpperCase());
+ Table table =3D s.getTables().get(name);
if (table =3D=3D null) {
continue;
}
@@ -122,7 +122,7 @@
if (s =3D=3D null) {
return null;
}
- return s.getTables().get(tableName.toUpperCase());
+ return s.getTables().get(tableName);
}
=
private Schema getSchema(String vdbName, int vdbVersion, String schemaNam=
e) {
@@ -134,7 +134,7 @@
if (tm =3D=3D null) {
return null;
}
- return tm.getMetadataStore().getSchemas().get(schemaName.toUpperCase());
+ return tm.getMetadataStore().getSchemas().get(schemaName);
}
=
@Override
@@ -154,7 +154,7 @@
if (s =3D=3D null) {
return;
}
- Procedure p =3D s.getProcedures().get(procName.toUpperCase());
+ Procedure p =3D s.getProcedures().get(procName);
if (p =3D=3D null) {
return;
}
Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2012=
-05-01 15:19:22 UTC (rev 4046)
+++ trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2012=
-05-01 19:12:27 UTC (rev 4047)
@@ -25,6 +25,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.NavigableMap;
@@ -47,6 +48,7 @@
import org.teiid.metadata.MetadataStore;
import org.teiid.query.function.SystemFunctionManager;
import org.teiid.query.metadata.MetadataValidator;
+import org.teiid.query.metadata.TransformationMetadata.Resource;
import org.teiid.query.validator.ValidatorReport;
import org.teiid.runtime.RuntimePlugin;
import org.teiid.translator.TranslatorException;
@@ -68,7 +70,7 @@
private Map datatypeMap =3D new HashMap();
=
=
- public void addVDB(VDBMetaData vdb, MetadataStore metadataStore, UDFMetaD=
ata udf, ConnectorManagerRepository cmr) throws VirtualDatabaseException {
+ public void addVDB(VDBMetaData vdb, MetadataStore metadataStore, LinkedHa=
shMap visibilityMap, UDFMetaData udf, ConnectorManagerRep=
ository cmr) throws VirtualDatabaseException {
if (getVDB(vdb.getName(), vdb.getVersion()) !=3D null) {
throw new VirtualDatabaseException(RuntimePlugin.Event.TEIID40035, Run=
timePlugin.Util.gs(RuntimePlugin.Event.TEIID40035, vdb.getName(), vdb.getVe=
rsion()));
}
@@ -81,14 +83,14 @@
if (this.odbcEnabled && odbcStore =3D=3D null) {
this.odbcStore =3D getODBCMetadataStore();
}
- =
- CompositeVDB cvdb =3D null;
+
+ MetadataStore[] stores =3D null;
if (this.odbcStore =3D=3D null) {
- cvdb =3D new CompositeVDB(vdb, metadataStore, udf, this.systemFunctionM=
anager.getSystemFunctions(), cmr, this.systemStore);
+ stores =3D new MetadataStore[] {this.systemStore};
+ } else {
+ stores =3D new MetadataStore[] {this.systemStore, odbcStore};
}
- else {
- cvdb =3D new CompositeVDB(vdb, metadataStore, udf, this.systemFunctionM=
anager.getSystemFunctions(), cmr, this.systemStore, odbcStore);
- }
+ CompositeVDB cvdb =3D new CompositeVDB(vdb, metadataStore, visibilityMap=
, udf, this.systemFunctionManager.getSystemFunctions(), cmr, stores);
this.vdbRepo.put(vdbId(vdb), cvdb); =
notifyAdd(vdb.getName(), vdb.getVersion(), cvdb);
}
@@ -109,50 +111,34 @@
return vdbs;
}
=
- /**
- * This returns the all the VDBS that loaded and still loading or stalled=
due to data source unavailability.
- * @return
- */
- public List getAllDeployedVDBs(){
- ArrayList vdbs =3D new ArrayList();
- for(CompositeVDB cVDB:this.vdbRepo.values()) {
- if (!cVDB.isMetadataloadFinished()) {
- vdbs.add(cVDB.buildVDB());
- }
- else {
- vdbs.add(cVDB.getVDB());
- }
- }
- return vdbs;
- } =
-
protected VDBKey vdbId(VDBMetaData vdb) {
return new VDBKey(vdb.getName(), vdb.getVersion());
} =
=
public VDBMetaData getVDB(String vdbName) {
int latestVersion =3D 0;
- for (VDBKey key:this.vdbRepo.tailMap(new VDBKey(vdbName, 0)).keySe=
t()) {
- if(!key.getName().equalsIgnoreCase(vdbName)) {
+ VDBMetaData result =3D null;
+ for (Map.Entry entry:this.vdbRepo.tailMap(ne=
w VDBKey(vdbName, 0)).entrySet()) {
+ if(!entry.getKey().getName().equalsIgnoreCase(vdbName)) {
break;
}
- VDBMetaData vdb =3D this.vdbRepo.get(key).getVDB();
+ VDBMetaData vdb =3D entry.getValue().getVDB();
switch (vdb.getConnectionType()) {
case ANY:
- latestVersion =3D Math.max(vdb.getVersion(), latestVersion);
+ if (vdb.getVersion() > latestVersion) {
+ latestVersion =3D vdb.getVersion();
+ result =3D vdb;
+ }
break;
case BY_VERSION:
if (latestVersion =3D=3D 0) {
latestVersion =3D vdb.getVersion();
+ result =3D vdb;
} =
break;
}
}
- if(latestVersion =3D=3D 0) {
- return null; =
- }
-
- return getVDB(vdbName, latestVersion);
+ return result;
}
=
public MetadataStore getSystemStore() {
@@ -228,12 +214,14 @@
if (removed !=3D null) {
// if this VDB was part of another VDB; then remove them.
for (CompositeVDB other:this.vdbRepo.values()) {
- if (other.hasChildVdb(key)) {
- notifyRemove(other.getVDB().getName(), other.getVDB().getVersion(), o=
ther);
- =
- other.removeChild(key);
- =
- notifyAdd(other.getVDB().getName(), other.getVDB().getVersion(), othe=
r);
+ synchronized (other) {
+ if (other.hasChildVdb(key)) {
+ notifyRemove(other.getVDB().getName(), other.getVDB().getVersion(), =
other);
+ =
+ other.removeChild(key);
+ =
+ notifyAdd(other.getVDB().getName(), other.getVDB().getVersion(), oth=
er);
+ }
}
}
notifyRemove(key.getName(), key.getVersion(), removed);
@@ -276,7 +264,7 @@
CompositeVDB v =3D this.vdbRepo.get(new VDBKey(name, version));
if (v!=3D null) {
boolean valid =3D false;
- v.setMetaloadFinished(true);
+ v.metadataLoadFinished();
VDBMetaData metdataAwareVDB =3D v.getVDB(); =
ValidatorReport report =3D MetadataValidator.validate(metdataAwareVDB, =
metdataAwareVDB.removeAttachment(MetadataStore.class));
=
Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2=
012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2=
012-05-01 19:12:27 UTC (rev 4047)
@@ -119,10 +119,7 @@
}
=
public void resourceAdded(String resourceName, boolean translator) {
- for (VDBMetaData vdb:getVDBRepository().getAllDeployedVDBs()) {
- if (vdb =3D=3D null) {
- continue;
- }
+ for (VDBMetaData vdb:getVDBRepository().getVDBs()) {
if (vdb.getStatus() =3D=3D VDB.Status.ACTIVE || vdb.isPreview()) {
continue;
}
@@ -178,10 +175,7 @@
}
=
public void resourceRemoved(String resourceName, boolean translator) {
- for (VDBMetaData vdb:getVDBRepository().getAllDeployedVDBs()) {
- if (vdb =3D=3D null) {
- continue;
- } =
+ for (VDBMetaData vdb:getVDBRepository().getVDBs()) {
if (vdb.isPreview()) {
continue;
}
Property changes on: trunk/runtime/src/main/java/org/teiid/transport/SSLCon=
figuration.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/runtime/src/main/java/org/teiid/transport/SSLConfigura=
tion.java:3535-3555
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.=
java:3673-3711,3754-3769
/branches/7.7.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.=
java:3816-3868,3876-3915,3920-3983
/trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3598=
-3666
+ /branches/7.4.x/runtime/src/main/java/org/teiid/transport/SSLConfigura=
tion.java:3535-3555
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.=
java:3673-3711,3754-3769
/branches/7.7.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.=
java:4002-4046
/trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3598=
-3666
Property changes on: trunk/runtime/src/main/java/org/teiid/transport/pg
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg:3535-3555*
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/pg:3673-3711*,375=
4-3769
/branches/7.7.x/runtime/src/main/java/org/teiid/transport/pg:3816-3868*,387=
6-3915*,3920-3983*
/trunk/runtime/src/main/java/org/teiid/transport/pg:3507-3666
+ /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg:3535-3555*
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/pg:3673-3711*,375=
4-3769
/branches/7.7.x/runtime/src/main/java/org/teiid/transport/pg:3816-3868*,387=
6-3915*,3920-3983*
/branches/8.0.x/runtime/src/main/java/org/teiid/transport/pg:4002-4046*
/trunk/runtime/src/main/java/org/teiid/transport/pg:3507-3666
Property changes on: trunk/runtime/src/main/java/org/teiid/transport/pg/PGb=
ytea.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.j=
ava:3535-3555
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3=
673-3711,3754-3769
/branches/7.7.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3=
816-3868,3876-3915,3920-3983
/trunk/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3507-3666
+ /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.j=
ava:3535-3555
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3=
673-3711,3754-3769
/branches/7.7.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:4=
002-4046
/trunk/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3507-3666
Property changes on: trunk/runtime/src/main/resources/org/teiid/transport
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/runtime/src/main/resources/org/teiid/transport:3535-35=
55*
/branches/7.6.x/runtime/src/main/resources/org/teiid/transport:3673-3711*,3=
754-3769
/branches/7.7.x/runtime/src/main/resources/org/teiid/transport:3816-3868*,3=
876-3915*,3920-3983*
/trunk/runtime/src/main/resources/org/teiid/transport:3507-3666
+ /branches/7.4.x/runtime/src/main/resources/org/teiid/transport:3535-35=
55*
/branches/7.6.x/runtime/src/main/resources/org/teiid/transport:3673-3711*,3=
754-3769
/branches/7.7.x/runtime/src/main/resources/org/teiid/transport:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/runtime/src/main/resources/org/teiid/transport:4002-4046*
/trunk/runtime/src/main/resources/org/teiid/transport:3507-3666
Modified: trunk/runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.java 2=
012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.java 2=
012-05-01 19:12:27 UTC (rev 4047)
@@ -65,8 +65,8 @@
cmr.addConnectorManager("source", getConnectorManager("FakeTranslator=
", "FakeConnection", getFuncsOne()));
cmr.addConnectorManager("source2", getConnectorManager("FakeTranslato=
r2", "FakeConnection2", getFuncsTwo()));
=
- CompositeVDB cvdb =3D new CompositeVDB(vdbMetaData, metadataStore, nu=
ll, RealMetadataFactory.SFM.getSystemFunctions(),cmr);
- cvdb.setMetaloadFinished(true);
+ CompositeVDB cvdb =3D new CompositeVDB(vdbMetaData, metadataStore, nu=
ll, null, RealMetadataFactory.SFM.getSystemFunctions(),cmr);
+ cvdb.metadataLoadFinished();
return cvdb;
}
=
Property changes on: trunk/runtime/src/test/java/org/teiid/dqp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/runtime/src/test/java/org/teiid/dqp:3535-3555*
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp:3673-3711*,3754-3769
/branches/7.7.x/runtime/src/test/java/org/teiid/dqp:3816-3868*,3876-3915*,3=
920-3983*
/trunk/runtime/src/test/java/org/teiid/dqp:3507-3666
+ /branches/7.4.x/runtime/src/test/java/org/teiid/dqp:3535-3555*
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp:3673-3711*,3754-3769
/branches/7.7.x/runtime/src/test/java/org/teiid/dqp:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/runtime/src/test/java/org/teiid/dqp:4002-4046*
/trunk/runtime/src/test/java/org/teiid/dqp:3507-3666
Property changes on: trunk/runtime/src/test/java/org/teiid/dqp/service
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service:3535-3555*
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp/service:3673-3711*,3754=
-3769
/branches/7.7.x/runtime/src/test/java/org/teiid/dqp/service:3816-3868*,3876=
-3915*,3920-3983*
/trunk/runtime/src/test/java/org/teiid/dqp/service:3507-3666
+ /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service:3535-3555*
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp/service:3673-3711*,3754=
-3769
/branches/7.7.x/runtime/src/test/java/org/teiid/dqp/service:3816-3868*,3876=
-3915*,3920-3983*
/branches/8.0.x/runtime/src/test/java/org/teiid/dqp/service:4002-4046*
/trunk/runtime/src/test/java/org/teiid/dqp/service:3507-3666
Property changes on: trunk/runtime/src/test/java/org/teiid/dqp/service/buff=
er
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service/buffer:353=
5-3555
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3673-371=
1,3754-3769
/branches/7.7.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3816-386=
8,3876-3915,3920-3983
/trunk/runtime/src/test/java/org/teiid/dqp/service/buffer:3507-3666
+ /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service/buffer:353=
5-3555
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3673-371=
1,3754-3769
/branches/7.7.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/runtime/src/test/java/org/teiid/dqp/service/buffer:4002-4046
/trunk/runtime/src/test/java/org/teiid/dqp/service/buffer:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/=
cdk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk:35=
35-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/cdk:3673-37=
11*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/cdk:3816-38=
68*,3876-3915*,3920-3983*
/trunk/test-integration/common/src/test/java/org/teiid/cdk:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk:35=
35-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/cdk:3673-37=
11*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/cdk:3816-38=
68*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/cdk:4002-40=
46*
/trunk/test-integration/common/src/test/java/org/teiid/cdk:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/=
cdk/api
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk/ap=
i:3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/cdk/api:367=
3-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/cdk/api:381=
6-3868,3876-3915,3920-3983
/trunk/test-integration/common/src/test/java/org/teiid/cdk/api:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk/ap=
i:3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/cdk/api:367=
3-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/cdk/api:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/cdk/api:400=
2-4046
/trunk/test-integration/common/src/test/java/org/teiid/cdk/api:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/=
dqp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp:35=
35-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp:3673-37=
11*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp:3816-38=
68*,3876-3915*,3920-3983*
/trunk/test-integration/common/src/test/java/org/teiid/dqp:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp:35=
35-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp:3673-37=
11*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp:3816-38=
68*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/dqp:4002-40=
46*
/trunk/test-integration/common/src/test/java/org/teiid/dqp:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/=
dqp/internal
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/in=
ternal:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l:3816-3868*,3876-3915*,3920-3983*
/trunk/test-integration/common/src/test/java/org/teiid/dqp/internal:3507-36=
66
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/in=
ternal:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l:4002-4046*
/trunk/test-integration/common/src/test/java/org/teiid/dqp/internal:3507-36=
66
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/=
dqp/internal/process
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/in=
ternal/process:3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l/process:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l/process:3816-3868,3876-3915,3920-3983
/trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process=
:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/in=
ternal/process:3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l/process:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l/process:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l/process:4002-4046
/trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process=
:3507-3666
Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeSe=
rver.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.j=
ava 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.j=
ava 2012-05-01 19:12:27 UTC (rev 4047)
@@ -47,8 +47,8 @@
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.cache.Cache;
import org.teiid.cache.CacheConfiguration;
+import org.teiid.cache.DefaultCacheFactory;
import org.teiid.cache.CacheConfiguration.Policy;
-import org.teiid.cache.DefaultCacheFactory;
import org.teiid.client.DQP;
import org.teiid.client.security.ILogon;
import org.teiid.common.buffer.TupleBufferCache;
@@ -412,7 +412,7 @@
udfMetaData.addFunctions(entry.getKey(), entry.getValue());
}
}
- this.repo.addVDB(vdbMetaData, metadata, udfMetaData, cmr);
+ this.repo.addVDB(vdbMetaData, metadata, (metadata instanceof IndexMetad=
ataStore)?((IndexMetadataStore)metadata).getEntriesPlusVisibilities():null,=
udfMetaData, cmr);
this.repo.finishDeployment(vdbMetaData.getName(), vdbMetaData.getVersio=
n());
this.repo.getVDB(vdbMetaData.getName(), vdbMetaData.getVersion()).setSt=
atus(VDB.Status.ACTIVE);
} catch (VirtualDatabaseException e) {
Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestMM=
DatabaseMetaData.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDataba=
seMetaData.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDataba=
seMetaData.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -825,7 +825,7 @@
expected.put("supportsGetGeneratedKeys", Boolean.FALSE); //$NON-NL=
S-1$
expected.put("supportsGroupBy", Boolean.TRUE); //$NON-NLS-1$
expected.put("supportsGroupByBeyondSelect", Boolean.TRUE); //$NON-=
NLS-1$
- expected.put("supportsGroupByUnrelated", Boolean.FALSE); //$NON-NL=
S-1$
+ expected.put("supportsGroupByUnrelated", Boolean.TRUE); //$NON-NLS=
-1$
expected.put("supportsIntegrityEnhancementFacility", Boolean.FALSE=
); //$NON-NLS-1$
expected.put("supportsLikeEscapeClause", Boolean.TRUE); //$NON-NLS=
-1$
expected.put("supportsLimitedOuterJoins", Boolean.TRUE); //$NON-NL=
S-1$
@@ -836,7 +836,7 @@
expected.put("supportsMultipleResultSets", Boolean.FALSE); //$NON-=
NLS-1$
expected.put("supportsMultipleOpenResults", Boolean.FALSE); //$NON=
-NLS-1$
expected.put("supportsMultipleTransactions", Boolean.TRUE); //$NON=
-NLS-1$
- expected.put("supportsNamedParameters", Boolean.FALSE); //$NON-NLS=
-1$
+ expected.put("supportsNamedParameters", Boolean.TRUE); //$NON-NLS-=
1$
expected.put("supportsNonNullableColumns", Boolean.TRUE); //$NON-N=
LS-1$
expected.put("supportsOpenCursorsAcrossRollback", Boolean.FALSE); =
//$NON-NLS-1$
expected.put("supportsOpenStatementsAcrossCommit", Boolean.TRUE); =
//$NON-NLS-1$
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/=
transport
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transp=
ort:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport:3=
673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport:3=
816-3868*,3876-3915*,3920-3983*
/trunk/test-integration/common/src/test/java/org/teiid/transport:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transp=
ort:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport:3=
673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport:3=
816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/transport:4=
002-4046*
/trunk/test-integration/common/src/test/java/org/teiid/transport:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/=
transport/TestJDBCSocketTransport.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transp=
ort/TestJDBCSocketTransport.java:3455-3509,3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport/T=
estJDBCSocketTransport.java:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/T=
estJDBCSocketTransport.java:3816-3868,3920-3983
/trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSo=
cketTransport.java:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transp=
ort/TestJDBCSocketTransport.java:3455-3509,3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport/T=
estJDBCSocketTransport.java:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/T=
estJDBCSocketTransport.java:3816-3868,3920-3983
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/transport/T=
estJDBCSocketTransport.java:4002-4046
/trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSo=
cketTransport.java:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/=
transport/TestODBCSocketTransport.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transp=
ort/TestODBCSocketTransport.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport/T=
estODBCSocketTransport.java:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/T=
estODBCSocketTransport.java:3816-3868,3876-3915,3920-3983
/trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSo=
cketTransport.java:3188-3450,3452-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transp=
ort/TestODBCSocketTransport.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport/T=
estODBCSocketTransport.java:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/T=
estODBCSocketTransport.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/transport/T=
estODBCSocketTransport.java:4002-4046
/trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSo=
cketTransport.java:3188-3450,3452-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestJ=
DBCSocketTransport
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSoc=
ketTransport:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport:3816-3868*,3876-3915*,3920-3983*
/trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport:3=
507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSoc=
ketTransport:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport:4002-4046*
/trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport:3=
507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestJ=
DBCSocketTransport/testSelect.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSoc=
ketTransport/testSelect.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport/testSelect.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport/testSelect.expected:3816-3868,3876-3915,3920-3983
/trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/t=
estSelect.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSoc=
ketTransport/testSelect.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport/testSelect.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport/testSelect.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport/testSelect.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/t=
estSelect.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestO=
DBCSocketTransport
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSoc=
ketTransport:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport:3816-3868*,3876-3915*,3920-3983*
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport:3=
507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSoc=
ketTransport:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport:4002-4046*
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport:3=
507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestO=
DBCSocketTransport/testColumnMetadataWithAlias.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSoc=
ketTransport/testColumnMetadataWithAlias.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testColumnMetadataWithAlias.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testColumnMetadataWithAlias.expected:3816-3868,3876-3915,3920-3983
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/t=
estColumnMetadataWithAlias.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSoc=
ketTransport/testColumnMetadataWithAlias.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testColumnMetadataWithAlias.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testColumnMetadataWithAlias.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testColumnMetadataWithAlias.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/t=
estColumnMetadataWithAlias.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestO=
DBCSocketTransport/testPk.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSoc=
ketTransport/testPk.expected:3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPk.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPk.expected:3816-3868,3876-3915,3920-3983
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/t=
estPk.expected:3188-3450,3452-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSoc=
ketTransport/testPk.expected:3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPk.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPk.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPk.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/t=
estPk.expected:3188-3450,3452-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestO=
DBCSocketTransport/testPkPrepared.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSoc=
ketTransport/testPkPrepared.expected:3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPkPrepared.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPkPrepared.expected:3816-3868,3876-3915,3920-3983
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/t=
estPkPrepared.expected:3188-3450,3452-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSoc=
ketTransport/testPkPrepared.expected:3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPkPrepared.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPkPrepared.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPkPrepared.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/t=
estPkPrepared.expected:3188-3450,3452-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestO=
DBCSocketTransport/testSelect.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSoc=
ketTransport/testSelect.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testSelect.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testSelect.expected:3816-3868,3876-3915,3920-3983
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/t=
estSelect.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSoc=
ketTransport/testSelect.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testSelect.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testSelect.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testSelect.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/t=
estSelect.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel:3816-3868*,3876-3915*,3920-3983*
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel:35=
07-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel:4002-4046*
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel:35=
07-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testColumns.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testColumns.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testColumns.expected:3816-3868,3876-3915,3920-3983
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stColumns.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testColumns.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testColumns.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testColumns.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stColumns.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testDataTypes.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testDataTypes.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testDataTypes.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testDataTypes.expected:3816-3868,3876-3915,3920-3983
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stDataTypes.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testDataTypes.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testDataTypes.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testDataTypes.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testDataTypes.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stDataTypes.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testKeyColumns.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testKeyColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeyColumns.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeyColumns.expected:3816-3868,3876-3915,3920-3983
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stKeyColumns.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testKeyColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeyColumns.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeyColumns.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeyColumns.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stKeyColumns.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testKeys.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testKeys.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeys.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeys.expected:3816-3868,3876-3915,3920-3983
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stKeys.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testKeys.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeys.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeys.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeys.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stKeys.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testProcedureParams.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testProcedureParams.expected:3220-3275,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedureParams.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedureParams.expected:3816-3868,3876-3915,3920-3983
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stProcedureParams.expected:3188-3450,3452-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testProcedureParams.expected:3220-3275,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedureParams.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedureParams.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedureParams.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stProcedureParams.expected:3188-3450,3452-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testProcedures.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testProcedures.expected:3220-3275,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedures.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedures.expected:3816-3868,3876-3915,3920-3983
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stProcedures.expected:3188-3450,3452-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testProcedures.expected:3220-3275,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedures.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedures.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedures.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stProcedures.expected:3188-3450,3452-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testReferenceKeyColumns.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testReferenceKeyColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testReferenceKeyColumns.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testReferenceKeyColumns.expected:3816-3868,3876-3915,3920-3983
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stReferenceKeyColumns.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testReferenceKeyColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testReferenceKeyColumns.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testReferenceKeyColumns.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testReferenceKeyColumns.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stReferenceKeyColumns.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testSchemas.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testSchemas.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testSchemas.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testSchemas.expected:3816-3868,3876-3915,3920-3983
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stSchemas.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testSchemas.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testSchemas.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testSchemas.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testSchemas.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stSchemas.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testTableIsSystem.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testTableIsSystem.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTableIsSystem.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTableIsSystem.expected:3816-3868,3876-3915,3920-3983
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stTableIsSystem.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testTableIsSystem.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTableIsSystem.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTableIsSystem.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTableIsSystem.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stTableIsSystem.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testTables.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testTables.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTables.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTables.expected:3816-3868,3876-3915,3920-3983
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stTables.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testTables.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTables.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTables.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTables.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stTables.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testVDBResources.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testVDBResources.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testVDBResources.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testVDBResources.expected:3816-3868,3876-3915,3920-3983
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stVDBResources.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testVDBResources.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testVDBResources.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testVDBResources.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testVDBResources.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stVDBResources.expected:3507-3666
Property changes on: trunk/test-integration/db/src/main/java/org/teiid/inte=
rnal
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal:3=
535-3555*
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal:3673-3=
711*,3754-3769
/branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal:3816-3=
868*,3876-3915*,3920-3983*
/trunk/test-integration/db/src/main/java/org/teiid/internal:3507-3666
+ /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal:3=
535-3555*
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal:3673-3=
711*,3754-3769
/branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal:3816-3=
868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/main/java/org/teiid/internal:4002-4=
046*
/trunk/test-integration/db/src/main/java/org/teiid/internal:3507-3666
Property changes on: trunk/test-integration/db/src/main/java/org/teiid/inte=
rnal/core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/c=
ore:3535-3555*
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal/core:3=
673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal/core:3=
816-3868*,3876-3915*,3920-3983*
/trunk/test-integration/db/src/main/java/org/teiid/internal/core:3507-3666
+ /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/c=
ore:3535-3555*
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal/core:3=
673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal/core:3=
816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/main/java/org/teiid/internal/core:4=
002-4046*
/trunk/test-integration/db/src/main/java/org/teiid/internal/core:3507-3666
Property changes on: trunk/test-integration/db/src/main/java/org/teiid/inte=
rnal/core/xml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/c=
ore/xml:3535-3555
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal/core/x=
ml:3673-3711,3754-3769
/branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal/core/x=
ml:3816-3868,3876-3915,3920-3983
/trunk/test-integration/db/src/main/java/org/teiid/internal/core/xml:3507-3=
666
+ /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/c=
ore/xml:3535-3555
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal/core/x=
ml:3673-3711,3754-3769
/branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal/core/x=
ml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/db/src/main/java/org/teiid/internal/core/x=
ml:4002-4046
/trunk/test-integration/db/src/main/java/org/teiid/internal/core/xml:3507-3=
666
Property changes on: trunk/test-integration/db/src/test/java/com
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/db/src/test/java/com:3535-3555*
/branches/7.6.x/test-integration/db/src/test/java/com:3673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/test/java/com:3816-3868*,3876-3915*=
,3920-3983*
/trunk/test-integration/db/src/test/java/com:3507-3666
+ /branches/7.4.x/test-integration/db/src/test/java/com:3535-3555*
/branches/7.6.x/test-integration/db/src/test/java/com:3673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/test/java/com:3816-3868*,3876-3915*=
,3920-3983*
/branches/8.0.x/test-integration/db/src/test/java/com:4002-4046*
/trunk/test-integration/db/src/test/java/com:3507-3666
Property changes on: trunk/test-integration/db/src/test/java/org/teiid/inte=
rnal
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal:3=
535-3555*
/branches/7.6.x/test-integration/db/src/test/java/org/teiid/internal:3673-3=
711*,3754-3769
/branches/7.7.x/test-integration/db/src/test/java/org/teiid/internal:3816-3=
868*,3876-3915*,3920-3983*
/trunk/test-integration/db/src/test/java/org/teiid/internal:3507-3666
+ /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal:3=
535-3555*
/branches/7.6.x/test-integration/db/src/test/java/org/teiid/internal:3673-3=
711*,3754-3769
/branches/7.7.x/test-integration/db/src/test/java/org/teiid/internal:3816-3=
868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/test/java/org/teiid/internal:4002-4=
046*
/trunk/test-integration/db/src/test/java/org/teiid/internal:3507-3666
Property changes on: trunk/test-integration/db/src/test/java/org/teiid/inte=
rnal/core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal/c=
ore:3535-3555*
/branches/7.6.x/test-integration/db/src/test/java/org/teiid/internal/core:3=
673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/test/java/org/teiid/internal/core:3=
816-3868*,3876-3915*,3920-3983*
/trunk/test-integration/db/src/test/java/org/teiid/internal/core:3507-3666
+ /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal/c=
ore:3535-3555*
/branches/7.6.x/test-integration/db/src/test/java/org/teiid/internal/core:3=
673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/test/java/org/teiid/internal/core:3=
816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/test/java/org/teiid/internal/core:4=
002-4046*
/trunk/test-integration/db/src/test/java/org/teiid/internal/core:3507-3666
--===============2961280393200695757==--
From jboss-qa-internal at redhat.com Wed May 2 02:22:16 2012
Content-Type: multipart/mixed; boundary="===============1347176556387449188=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: teiid-commits at lists.jboss.org
Subject: [teiid-commits] Teiid-NightlyBuild - Build # 1514 - Still Failing!
Date: Wed, 02 May 2012 01:05:07 -0400
Message-ID: <600471042.18241335939736007.JavaMail.hudsonmaster@hudson.mw.lab.eng.bos.redhat.com>
In-Reply-To: 1440121763.13331335848562266.JavaMail.hudsonmaster@hudson.mw.lab.eng.bos.redhat.com
--===============1347176556387449188==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Teiid-NightlyBuild - Build # 1514 - Still Failing:
Check console output at http://hudson.qa.jboss.com/hudson/job/Teiid-Nightly=
Build/1514/ to view the results.
--===============1347176556387449188==--
From teiid-commits at lists.jboss.org Wed May 2 11:00:38 2012
Content-Type: multipart/mixed; boundary="===============8332328533639919304=="
MIME-Version: 1.0
From: teiid-commits at lists.jboss.org
To: teiid-commits at lists.jboss.org
Subject: [teiid-commits] teiid SVN: r4048 - in branches/8.0.x:
api/src/main/java/org/teiid/connector and 19 other directories.
Date: Wed, 02 May 2012 11:00:38 -0400
Message-ID: <201205021500.q42F0c4s019087@svn01.web.mwc.hst.phx2.redhat.com>
--===============8332328533639919304==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: rareddy
Date: 2012-05-02 11:00:34 -0400 (Wed, 02 May 2012)
New Revision: 4048
Modified:
branches/8.0.x/admin/src/main/java/org/teiid/adminapi/AdminFactory.java
branches/8.0.x/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java
branches/8.0.x/api/src/main/java/org/teiid/connector/DataPlugin.java
branches/8.0.x/api/src/main/java/org/teiid/translator/ExecutionFactory.j=
ava
branches/8.0.x/client/src/main/java/org/teiid/gss/MakeGSS.java
branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java
branches/8.0.x/common-core/src/main/java/org/teiid/core/CorePlugin.java
branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/Blob=
ToBinaryTransform.java
branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/Clob=
ToStringTransform.java
branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/Obje=
ctToAnyTransform.java
branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/SQLX=
MLToStringTransform.java
branches/8.0.x/common-core/src/main/resources/org/teiid/core/i18n.proper=
ties
branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/transl=
ator/jdbc/JDBCPlugin.java
branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/impl/BufferF=
rontedFileStoreCache.java
branches/8.0.x/engine/src/main/java/org/teiid/dqp/internal/process/Trans=
actionServerImpl.java
branches/8.0.x/engine/src/main/java/org/teiid/query/QueryPlugin.java
branches/8.0.x/engine/src/main/java/org/teiid/query/eval/Evaluator.java
branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionDes=
criptor.java
branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational=
/rules/FrameUtil.java
branches/8.0.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.ja=
va
branches/8.0.x/engine/src/main/java/org/teiid/query/xquery/saxon/XQueryE=
valuator.java
branches/8.0.x/engine/src/main/resources/org/teiid/query/i18n.properties
branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/Integrati=
onPlugin.java
branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/TeiidOper=
ationHandler.java
branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/VDBServic=
e.java
branches/8.0.x/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java
branches/8.0.x/runtime/src/main/resources/org/teiid/runtime/i18n.propert=
ies
Log:
TEIID-1889: fixing the missing keys when same message used by two events
Modified: branches/8.0.x/admin/src/main/java/org/teiid/adminapi/AdminFactor=
y.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/admin/src/main/java/org/teiid/adminapi/AdminFactory.java=
2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/admin/src/main/java/org/teiid/adminapi/AdminFactory.java=
2012-05-02 15:00:34 UTC (rev 4048)
@@ -619,7 +619,7 @@
} catch (OperationFormatException e) {
throw new AdminProcessingException(AdminPlugin.Event.TEIID70011, e, e=
.getMessage());
} catch (IOException e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70012, e, e=
.getMessage());
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70011, e, e=
.getMessage());
} =
}
=
Modified: branches/8.0.x/admin/src/main/java/org/teiid/adminapi/AdminPlugin=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java =
2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java =
2012-05-02 15:00:34 UTC (rev 4048)
@@ -32,8 +32,6 @@
=
public static enum Event implements BundleUtil.Event {
TEIID70000,
- TEIID70001,
- TEIID70002,
TEIID70003,
TEIID70004,
TEIID70005,
@@ -43,14 +41,11 @@
TEIID70009,
TEIID70010,
TEIID70011,
- TEIID70012,
TEIID70013,
TEIID70014,
TEIID70015,
TEIID70016,
TEIID70017,
- TEIID70018,
- TEIID70019,
TEIID70020,
TEIID70021,
TEIID70022,
Modified: branches/8.0.x/api/src/main/java/org/teiid/connector/DataPlugin.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/api/src/main/java/org/teiid/connector/DataPlugin.java 20=
12-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/api/src/main/java/org/teiid/connector/DataPlugin.java 20=
12-05-02 15:00:34 UTC (rev 4048)
@@ -40,8 +40,6 @@
TEIID60003,
TEIID60004,
TEIID60005,
- TEIID60006,
- TEIID60007,
TEIID60008,
TEIID60009,
TEIID60010,
Modified: branches/8.0.x/api/src/main/java/org/teiid/translator/ExecutionFa=
ctory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/api/src/main/java/org/teiid/translator/ExecutionFactory.=
java 2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/api/src/main/java/org/teiid/translator/ExecutionFactory.=
java 2012-05-02 15:00:34 UTC (rev 4048)
@@ -819,9 +819,9 @@
} catch (TeiidException e) {
throw new TranslatorException(DataPlugin.Event.TEIID60005, e);
} catch (IllegalAccessException e) {
- throw new TranslatorException(DataPlugin.Event.TEIID60006, e);
+ throw new TranslatorException(DataPlugin.Event.TEIID60005, e);
} catch(InstantiationException e) {
- throw new TranslatorException(DataPlugin.Event.TEIID60007, e);
+ throw new TranslatorException(DataPlugin.Event.TEIID60005, e);
} =
} =
=
Modified: branches/8.0.x/client/src/main/java/org/teiid/gss/MakeGSS.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/client/src/main/java/org/teiid/gss/MakeGSS.java 2012-05-=
01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/client/src/main/java/org/teiid/gss/MakeGSS.java 2012-05-=
02 15:00:34 UTC (rev 4048)
@@ -100,7 +100,7 @@
} =
=
if (errors.length() > 0) {
- throw new LogonException(JDBCPlugin.Event.TEIID20004, errors.toS=
tring());
+ throw new LogonException(JDBCPlugin.Event.TEIID20005, errors.toS=
tring());
}
=
String user =3D props.getProperty(TeiidURL.CONNECTION.USER_NAME);
Modified: branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java 2012=
-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java 2012=
-05-02 15:00:34 UTC (rev 4048)
@@ -42,14 +42,12 @@
TEIID20001,
TEIID20002,
TEIID20003,
- TEIID20004,
TEIID20005,
TEIID20006,
TEIID20007,
TEIID20008,
TEIID20009,
TEIID20010,
- TEIID20011,
TEIID20012,
TEIID20013,
TEIID20014,
Modified: branches/8.0.x/common-core/src/main/java/org/teiid/core/CorePlugi=
n.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/common-core/src/main/java/org/teiid/core/CorePlugin.java=
2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/common-core/src/main/java/org/teiid/core/CorePlugin.java=
2012-05-02 15:00:34 UTC (rev 4048)
@@ -96,7 +96,6 @@
TEIID10052,
TEIID10053,
TEIID10054,
- TEIID10055,
TEIID10056,
TEIID10057,
TEIID10058,
@@ -106,9 +105,7 @@
TEIID10062,
TEIID10063,
TEIID10064,
- TEIID10065,
TEIID10066,
- TEIID10067,
TEIID10068,
TEIID10069,
TEIID10070,
@@ -116,11 +113,9 @@
TEIID10072,
TEIID10073,
TEIID10074,
- TEIID10075,
TEIID10076,
TEIID10077,
TEIID10078,
- TEIID10079,
TEIID10080,
TEIID10081, =
}
Modified: branches/8.0.x/common-core/src/main/java/org/teiid/core/types/bas=
ic/BlobToBinaryTransform.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/Blo=
bToBinaryTransform.java 2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/Blo=
bToBinaryTransform.java 2012-05-02 15:00:34 UTC (rev 4048)
@@ -51,7 +51,7 @@
byte[] bytes =3D ObjectConverterUtil.convertToByteArray(source.ge=
tBinaryStream(), DataTypeManager.MAX_LOB_MEMORY_BYTES, true);
return new BinaryType(bytes); =
} catch (SQLException e) {
- throw new TransformationException(CorePlugin.Event.TEIID1007=
9, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10079, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
+ throw new TransformationException(CorePlugin.Event.TEIID1008=
0, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10080, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
} catch(IOException e) {
throw new TransformationException(CorePlugin.Event.TEIID1008=
0, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10080, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
} =
Modified: branches/8.0.x/common-core/src/main/java/org/teiid/core/types/bas=
ic/ClobToStringTransform.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/Clo=
bToStringTransform.java 2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/Clo=
bToStringTransform.java 2012-05-02 15:00:34 UTC (rev 4048)
@@ -63,7 +63,7 @@
} catch (SQLException e) {
throw new TransformationException(CorePlugin.Event.TEIID1006=
4, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10064, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
} catch(IOException e) {
- throw new TransformationException(CorePlugin.Event.TEIID1006=
5, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10065, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
+ throw new TransformationException(CorePlugin.Event.TEIID1006=
4, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10064, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
} finally {
if (reader !=3D null) {
try {
Modified: branches/8.0.x/common-core/src/main/java/org/teiid/core/types/bas=
ic/ObjectToAnyTransform.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/Obj=
ectToAnyTransform.java 2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/Obj=
ectToAnyTransform.java 2012-05-02 15:00:34 UTC (rev 4048)
@@ -56,7 +56,7 @@
=
if (transform =3D=3D null || transform instanceof ObjectToAnyTrans=
form) {
Object[] params =3D new Object[] { getSourceType(), targetClas=
s, value};
- throw new TransformationException(CorePlugin.Event.TEIID1007=
5, CorePlugin.Util.gs(CorePlugin.Event.TEIID10075, params));
+ throw new TransformationException(CorePlugin.Event.TEIID1007=
6, CorePlugin.Util.gs(CorePlugin.Event.TEIID10076, params));
}
=
try {
Modified: branches/8.0.x/common-core/src/main/java/org/teiid/core/types/bas=
ic/SQLXMLToStringTransform.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/SQL=
XMLToStringTransform.java 2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/SQL=
XMLToStringTransform.java 2012-05-02 15:00:34 UTC (rev 4048)
@@ -58,7 +58,7 @@
} catch (SQLException e) {
throw new TransformationException(CorePlugin.Event.TEIID1006=
6, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10066, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
} catch (IOException e) {
- throw new TransformationException(CorePlugin.Event.TEIID1006=
7, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10067, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
+ throw new TransformationException(CorePlugin.Event.TEIID1006=
6, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10066, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
} finally {
try {
if (reader !=3D null) {
Modified: branches/8.0.x/common-core/src/main/resources/org/teiid/core/i18n=
.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/common-core/src/main/resources/org/teiid/core/i18n.prope=
rties 2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/common-core/src/main/resources/org/teiid/core/i18n.prope=
rties 2012-05-02 15:00:34 UTC (rev 4048)
@@ -109,6 +109,8 @@
TEIID10071=3DInvalid short format in String: {0}
TEIID10059=3DFailed to transform String to Timestamp. Expected format =3D=
yyyy-mm-dd hh:mm:ss.fffffffff for {0}
TEIID10068=3DFailed to transform String to Time. Expected format =3D hh:m=
m:ss for {0}
+TEIID10064=3DFailed to transform Clob to String. source=3D{0}, target=3D{=
1}
+TEIID10066=3DFailed to transform XML to String. source=3D{0}, target=3D{1}
=
#CM_UTIL_ERR
TEIID10006=3DDecryption failed: {0} {1}
Modified: branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid=
/translator/jdbc/JDBCPlugin.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/trans=
lator/jdbc/JDBCPlugin.java 2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/trans=
lator/jdbc/JDBCPlugin.java 2012-05-02 15:00:34 UTC (rev 4048)
@@ -38,7 +38,6 @@
=
=
public static enum Event implements BundleUtil.Event{
- TEIID11001, // connection details
TEIID11002, // connection creation failed
TEIID11003, // invalid hint
TEIID11004,
Modified: branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/impl/=
BufferFrontedFileStoreCache.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/impl/Buffer=
FrontedFileStoreCache.java 2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/impl/Buffer=
FrontedFileStoreCache.java 2012-05-02 15:00:34 UTC (rev 4048)
@@ -727,7 +727,7 @@
CacheEntry ce =3D new CacheEntry(new CacheKey(oid, 1, 1), sizeEstimate,=
serializer.deserialize(dis), ref, true);
return ce;
} catch(IOException e) {
- throw new TeiidComponentException(QueryPlugin.Event.TEIID30047, =
e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30047, oid));
+ throw new TeiidComponentException(QueryPlugin.Event.TEIID30048, =
e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30048, oid));
} catch (ClassNotFoundException e) {
throw new TeiidComponentException(QueryPlugin.Event.TEIID30048, =
e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30048, oid));
} catch (InterruptedException e) {
Modified: branches/8.0.x/engine/src/main/java/org/teiid/dqp/internal/proces=
s/TransactionServerImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/dqp/internal/process/Tran=
sactionServerImpl.java 2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/engine/src/main/java/org/teiid/dqp/internal/process/Tran=
sactionServerImpl.java 2012-05-02 15:00:34 UTC (rev 4048)
@@ -232,7 +232,7 @@
checkXAState(threadId, xid, false, false);
tc =3D transactions.getOrCreateTransactionContext(threadId);
if (tc.getTransactionType() !=3D TransactionContext.Scope.NONE) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30511, X=
AException.XAER_PROTO, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30511));
+ throw new XATransactionException(QueryPlugin.Event.TEIID30517, X=
AException.XAER_PROTO, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30517));
}
tc.setTransactionTimeout(timeout);
tc.setXid(xid);
@@ -258,13 +258,13 @@
} catch (NotSupportedException e) {
throw new XATransactionException(QueryPlugin.Event.TEIID30512, XAExc=
eption.XAER_INVAL, e);
} catch (WorkException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30513, XAExc=
eption.XAER_INVAL, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30512, XAExc=
eption.XAER_INVAL, e);
} catch (InterruptedException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30514, XAExc=
eption.XAER_INVAL, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30512, XAExc=
eption.XAER_INVAL, e);
} catch (ExecutionException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30515, XAExc=
eption.XAER_INVAL, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30512, XAExc=
eption.XAER_INVAL, e);
} catch (SystemException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30516, XAExc=
eption.XAER_INVAL, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30512, XAExc=
eption.XAER_INVAL, e);
}
break;
}
@@ -380,7 +380,7 @@
} catch (javax.transaction.NotSupportedException err) {
throw new XATransactionException(QueryPlugin.Event.TEIID30528=
, err);
} catch (SystemException err) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30529=
, err);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30528=
, err);
}
}
=
@@ -391,13 +391,13 @@
} catch (SecurityException e) {
throw new XATransactionException(QueryPlugin.Event.TEIID30530, e);
} catch (RollbackException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30531, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30530, e);
} catch (HeuristicMixedException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30532, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30530, e);
} catch (HeuristicRollbackException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30533, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30530, e);
} catch (SystemException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30534, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30530, e);
} finally {
transactions.removeTransactionContext(context);
}
@@ -410,7 +410,7 @@
} catch (SecurityException e) {
throw new XATransactionException(QueryPlugin.Event.TEIID30535, e);
} catch (SystemException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30536, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30535, e);
} finally {
transactions.removeTransactionContext(tc);
}
@@ -430,7 +430,7 @@
} catch (InvalidTransactionException e) {
throw new XATransactionException(QueryPlugin.Event.TEIID30538, e);
} catch (SystemException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30539, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30538, e);
}
}
=
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/QueryPlugin.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/QueryPlugin.java 20=
12-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/QueryPlugin.java 20=
12-05-02 15:00:34 UTC (rev 4048)
@@ -50,10 +50,8 @@
TEIID30004, // zero size batch
TEIID30005, // rollback failed
TEIID30006, // invalid max active plans
- TEIID30007, // general process worker error
TEIID30008, // request not deterministic
TEIID30009, // max threads exceeded
- TEIID30010, // duplicate function
TEIID30011, // dependent criteria over max
TEIID30012, // mat row refresh
TEIID30013, // mat table loading
@@ -90,7 +88,6 @@
TEIID30044,
TEIID30045,
TEIID30046,
- TEIID30047,
TEIID30048,
TEIID30049,
TEIID30050,
@@ -192,15 +189,12 @@
TEIID30146,
TEIID30147,
TEIID30148,
- TEIID30149,
- TEIID30150,
TEIID30151,
TEIID30152,
TEIID30153,
TEIID30154,
TEIID30155,
TEIID30156,
- TEIID30157,
TEIID30158,
TEIID30159,
TEIID30160,
@@ -303,9 +297,6 @@
TEIID30257,
TEIID30258,
TEIID30259,
- TEIID30260,
- TEIID30261,
- TEIID30262,
TEIID30263,
TEIID30264,
TEIID30265,
@@ -355,17 +346,11 @@
TEIID30309,
TEIID30310,
TEIID30311,
- TEIID30312,
- TEIID30313,
TEIID30314,
TEIID30315,
TEIID30316,
- TEIID30317,
- TEIID30318,
TEIID30319,
TEIID30320,
- TEIID30321,
- TEIID30322,
TEIID30323,
TEIID30324,
TEIID30325,
@@ -375,7 +360,6 @@
TEIID30329,
TEIID30330,
TEIID30331,
- TEIID30332,
TEIID30333,
TEIID30334,
TEIID30335,
@@ -426,7 +410,6 @@
TEIID30380,
TEIID30381,
TEIID30382,
- TEIID30383,
TEIID30384,
TEIID30385,
TEIID30386,
@@ -457,7 +440,6 @@
TEIID30411,
TEIID30412,
TEIID30413,
- TEIID30414,
TEIID30415,
TEIID30416,
TEIID30417,
@@ -551,12 +533,7 @@
TEIID30508,
TEIID30509,
TEIID30510,
- TEIID30511,
TEIID30512,
- TEIID30513,
- TEIID30514,
- TEIID30515,
- TEIID30516,
TEIID30517,
TEIID30518,
TEIID30519,
@@ -569,17 +546,10 @@
TEIID30526,
TEIID30527,
TEIID30528,
- TEIID30529,
TEIID30530,
- TEIID30531,
- TEIID30532,
- TEIID30533,
- TEIID30534,
TEIID30535,
- TEIID30536,
TEIID30537,
TEIID30538,
- TEIID30539,
TEIID30540,
TEIID30541,
TEIID30542,
@@ -587,7 +557,6 @@
TEIID30544,
TEIID30545,
TEIID30546,
- TEIID30547,
TEIID30548,
TEIID30549,
TEIID30550,
@@ -606,13 +575,13 @@
TEIID30563,
TEIID30564,
TEIID30565,
- TEIID30574, =
TEIID30580,
TEIID30581,
TEIID30590,
TEIID30591,
- TEIID30600, TEIID30601, TEIID30602, //User defined aggregate errors
- =
+ TEIID30600, =
+ TEIID30601, =
+ TEIID30602, //User defined aggregate errors
TEIID31069,
TEIID31070,
TEIID31071,
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/eval/Evaluato=
r.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/eval/Evaluator.java=
2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/eval/Evaluator.java=
2012-05-02 15:00:34 UTC (rev 4048)
@@ -271,7 +271,7 @@
try {
leftValue =3D evaluate(criteria.getLeftExpression(), tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30312, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30312, "left", crite=
ria)); //$NON-NLS-1$
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30314, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30314, "left", crite=
ria)); //$NON-NLS-1$
}
=
// Shortcut if null
@@ -284,7 +284,7 @@
try {
rightValue =3D evaluate(criteria.getRightExpression(), tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30313, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30313, "right", crit=
eria)); //$NON-NLS-1$
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30314, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30314, "right", crit=
eria)); //$NON-NLS-1$
}
=
// Shortcut if null
@@ -330,7 +330,7 @@
try {
rightValue =3D (String) evaluate(criteria.getRightExpression(), tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30317, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30317, "right", crit=
eria)); //$NON-NLS-1$
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30315, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30315, "right", crit=
eria)); //$NON-NLS-1$
}
=
// Shortcut if null
@@ -373,7 +373,7 @@
try {
leftValue =3D evaluate(criteria.getExpression(), tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30318, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30318, criteria));
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30323, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30323, criteria));
}
=
// Shortcut if null
@@ -429,7 +429,7 @@
try {
value =3D evaluate((Expression) possibleValue, tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.E=
vent.TEIID30321, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30321, possi=
bleValue));
+ throw new ExpressionEvaluationException(QueryPlugin.E=
vent.TEIID30323, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30323, possi=
bleValue));
}
} else {
value =3D possibleValue;
@@ -459,7 +459,7 @@
try {
value =3D evaluate(criteria.getExpression(), tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30322, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30322, criteria));
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30323, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30323, criteria));
}
=
return (value =3D=3D null ^ criteria.isNegated());
@@ -765,7 +765,7 @@
}
return xmlQuery.getXQueryExpression().createXMLType(result.iter, this.c=
ontext.getBufferManager(), emptyOnEmpty);
} catch (TeiidProcessingException e) {
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30332, e, =
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30332, e.getMessage()));
+ throw new FunctionExecutionException(QueryPlugin.Event.TEIID30333, e, =
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30333, e.getMessage()));
} catch (XPathException e) {
throw new FunctionExecutionException(QueryPlugin.Event.TEIID30333, e, =
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30333, e.getMessage()));
} finally {
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/function/Func=
tionDescriptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionDe=
scriptor.java 2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionDe=
scriptor.java 2012-05-02 15:00:34 UTC (rev 4048)
@@ -242,7 +242,7 @@
}
return importValue(result, getReturnType());
} catch(ArithmeticException e) {
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30383, =
e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30383, getName()));
+ throw new FunctionExecutionException(QueryPlugin.Event.TEIID30384, =
e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30384, getName()));
} catch(InvocationTargetException e) {
throw new FunctionExecutionException(QueryPlugin.Event.TEIID3=
0384, e.getTargetException(), QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30=
384, getName()));
} catch(IllegalAccessException e) {
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/rel=
ational/rules/FrameUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relationa=
l/rules/FrameUtil.java 2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relationa=
l/rules/FrameUtil.java 2012-05-02 15:00:34 UTC (rev 4048)
@@ -298,9 +298,9 @@
}
}
} catch(TeiidProcessingException e) {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30260, e, Qu=
eryPlugin.Util.gs(QueryPlugin.Event.TEIID30260, ses));
+ throw new QueryPlannerException(QueryPlugin.Event.TEIID30263, e, Qu=
eryPlugin.Util.gs(QueryPlugin.Event.TEIID30263, ses));
} catch (TeiidComponentException e) {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30261, e, Query=
Plugin.Util.gs(QueryPlugin.Event.TEIID30261, ses));
+ throw new QueryPlannerException(QueryPlugin.Event.TEIID30263, e, Query=
Plugin.Util.gs(QueryPlugin.Event.TEIID30263, ses));
}
}
=
@@ -337,7 +337,7 @@
try {
return QueryRewriter.rewriteCriteria(criteria, null, metadata);
} catch(TeiidProcessingException e) {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30262,=
e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30262, criteria));
+ throw new QueryPlannerException(QueryPlugin.Event.TEIID30263,=
e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30263, criteria));
} catch (TeiidComponentException e) {
throw new QueryPlannerException(QueryPlugin.Event.TEIID30263, e,=
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30263, criteria));
}
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/processor/Ddl=
Plan.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.j=
ava 2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.j=
ava 2012-05-02 15:00:34 UTC (rev 4048)
@@ -102,7 +102,7 @@
throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30156,=
new TeiidProcessingException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30=
156, t.getName(), obj.getEvent())));
}
} else if (getPlanForEvent(t, event) =3D=3D null) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30157, new=
TeiidProcessingException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30157,=
t.getName(), obj.getEvent())));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30158, new=
TeiidProcessingException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30158,=
t.getName(), obj.getEvent())));
}
sql =3D obj.getDefinition().toString();
} else if (getPlanForEvent(t, event) =3D=3D null) {
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/xquery/saxon/=
XQueryEvaluator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/xquery/saxon/XQuery=
Evaluator.java 2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/xquery/saxon/XQuery=
Evaluator.java 2012-05-02 15:00:34 UTC (rev 4048)
@@ -127,9 +127,9 @@
if (e.getCause() instanceof TeiidRuntimeException) {
RelationalNode.unwrapException((TeiidRuntimeException)e.get=
Cause());
}
- throw new TeiidProcessingException(QueryPlugin.Event.TEIID30149, e=
, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30149));
+ throw new TeiidProcessingException(QueryPlugin.Event.TEIID30151, e=
, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30151));
} catch (IOException e) {
- throw new TeiidProcessingException(QueryPlugin.Event.TEIID30150, e=
, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30150));
+ throw new TeiidProcessingException(QueryPlugin.Event.TEIID30151, e=
, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30151));
} finally {
if (!isNonBlocking) {
commandContext.setNonBlocking(false);
Modified: branches/8.0.x/engine/src/main/resources/org/teiid/query/i18n.pro=
perties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/resources/org/teiid/query/i18n.propertie=
s 2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/engine/src/main/resources/org/teiid/query/i18n.propertie=
s 2012-05-02 15:00:34 UTC (rev 4048)
@@ -78,12 +78,12 @@
=
# processor (006)
TEIID30311=3DUnknown criteria type: {0}
-ERR.015.006.0011=3DUnable to evaluate {0} expression of {1}
+TEIID30315=3DUnable to evaluate {0} expression of {1}
TEIID30325=3DUnknown compare criteria operator: {0}
TEIID30448=3DFailed to create regular expression from match pattern: {0}. =
{1}
TEIID30323=3DUnable to evaluate expression of {0}
TEIID30329=3DUnknown expression type: {0}
-ERR.015.006.0033=3DUnable to evaluate {0}: {1}
+TEIID30340=3DUnable to evaluate {0}: {1}
TEIID30342=3DUnable to evaluate LOOKUP function.
TEIID30326=3DUnknown subquery comparison predicate quantifier: {0}
TEIID30345=3DThe command of this scalar subquery returned more than one va=
lue: {0}
@@ -849,7 +849,7 @@
=
TEIID30482=3DConnector is not in OPEN state
ConnectorManagerImpl.Initializing_connector=3DInitializing connector {0}
-Cancel_request_failed=3DAtomicRequest {0} failed to cancel.
+TEIID30024=3DAtomicRequest {0} failed to cancel.
=
ConnectorWorker.MaxResultRowsExceed=3DThe number of result rows has exceed=
ed the maximum result rows "{0}"
TEIID30004=3DConnector returned a 0 row non-last batch: {0}.
Modified: branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/In=
tegrationPlugin.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/Integrat=
ionPlugin.java 2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/Integrat=
ionPlugin.java 2012-05-02 15:00:34 UTC (rev 4048)
@@ -53,8 +53,6 @@
TEIID50011,
TEIID50012, // socket enabled
TEIID50013, // Wrong socket protocol
- TEIID50014, // socket disabled
- TEIID50015, // admin max sessions
TEIID50016, // invalid vdb file
TEIID50017, // vdb.xml parse exception
TEIID50018, // failed VDB dependency processing
@@ -66,11 +64,8 @@
TEIID50024, // failed metadata load
TEIID50025, // VDB deployed
TEIID50026, // VDB undeployed
- TEIID50027, // metadata in-process of loading
- TEIID50028, // failed metadata loading
TEIID50029, // dynamic metadata loaded
TEIID50030,
- TEIID50031, // failed to load cached index files
TEIID50032, // duplicate VDB
TEIID50033, // duplicate source name in vdb
TEIID50034, // Source name mismatch
@@ -91,15 +86,10 @@
TEIID50049,
TEIID50050,
TEIID50051,
- TEIID50052,
- TEIID50053,
TEIID50054,
TEIID50055,
TEIID50056,
TEIID50057,
- TEIID50058,
- TEIID50059,
- TEIID50060,
TEIID50061,
TEIID50062,
TEIID50063,
Modified: branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/Te=
iidOperationHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/TeiidOpe=
rationHandler.java 2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/TeiidOpe=
rationHandler.java 2012-05-02 15:00:34 UTC (rev 4048)
@@ -1133,7 +1133,7 @@
DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
=
if (policy =3D=3D null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50052=
, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50052, policyName,=
vdb.getName(), vdb.getVersion()));
+ throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50051=
, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50051, policyName,=
vdb.getName(), vdb.getVersion()));
} =
=
policy.setAnyAuthenticated(true);
@@ -1173,7 +1173,7 @@
DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
=
if (policy =3D=3D null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50053=
, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50053, policyName,=
vdb.getName(), vdb.getVersion()));
+ throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50051=
, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50051, policyName,=
vdb.getName(), vdb.getVersion()));
} =
=
policy.setAnyAuthenticated(false);
Modified: branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/VD=
BService.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/VDBServi=
ce.java 2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/VDBServi=
ce.java 2012-05-02 15:00:34 UTC (rev 4048)
@@ -432,7 +432,7 @@
DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
=
if (policy =3D=3D null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50058,=
IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50058, policyName, =
this.vdb.getName(), this.vdb.getVersion()));
+ throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50061,=
IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50061, policyName, =
this.vdb.getName(), this.vdb.getVersion()));
} =
=
policy.addMappedRoleName(mappedRole);
@@ -443,7 +443,7 @@
DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
=
if (policy =3D=3D null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50059,=
IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50059, policyName, =
this.vdb.getName(), this.vdb.getVersion()));
+ throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50061,=
IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50061, policyName, =
this.vdb.getName(), this.vdb.getVersion()));
} =
=
policy.removeMappedRoleName(mappedRole);
@@ -454,7 +454,7 @@
DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
=
if (policy =3D=3D null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50060,=
IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50060, policyName, =
this.vdb.getName(), this.vdb.getVersion()));
+ throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50061,=
IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50061, policyName, =
this.vdb.getName(), this.vdb.getVersion()));
} =
=
policy.setAnyAuthenticated(true);
Modified: branches/8.0.x/runtime/src/main/java/org/teiid/runtime/RuntimePlu=
gin.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.ja=
va 2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.ja=
va 2012-05-02 15:00:34 UTC (rev 4048)
@@ -35,13 +35,11 @@
TEIID40001, // undefined translator properties
TEIID40002, // failed to load ODBC metadata
TEIID40003, // VDB Active
- TEIID40004, // VDB validity errors
TEIID40005, // datasource or translator not found
TEIID40006, // VDB inactive
TEIID40007, // keep alive failed
TEIID40008, // expired session
TEIID40009, // terminate session
- TEIID40010, // odbc error
TEIID40011, // processing error
TEIID40012, // data source not found
TEIID40013, // replication failed
Modified: branches/8.0.x/runtime/src/main/resources/org/teiid/runtime/i18n.=
properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/runtime/src/main/resources/org/teiid/runtime/i18n.proper=
ties 2012-05-01 19:12:27 UTC (rev 4047)
+++ branches/8.0.x/runtime/src/main/resources/org/teiid/runtime/i18n.proper=
ties 2012-05-02 15:00:34 UTC (rev 4048)
@@ -46,6 +46,7 @@
TEIID40003=3DVDB {0}.{1} is set to "active"
TEIID40006=3DVDB {0}.{1} is set to "inactive"
TEIID40036=3DSystem.vdb needs to be loaded before any other VDBs.
+TEIID40013=3DReplication failed for {0}
=
TEIID40075=3DUser Defined Function (UDF) model "{0}" not found in the VDB
TEIID40035=3DVDB with given name and version already exists! {0}.{1}
--===============8332328533639919304==--
From teiid-commits at lists.jboss.org Wed May 2 13:00:18 2012
Content-Type: multipart/mixed; boundary="===============7454087660650285541=="
MIME-Version: 1.0
From: teiid-commits at lists.jboss.org
To: teiid-commits at lists.jboss.org
Subject: [teiid-commits] teiid SVN: r4049 - in branches/8.0.x:
client/src/main/java/org/teiid/gss and 34 other directories.
Date: Wed, 02 May 2012 13:00:17 -0400
Message-ID: <201205021700.q42H0Hlu010213@svn01.web.mwc.hst.phx2.redhat.com>
--===============7454087660650285541==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: shawkins
Date: 2012-05-02 13:00:12 -0400 (Wed, 02 May 2012)
New Revision: 4049
Modified:
branches/8.0.x/admin/src/main/java/org/teiid/adminapi/AdminFactory.java
branches/8.0.x/client/src/main/java/org/teiid/gss/MakeGSS.java
branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java
branches/8.0.x/client/src/main/resources/org/teiid/jdbc/i18n.properties
branches/8.0.x/common-core/src/main/java/org/teiid/core/CorePlugin.java
branches/8.0.x/common-core/src/main/java/org/teiid/core/types/ClobType.j=
ava
branches/8.0.x/common-core/src/main/java/org/teiid/core/types/DataTypeMa=
nager.java
branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/Clob=
ToStringTransform.java
branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/SQLX=
MLToStringTransform.java
branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/Stri=
ngToDateTransform.java
branches/8.0.x/common-core/src/main/java/org/teiid/core/util/FileUtils.j=
ava
branches/8.0.x/common-core/src/main/java/org/teiid/core/util/ReflectionH=
elper.java
branches/8.0.x/common-core/src/main/resources/org/teiid/core/i18n.proper=
ties
branches/8.0.x/common-core/src/test/java/org/teiid/core/util/TestFileUti=
ls.java
branches/8.0.x/engine/src/main/java/org/teiid/query/QueryPlugin.java
branches/8.0.x/engine/src/main/java/org/teiid/query/eval/Evaluator.java
branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionMet=
hods.java
branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/xml/MappingC=
hoiceNode.java
branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/xml/MappingD=
ocument.java
branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational=
/RelationalPlanner.java
branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational=
/rules/RulePlanJoins.java
branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml/NameIn=
SourceResolverVisitor.java
branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml/Source=
NodePlannerVisitor.java
branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml/Valida=
teMappedCriteriaVisitor.java
branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPla=
nner.java
branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPro=
jectionMinimizer.java
branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLQue=
ryPlanner.java
branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLSta=
gaingQueryPlanner.java
branches/8.0.x/engine/src/main/java/org/teiid/query/parser/QueryParser.j=
ava
branches/8.0.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.ja=
va
branches/8.0.x/engine/src/main/java/org/teiid/query/processor/proc/Error=
Instruction.java
branches/8.0.x/engine/src/main/java/org/teiid/query/processor/relational=
/XMLTableNode.java
branches/8.0.x/engine/src/main/java/org/teiid/query/processor/xml/NodeDe=
scriptor.java
branches/8.0.x/engine/src/main/java/org/teiid/query/processor/xml/XMLCon=
text.java
branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/command/Sim=
pleQueryResolver.java
branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/command/Tem=
pTableResolver.java
branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/command/Upd=
ateProcedureResolver.java
branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/command/XML=
QueryResolver.java
branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/util/Resolv=
erVisitor.java
branches/8.0.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewrit=
er.java
branches/8.0.x/engine/src/main/java/org/teiid/query/sql/lang/MatchCriter=
ia.java
branches/8.0.x/engine/src/main/java/org/teiid/query/tempdata/TempTableSt=
ore.java
branches/8.0.x/engine/src/main/resources/org/teiid/query/i18n.properties
branches/8.0.x/engine/src/test/java/org/teiid/dqp/internal/process/TestT=
ransactionServer.java
branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctio=
n.java
branches/8.0.x/engine/src/test/java/org/teiid/query/processor/eval/TestC=
riteriaEvaluator.java
branches/8.0.x/engine/src/test/java/org/teiid/query/processor/xml/TestXM=
LProcessor.java
branches/8.0.x/engine/src/test/java/org/teiid/query/resolver/TestProcedu=
reResolving.java
branches/8.0.x/engine/src/test/java/org/teiid/query/resolver/TestResolve=
r.java
branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/Integrati=
onPlugin.java
branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/TeiidOper=
ationHandler.java
branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/VDBServic=
e.java
branches/8.0.x/jboss-integration/src/main/resources/org/teiid/jboss/i18n=
.properties
branches/8.0.x/metadata/src/main/java/org/teiid/metadata/index/RuntimeMe=
tadataPlugin.java
Log:
TEIID-1889 TEIID-2022 refining exception codes
Modified: branches/8.0.x/admin/src/main/java/org/teiid/adminapi/AdminFactor=
y.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/admin/src/main/java/org/teiid/adminapi/AdminFactory.java=
2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/admin/src/main/java/org/teiid/adminapi/AdminFactory.java=
2012-05-02 17:00:12 UTC (rev 4049)
@@ -22,25 +22,15 @@
=
package org.teiid.adminapi;
=
-import static org.jboss.as.controller.client.helpers.ClientConstants.DEPLO=
YMENT_REMOVE_OPERATION;
-import static org.jboss.as.controller.client.helpers.ClientConstants.DEPLO=
YMENT_UNDEPLOY_OPERATION;
+import static org.jboss.as.controller.client.helpers.ClientConstants.*;
=
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
+import java.util.*;
+import java.util.logging.Logger;
=
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -64,10 +54,10 @@
import org.teiid.adminapi.impl.PropertyDefinitionMetadata;
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.adminapi.impl.VDBMetadataMapper;
+import org.teiid.adminapi.impl.VDBTranslatorMetaData;
import org.teiid.adminapi.impl.VDBMetadataMapper.RequestMetadataMapper;
import org.teiid.adminapi.impl.VDBMetadataMapper.SessionMetadataMapper;
import org.teiid.adminapi.impl.VDBMetadataMapper.TransactionMetadataMapper;
-import org.teiid.adminapi.impl.VDBTranslatorMetaData;
import org.teiid.core.util.ObjectConverterUtil;
=
=
@@ -76,6 +66,7 @@
*/
@SuppressWarnings("nls")
public class AdminFactory {
+ private static final Logger LOGGER =3D Logger.getLogger(AdminFactory.clas=
s.getName());
private static AdminFactory INSTANCE =3D new AdminFactory();
=
public static AdminFactory getInstance() {
@@ -106,12 +97,12 @@
List nodeTypes =3D Util.getNodeTypes(newClient, new De=
faultOperationRequestAddress());
if (!nodeTypes.isEmpty()) {
boolean domainMode =3D nodeTypes.contains("server-group");=
//$NON-NLS-1$ =
- System.out.println("Connected to " //$NON-NLS-1$ =
+ LOGGER.info("Connected to " //$NON-NLS-1$ =
+ (domainMode ? "domain controller at " : "standal=
one controller at ") //$NON-NLS-1$ //$NON-NLS-2$
+ host + ":" + port); //$NON-NLS-1$ =
return new AdminImpl(newClient);
} =
- System.out.println(AdminPlugin.Util.gs(AdminPlugin.Event.TEIID=
70051, host, port)); //$NON-NLS-1$ //$NON-NLS-2$
+ LOGGER.info(AdminPlugin.Util.gs(AdminPlugin.Event.TEIID70051, =
host, port)); //$NON-NLS-1$ //$NON-NLS-2$
} catch (UnknownHostException e) {
throw new AdminProcessingException(AdminPlugin.Event.TEIID70000,=
AdminPlugin.Util.gs(AdminPlugin.Event.TEIID70000, host, e.getLocalizedMess=
age()));
}
Modified: branches/8.0.x/client/src/main/java/org/teiid/gss/MakeGSS.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/client/src/main/java/org/teiid/gss/MakeGSS.java 2012-05-=
02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/client/src/main/java/org/teiid/gss/MakeGSS.java 2012-05-=
02 17:00:12 UTC (rev 4049)
@@ -124,7 +124,7 @@
else if (result instanceof CommunicationException)
throw (CommunicationException)result;
else if (result instanceof Exception)
- throw new LogonException(JDBCPlugin.Event.TEIID20006, (Exception=
)result, JDBCPlugin.Util.gs(JDBCPlugin.Event.TEIID20006));
+ throw new LogonException(JDBCPlugin.Event.TEIID20005, (Exception=
)result, JDBCPlugin.Util.gs(JDBCPlugin.Event.TEIID20005));
=
return (LogonResult)result;
}
Modified: branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java 2012=
-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java 2012=
-05-02 17:00:12 UTC (rev 4049)
@@ -43,7 +43,6 @@
TEIID20002,
TEIID20003,
TEIID20005,
- TEIID20006,
TEIID20007,
TEIID20008,
TEIID20009,
Modified: branches/8.0.x/client/src/main/resources/org/teiid/jdbc/i18n.prop=
erties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/client/src/main/resources/org/teiid/jdbc/i18n.properties=
2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/client/src/main/resources/org/teiid/jdbc/i18n.properties=
2012-05-02 17:00:12 UTC (rev 4049)
@@ -152,7 +152,6 @@
=
=
no_krb_ticket=3DNo cached kerberos ticket found and/or no password supplied
-TEIID20006=3DGSS Authentication failed
TEIID20005=3DGSS Authentication failed
TEIID20007=3DDuplicate class
setup_failed=3DProtocol error. Session setup failed.
Modified: branches/8.0.x/common-core/src/main/java/org/teiid/core/CorePlugi=
n.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/common-core/src/main/java/org/teiid/core/CorePlugin.java=
2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/common-core/src/main/java/org/teiid/core/CorePlugin.java=
2012-05-02 17:00:12 UTC (rev 4049)
@@ -66,11 +66,6 @@
TEIID10022,
TEIID10023,
TEIID10024,
- TEIID10025,
- TEIID10026,
- TEIID10027,
- TEIID10028,
- TEIID10029,
TEIID10030,
TEIID10031,
TEIID10032,
@@ -91,7 +86,6 @@
TEIID10047,
TEIID10048,
TEIID10049,
- TEIID10050,
TEIID10051,
TEIID10052,
TEIID10053,
@@ -102,10 +96,7 @@
TEIID10059,
TEIID10060,
TEIID10061,
- TEIID10062,
TEIID10063,
- TEIID10064,
- TEIID10066,
TEIID10068,
TEIID10069,
TEIID10070,
Modified: branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Clo=
bType.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/common-core/src/main/java/org/teiid/core/types/ClobType.=
java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/common-core/src/main/java/org/teiid/core/types/ClobType.=
java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -33,8 +33,6 @@
import java.sql.Clob;
import java.sql.SQLException;
=
-import javax.sql.rowset.serial.SerialClob;
-
import org.teiid.core.CorePlugin;
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.util.ObjectConverterUtil;
Modified: branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Dat=
aTypeManager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/common-core/src/main/java/org/teiid/core/types/DataTypeM=
anager.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/common-core/src/main/java/org/teiid/core/types/DataTypeM=
anager.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -847,7 +847,7 @@
targetClass);
if (transform =3D=3D null) {
Object[] params =3D new Object[] { sourceType, targetClass, va=
lue};
- throw new TransformationException(CorePlugin.Event.TEIID1005=
0, CorePlugin.Util.gs(CorePlugin.Event.TEIID10050, params));
+ throw new TransformationException(CorePlugin.Event.TEIID1007=
6, CorePlugin.Util.gs(CorePlugin.Event.TEIID10076, params));
}
T result =3D (T) transform.transform(value);
return getCanonicalValue(result);
Modified: branches/8.0.x/common-core/src/main/java/org/teiid/core/types/bas=
ic/ClobToStringTransform.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/Clo=
bToStringTransform.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/Clo=
bToStringTransform.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -61,9 +61,9 @@
}
return contents.toString(); =
} catch (SQLException e) {
- throw new TransformationException(CorePlugin.Event.TEIID1006=
4, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10064, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
+ throw new TransformationException(CorePlugin.Event.TEIID1008=
0, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10080, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
} catch(IOException e) {
- throw new TransformationException(CorePlugin.Event.TEIID1006=
4, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10064, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
+ throw new TransformationException(CorePlugin.Event.TEIID1008=
0, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10080, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
} finally {
if (reader !=3D null) {
try {
Modified: branches/8.0.x/common-core/src/main/java/org/teiid/core/types/bas=
ic/SQLXMLToStringTransform.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/SQL=
XMLToStringTransform.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/SQL=
XMLToStringTransform.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -56,9 +56,9 @@
int read =3D reader.read(result);
return new String(result, 0, read);
} catch (SQLException e) {
- throw new TransformationException(CorePlugin.Event.TEIID1006=
6, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10066, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
+ throw new TransformationException(CorePlugin.Event.TEIID1008=
0, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10080, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
} catch (IOException e) {
- throw new TransformationException(CorePlugin.Event.TEIID1006=
6, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10066, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
+ throw new TransformationException(CorePlugin.Event.TEIID1008=
0, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10080, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
} finally {
try {
if (reader !=3D null) {
Modified: branches/8.0.x/common-core/src/main/java/org/teiid/core/types/bas=
ic/StringToDateTransform.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/Str=
ingToDateTransform.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/Str=
ingToDateTransform.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -58,12 +58,12 @@
result =3D Date.valueOf( (String) value );
} catch(Exception e) {
if (!validate && pattern.matcher((String)value).matches()) {
- throw new TransformationException(CorePlugin.Event.TEIID10062, Co=
rePlugin.Util.gs(CorePlugin.Event.TEIID10062, value, getTargetType().getSim=
pleName()));
+ throw new TransformationException(CorePlugin.Event.TEIID10060, Co=
rePlugin.Util.gs(CorePlugin.Event.TEIID10060, value, getTargetType().getSim=
pleName()));
}
throw new TransformationException(CorePlugin.Event.TEIID10061, e, Cor=
ePlugin.Util.gs(CorePlugin.Event.TEIID10061, value));
}
if (validate && !result.toString().equals(value)) {
- throw new TransformationException(CorePlugin.Event.TEIID10062, CorePl=
ugin.Util.gs(CorePlugin.Event.TEIID10062, value, getTargetType().getSimpleN=
ame()));
+ throw new TransformationException(CorePlugin.Event.TEIID10060, CorePl=
ugin.Util.gs(CorePlugin.Event.TEIID10060, value, getTargetType().getSimpleN=
ame()));
}
return result;
}
Modified: branches/8.0.x/common-core/src/main/java/org/teiid/core/util/File=
Utils.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/common-core/src/main/java/org/teiid/core/util/FileUtils.=
java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/common-core/src/main/java/org/teiid/core/util/FileUtils.=
java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -22,17 +22,7 @@
=
package org.teiid.core.util;
=
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
import java.util.ArrayList;
import java.util.List;
=
@@ -74,12 +64,6 @@
public final static char[] SUFFIX_zip =3D ".zip".toCharArray(); //$NON=
-NLS-1$
public final static char[] SUFFIX_ZIP =3D ".ZIP".toCharArray(); //$NON=
-NLS-1$
=
- =
- private static final String TEMP_FILE =3D "delete.me"; //$NON-NLS-1$
- private static final String TEMP_FILE_RENAMED =3D "delete.me.old"; //$=
NON-NLS-1$
- =
- =
- =
static {
String tempDirPath =3D System.getProperty(JAVA_IO_TEMP_DIR); =
TEMP_DIRECTORY =3D (tempDirPath.endsWith(File.separator) ? tempDir=
Path : tempDirPath + File.separator);
@@ -751,63 +735,6 @@
}
=
/**
- * Test whether it's possible to read and write files in the specified=
directory. =
- * @param dirPath Name of the directory to test
- * @throws TeiidException
- * @since 4.3
- */
- public static void testDirectoryPermissions(String dirPath) throws Tei=
idException {
- =
- //try to create a file
- File tmpFile =3D new File(dirPath + File.separatorChar + TEMP_FILE=
);
- boolean success =3D false;
- try {
- success =3D tmpFile.createNewFile();
- } catch (IOException e) {
- }
- if (!success) {
- final String msg =3D CorePlugin.Util.getString("FileUtils.Unab=
le_to_create_file_in", dirPath); //$NON-NLS-1$ =
- throw new TeiidException(CorePlugin.Event.TEIID10025, msg);
- }
- =
-
- //test if file can be written to
- if (!tmpFile.canWrite()) {
- final String msg =3D CorePlugin.Util.getString("FileUtils.Unab=
le_to_write_file_in", dirPath); //$NON-NLS-1$ =
- throw new TeiidException(CorePlugin.Event.TEIID10026, msg);
- }
-
- //test if file can be read
- if (!tmpFile.canRead()) {
- final String msg =3D CorePlugin.Util.getString("FileUtils.Unab=
le_to_read_file_in", dirPath); //$NON-NLS-1$ =
- throw new TeiidException(CorePlugin.Event.TEIID10027, msg);
- }
-
- //test if file can be renamed
- File newFile =3D new File(dirPath + File.separatorChar + TEMP_FILE=
_RENAMED);
- success =3D false;
- try {
- success =3D tmpFile.renameTo(newFile);
- } catch (Exception e) {
- }
- if (!success) {
- final String msg =3D CorePlugin.Util.getString("FileUtils.Unab=
le_to_rename_file_in", dirPath); //$NON-NLS-1$ =
- throw new TeiidException(CorePlugin.Event.TEIID10028, msg);
- }
-
- //test if file can be deleted
- success =3D false;
- try {
- success =3D newFile.delete();
- } catch (Exception e) {
- }
- if (!success) {
- final String msg =3D CorePlugin.Util.getString("FileUtils.Unab=
le_to_delete_file_in", dirPath); //$NON-NLS-1$ =
- throw new TeiidException(CorePlugin.Event.TEIID10029, msg);
- }
- }
-
- /**
* Rename a file. =
* @param oldFilePath
* @param newFilePath
Modified: branches/8.0.x/common-core/src/main/java/org/teiid/core/util/Refl=
ectionHelper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/common-core/src/main/java/org/teiid/core/util/Reflection=
Helper.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/common-core/src/main/java/org/teiid/core/util/Reflection=
Helper.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -23,7 +23,6 @@
package org.teiid.core.util;
=
import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
Modified: branches/8.0.x/common-core/src/main/resources/org/teiid/core/i18n=
.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/common-core/src/main/resources/org/teiid/core/i18n.prope=
rties 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/common-core/src/main/resources/org/teiid/core/i18n.prope=
rties 2012-05-02 17:00:12 UTC (rev 4049)
@@ -70,11 +70,6 @@
IDGenerator.The_stringified_ID_may_not_be_null=3DThe stringified ID may no=
t be null
FileUtils.The_name_of_the_file_may_not_be_null=3DThe name of the file may =
not be null
FileUtils.The_file_extension_may_not_be_null=3DThe file extension may not =
be null
-FileUtils.Unable_to_create_file_in=3DUnable to create file in \"{0}\"
-FileUtils.Unable_to_write_file_in=3DUnable to create file in \"{0}\"
-FileUtils.Unable_to_read_file_in=3DUnable to create file in \"{0}\"
-FileUtils.Unable_to_rename_file_in=3DUnable to create file in \"{0}\"
-FileUtils.Unable_to_delete_file_in=3DUnable to create file in \"{0}\"
FileUtils.File_already_exists=3DFile "\{0}\" already exists =
=
=
@@ -109,8 +104,6 @@
TEIID10071=3DInvalid short format in String: {0}
TEIID10059=3DFailed to transform String to Timestamp. Expected format =3D=
yyyy-mm-dd hh:mm:ss.fffffffff for {0}
TEIID10068=3DFailed to transform String to Time. Expected format =3D hh:m=
m:ss for {0}
-TEIID10064=3DFailed to transform Clob to String. source=3D{0}, target=3D{=
1}
-TEIID10066=3DFailed to transform XML to String. source=3D{0}, target=3D{1}
=
#CM_UTIL_ERR
TEIID10006=3DDecryption failed: {0} {1}
Modified: branches/8.0.x/common-core/src/test/java/org/teiid/core/util/Test=
FileUtils.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/common-core/src/test/java/org/teiid/core/util/TestFileUt=
ils.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/common-core/src/test/java/org/teiid/core/util/TestFileUt=
ils.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -28,6 +28,7 @@
=
import junit.framework.TestCase;
=
+import org.teiid.core.CorePlugin;
import org.teiid.core.TeiidException;
=
=
@@ -42,6 +43,8 @@
=
private final static String TEMP_DIR_NAME =3D "tempdir"; //$NON-NLS-1$
File tempDir;
+ public static final String TEMP_FILE =3D "delete.me"; //$NON-NLS-1$
+ public static final String TEMP_FILE_RENAMED =3D "delete.me.old"; //$NON-=
NLS-1$
private final static String TEMP_FILE_NAME =3D "tempfile.txt"; //$NON-=
NLS-1$
private final static String TEMP_FILE_NAME2 =3D "tempfile2.txt"; //$NO=
N-NLS-1$
=
@@ -135,11 +138,11 @@
=
=
//positive case
- FileUtils.testDirectoryPermissions(TEMP_DIR_NAME);
+ TestFileUtils.testDirectoryPermissions(TEMP_DIR_NAME);
=
//negative case: dir doesn't exist
try {
- FileUtils.testDirectoryPermissions("fakeDir"); //$NON-NLS-1$
+ TestFileUtils.testDirectoryPermissions("fakeDir"); //$NON-NLS-=
1$
fail("Expected a MetaMatrixCoreException"); //$NON-NLS-1$
} catch (TeiidException e) {
}
@@ -250,5 +253,57 @@
fileSource.delete();
}
}
+
+ /**
+ * Test whether it's possible to read and write files in the specified di=
rectory. =
+ * @param dirPath Name of the directory to test
+ * @throws TeiidException
+ * @since 4.3
+ */
+ public static void testDirectoryPermissions(String dirPath) throws TeiidE=
xception {
+ =
+ //try to create a file
+ File tmpFile =3D new File(dirPath + File.separatorChar + TestFileUtil=
s.TEMP_FILE);
+ boolean success =3D false;
+ try {
+ success =3D tmpFile.createNewFile();
+ } catch (IOException e) {
+ }
+ if (!success) {
+ throw new TeiidException("cannot create file in " + dirPath); /=
/$NON-NLS-1$ =
+ }
+ =
+ //test if file can be written to
+ if (!tmpFile.canWrite()) {
+ throw new TeiidException("cannot write " +dirPath); //$NON-NLS-=
1$
+ }
+ =
+ //test if file can be read
+ if (!tmpFile.canRead()) {
+ throw new TeiidException("cannot read " + dirPath); //$NON-NLS-=
1$
+ }
+ =
+ //test if file can be renamed
+ File newFile =3D new File(dirPath + File.separatorChar + TestFileUtil=
s.TEMP_FILE_RENAMED);
+ success =3D false;
+ try {
+ success =3D tmpFile.renameTo(newFile);
+ } catch (Exception e) {
+ }
+ if (!success) {
+ throw new TeiidException("failed to rename " + dirPath); //$NON=
-NLS-1$
+ }
+ =
+ //test if file can be deleted
+ success =3D false;
+ try {
+ success =3D newFile.delete();
+ } catch (Exception e) {
+ }
+ if (!success) {
+ final String msg =3D CorePlugin.Util.getString("FileUtils.Unable_=
to_delete_file_in", dirPath); //$NON-NLS-1$ =
+ throw new TeiidException(msg);
+ }
+ }
=
}
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/QueryPlugin.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/QueryPlugin.java 20=
12-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/QueryPlugin.java 20=
12-05-02 17:00:12 UTC (rev 4049)
@@ -113,15 +113,12 @@
TEIID30070,
TEIID30071,
TEIID30072,
- TEIID30073,
TEIID30074,
TEIID30075,
TEIID30076,
TEIID30077,
TEIID30078,
TEIID30079,
- TEIID30080,
- TEIID30081,
TEIID30082,
TEIID30083,
TEIID30084,
@@ -144,25 +141,13 @@
TEIID30101,
TEIID30102,
TEIID30103,
- TEIID30104,
- TEIID30105,
- TEIID30106,
- TEIID30107,
- TEIID30108,
- TEIID30109,
- TEIID30110,
- TEIID30111,
TEIID30112,
- TEIID30113,
TEIID30114,
TEIID30115,
TEIID30116,
TEIID30117,
TEIID30118,
- TEIID30119,
- TEIID30120,
TEIID30121,
- TEIID30122,
TEIID30123,
TEIID30124,
TEIID30125,
@@ -172,7 +157,6 @@
TEIID30129,
TEIID30130,
TEIID30131,
- TEIID30132,
TEIID30133,
TEIID30134,
TEIID30135,
@@ -210,7 +194,6 @@
TEIID30170,
TEIID30171,
TEIID30172,
- TEIID30173,
TEIID30174,
TEIID30175,
TEIID30176,
@@ -251,8 +234,6 @@
TEIID30211,
TEIID30212,
TEIID30213,
- TEIID30214,
- TEIID30215,
TEIID30216,
TEIID30217,
TEIID30218,
@@ -265,7 +246,6 @@
TEIID30225,
TEIID30226,
TEIID30227,
- TEIID30228,
TEIID30229,
TEIID30230,
TEIID30231,
@@ -292,8 +272,6 @@
TEIID30252,
TEIID30253,
TEIID30254,
- TEIID30255,
- TEIID30256,
TEIID30257,
TEIID30258,
TEIID30259,
@@ -310,11 +288,7 @@
TEIID30273,
TEIID30274,
TEIID30275,
- TEIID30276,
- TEIID30277,
TEIID30278,
- TEIID30279,
- TEIID30280,
TEIID30281,
TEIID30282,
TEIID30283,
@@ -323,17 +297,10 @@
TEIID30286,
TEIID30287,
TEIID30288,
- TEIID30289,
- TEIID30290,
- TEIID30291,
- TEIID30292,
- TEIID30293,
TEIID30294,
TEIID30295,
TEIID30296,
TEIID30297,
- TEIID30298,
- TEIID30299,
TEIID30300,
TEIID30301,
TEIID30302,
@@ -344,10 +311,9 @@
TEIID30307,
TEIID30308,
TEIID30309,
- TEIID30310,
TEIID30311,
+ TEIID30312,
TEIID30314,
- TEIID30315,
TEIID30316,
TEIID30319,
TEIID30320,
@@ -367,7 +333,6 @@
TEIID30337,
TEIID30338,
TEIID30339,
- TEIID30340,
TEIID30341,
TEIID30342,
TEIID30343,
@@ -395,7 +360,6 @@
TEIID30365,
TEIID30366,
TEIID30367,
- TEIID30368,
TEIID30369,
TEIID30370,
TEIID30371,
@@ -406,7 +370,6 @@
TEIID30376,
TEIID30377,
TEIID30378,
- TEIID30379,
TEIID30380,
TEIID30381,
TEIID30382,
@@ -419,11 +382,7 @@
TEIID30390,
TEIID30391,
TEIID30392,
- TEIID30393,
- TEIID30394,
- TEIID30395,
TEIID30396,
- TEIID30397,
TEIID30398,
TEIID30399,
TEIID30400,
@@ -434,7 +393,6 @@
TEIID30405,
TEIID30406,
TEIID30407,
- TEIID30408,
TEIID30409,
TEIID30410,
TEIID30411,
@@ -442,7 +400,6 @@
TEIID30413,
TEIID30415,
TEIID30416,
- TEIID30417,
TEIID30418,
TEIID30419,
TEIID30420,
@@ -473,19 +430,9 @@
TEIID30447,
TEIID30448,
TEIID30449,
- TEIID30450,
TEIID30451,
TEIID30452,
- TEIID30453,
- TEIID30454,
- TEIID30455,
- TEIID30456,
TEIID30457,
- TEIID30458,
- TEIID30459,
- TEIID30460,
- TEIID30461,
- TEIID30462,
TEIID30463,
TEIID30464,
TEIID30465,
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/eval/Evaluato=
r.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/eval/Evaluator.java=
2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/eval/Evaluator.java=
2012-05-02 17:00:12 UTC (rev 4049)
@@ -101,7 +101,7 @@
try {
QueryResult.serialize(row, result, SaxonXQueryExpression.DEFAULT_OUTPU=
T_PROPERTIES);
} catch (XPathException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30310, e);
+ throw new TeiidRuntimeException(e);
}
}
}
@@ -271,7 +271,7 @@
try {
leftValue =3D evaluate(criteria.getLeftExpression(), tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30314, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30314, "left", crite=
ria)); //$NON-NLS-1$
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30312, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30312, "left", crite=
ria)); //$NON-NLS-1$
}
=
// Shortcut if null
@@ -284,7 +284,7 @@
try {
rightValue =3D evaluate(criteria.getRightExpression(), tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30314, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30314, "right", crit=
eria)); //$NON-NLS-1$
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30312, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30312, "right", crit=
eria)); //$NON-NLS-1$
}
=
// Shortcut if null
@@ -305,7 +305,7 @@
try {
value =3D evaluate(criteria.getLeftExpression(), tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30315, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30315, "left", crite=
ria)); //$NON-NLS-1$
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30312, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30312, "left", crite=
ria)); //$NON-NLS-1$
}
=
// Shortcut if null
@@ -330,7 +330,7 @@
try {
rightValue =3D (String) evaluate(criteria.getRightExpression(), tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30315, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30315, "right", crit=
eria)); //$NON-NLS-1$
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30312, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30312, "right", crit=
eria)); //$NON-NLS-1$
}
=
// Shortcut if null
@@ -935,7 +935,7 @@
return internalEvaluate(expr.getThenExpression(i), tuple);
}
} catch (ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TE=
IID30340, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30340, "CASE", expr=
.getWhenCriteria(i))); //$NON-NLS-1$
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TE=
IID30346, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30346, "CASE", expr=
.getWhenCriteria(i))); //$NON-NLS-1$
}
}
if (expr.getElseExpression() !=3D null) {
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/function/Func=
tionMethods.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionMe=
thods.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionMe=
thods.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -237,22 +237,15 @@
=
// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Function =3D=
rand=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=
- public static Object rand(CommandContext context, Object seed) throws =
FunctionExecutionException { =
- if(context !=3D null) {
- if(seed =3D=3D null) {
- return new Double(context.getNextRand());
- } else if(seed instanceof Integer) {
- return new Double(context.getNextRand(((Integer)seed).long=
Value()));
- }
- }
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30393=
, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30393, "rand", seed)); //$NON-=
NLS-1$
+ public static Object rand(CommandContext context, Integer seed) { =
=
+ if(seed =3D=3D null) {
+ return new Double(context.getNextRand());
+ } =
+ return new Double(context.getNextRand(seed.longValue()));
}
=
- public static Object rand(CommandContext context) throws FunctionExecu=
tionException {
- if(context !=3D null) {
- return new Double(context.getNextRand());
- }
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30394=
, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30394, "rand"));//$NON-NLS-1$
+ public static Object rand(CommandContext context) {
+ return new Double(context.getNextRand());
}
=
// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Function =3D mo=
d =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
@@ -462,12 +455,11 @@
=
// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Function =3D qu=
arter =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=
- public static Object quarter(Date date)
- throws FunctionExecutionException {
+ public static Object quarter(Date date) {
int month =3D getField(date, Calendar.MONTH);
=
if (month > 11) {
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30395, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30395, "quarter", date.getClass().g=
etName())); //$NON-NLS-1$
+ throw new AssertionError("Invalid month for " + date); //$NON-NLS-1$
}
return Integer.valueOf(month/3 + 1);
}
@@ -667,7 +659,7 @@
throws FunctionExecutionException {
int countValue =3D count.intValue();
if(countValue < 0) {
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID3=
0397, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30397, countValue));
+ throw new FunctionExecutionException(QueryPlugin.Event.TEIID3=
0396, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30396, countValue));
} else if(string.length() < countValue) {
return string;
} else {
@@ -1032,7 +1024,7 @@
public static Object rowlimitexception(Object expression)
throws FunctionExecutionException {
=
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30408=
, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30408));
+ throw new FunctionExecutionException(QueryPlugin.Event.TEIID30407=
, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30407));
} =
=
// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Function =3D=
lookup =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
@@ -1432,7 +1424,7 @@
if (array instanceof java.sql.Array) {
return Array.getLength(((java.sql.Array)array).getArray());
}
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30417, Quer=
yPlugin.Util.gs(QueryPlugin.Event.TEIID30417, array.getClass()));
+ throw new FunctionExecutionException(QueryPlugin.Event.TEIID30416, Quer=
yPlugin.Util.gs(QueryPlugin.Event.TEIID30416, array.getClass()));
}
=
}
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/xml/M=
appingChoiceNode.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/xml/Mapping=
ChoiceNode.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/xml/Mapping=
ChoiceNode.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -90,18 +90,18 @@
}
=
public MappingChoiceNode addChoiceNode(MappingChoiceNode elem) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30453, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30453));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30452, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30452));
}
=
public MappingSequenceNode addSequenceNode(MappingSequenceNode elem) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30454, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30454));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30452, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30452));
}
=
public MappingElement addChildElement(MappingElement elem) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30455, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30455));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30452, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30452));
} =
=
public MappingSourceNode addSourceNode(MappingSourceNode elem) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30456, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30456));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30452, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30452));
} =
}
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/xml/M=
appingDocument.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/xml/Mapping=
Document.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/xml/Mapping=
Document.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -23,6 +23,7 @@
package org.teiid.query.mapping.xml;
=
import org.teiid.core.TeiidRuntimeException;
+import org.teiid.core.util.Assertion;
import org.teiid.query.QueryPlugin;
=
=
@@ -120,30 +121,26 @@
} =
=
public MappingAllNode addAllNode(MappingAllNode elem) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30458, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30458));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30452, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30452));
}
=
public MappingChoiceNode addChoiceNode(MappingChoiceNode elem) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30459, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30459));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30452, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30452));
}
=
public MappingSequenceNode addSequenceNode(MappingSequenceNode elem) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30460, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30460));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30452, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30452));
}
=
public MappingElement addChildElement(MappingElement elem) {
- if (elem =3D=3D null) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30461,=
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30461));
- } =
+ Assertion.isNotNull(elem);
fixCardinality(elem);
setRoot(elem);
return elem;
} =
=
public MappingSourceNode addSourceNode(MappingSourceNode elem) {
- if (elem =3D=3D null) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30462,=
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30462));
- }
+ Assertion.isNotNull(elem);
setRoot(elem);
return elem;
}
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/rel=
ational/RelationalPlanner.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relationa=
l/RelationalPlanner.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relationa=
l/RelationalPlanner.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -649,10 +649,10 @@
} else if (subqueryContainer instanceof ExistsCriteria) {
((ExistsCriteria) subqueryContainer).setShouldEvaluate(true);
} else {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30255, Query=
Plugin.Util.gs(QueryPlugin.Event.TEIID30255, container));
+ throw new QueryPlannerException(QueryPlugin.Event.TEIID30253, Query=
Plugin.Util.gs(QueryPlugin.Event.TEIID30253, container));
}
} else {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30256, QueryP=
lugin.Util.gs(QueryPlugin.Event.TEIID30256, container));
+ throw new QueryPlannerException(QueryPlugin.Event.TEIID30253, QueryP=
lugin.Util.gs(QueryPlugin.Event.TEIID30253, container));
}
}
ProcessorPlan plan =3D QueryOptimizer.optimizePlan(subqueryContainer.ge=
tCommand(), metadata, null, capFinder, analysisRecord, context);
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/rel=
ational/rules/RulePlanJoins.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relationa=
l/rules/RulePlanJoins.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relationa=
l/rules/RulePlanJoins.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -22,16 +22,7 @@
=
package org.teiid.query.optimizer.relational.rules;
=
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
=
import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.api.exception.query.QueryPlannerException;
@@ -376,7 +367,7 @@
private void planForDependencies(JoinRegion joinRegion) throws QueryPl=
annerException {
=
if (joinRegion.getJoinSourceNodes().isEmpty()) {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30276,=
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30276, joinRegion.getUnsatisfie=
dAccessPatterns()));
+ throw new QueryPlannerException(QueryPlugin.Event.TEIID30275,=
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30275, joinRegion.getUnsatisfie=
dAccessPatterns()));
}
=
HashSet currentGroups =3D new HashSet();
@@ -435,7 +426,7 @@
}
=
if (!dependentNodes.isEmpty()) {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30277,=
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30277, joinRegion.getUnsatisfie=
dAccessPatterns()));
+ throw new QueryPlannerException(QueryPlugin.Event.TEIID30275,=
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30275, joinRegion.getUnsatisfie=
dAccessPatterns()));
}
=
}
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml=
/NameInSourceResolverVisitor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml/NameI=
nSourceResolverVisitor.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml/NameI=
nSourceResolverVisitor.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -31,7 +31,6 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.types.DataTypeManager;
-import org.teiid.query.QueryPlugin;
import org.teiid.query.mapping.xml.MappingAttribute;
import org.teiid.query.mapping.xml.MappingDocument;
import org.teiid.query.mapping.xml.MappingElement;
@@ -118,9 +117,9 @@
symbol.setType(DataTypeManager.getDataTypeClass(metadata.getEl=
ementType(symbol.getMetadataID())));
return symbol;
} catch (QueryMetadataException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30279,=
e);
+ throw new TeiidRuntimeException(e);
} catch (TeiidComponentException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30280,=
e);
+ throw new TeiidRuntimeException(e);
}
}
=
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml=
/SourceNodePlannerVisitor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml/Sourc=
eNodePlannerVisitor.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml/Sourc=
eNodePlannerVisitor.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -33,7 +33,6 @@
import org.teiid.api.exception.query.QueryPlannerException;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidRuntimeException;
-import org.teiid.query.QueryPlugin;
import org.teiid.query.mapping.relational.QueryNode;
import org.teiid.query.mapping.xml.MappingDocument;
import org.teiid.query.mapping.xml.MappingNode;
@@ -184,7 +183,7 @@
baseQuery.setCriteria(inputSetCriteria);
rsInfo.setCriteriaRaised(true);
} catch (Exception e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30289,=
e);
+ throw new TeiidRuntimeException(e);
} =
}
=
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml=
/ValidateMappedCriteriaVisitor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml/Valid=
ateMappedCriteriaVisitor.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml/Valid=
ateMappedCriteriaVisitor.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -28,7 +28,6 @@
import org.teiid.api.exception.query.QueryPlannerException;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidRuntimeException;
-import org.teiid.query.QueryPlugin;
import org.teiid.query.mapping.xml.MappingCriteriaNode;
import org.teiid.query.mapping.xml.MappingDocument;
import org.teiid.query.mapping.xml.MappingRecursiveElement;
@@ -76,7 +75,7 @@
ResolverVisitor.resolveLanguageObject(crit, null, planEnv.=
getGlobalMetadata());
return crit;
} catch (Exception e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30=
290, e);
+ throw new TeiidRuntimeException(e);
}
}
return null;
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml=
/XMLPlanner.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPl=
anner.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPl=
anner.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -293,7 +293,7 @@
// in the orderby. static nodes do not qualify for ordering.
if (elementNode.getNameInSource() =3D=3D null){
Object[] params =3D new Object[] {elementNode, orderBy};
- String msg =3D QueryPlugin.Util.getString("XMLPlanner.The_=
XML_document_element_{0}_is_not_mapped_to_data_and_cannot_be_used_in_the_OR=
DER_BY_clause__{1}_1", params); //$NON-NLS-1$
+ String msg =3D QueryPlugin.Util.gs(QueryPlugin.Event.TEIID=
30288, params);
throw new QueryPlannerException(QueryPlugin.Event.TEIID30=
288, msg);
}
=
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml=
/XMLProjectionMinimizer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPr=
ojectionMinimizer.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPr=
ojectionMinimizer.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -31,7 +31,6 @@
=
import org.teiid.core.TeiidException;
import org.teiid.core.TeiidRuntimeException;
-import org.teiid.query.QueryPlugin;
import org.teiid.query.mapping.relational.QueryNode;
import org.teiid.query.mapping.xml.MappingAttribute;
import org.teiid.query.mapping.xml.MappingCriteriaNode;
@@ -104,7 +103,7 @@
MappingSourceNode parent =3D element.getParentSourceNode(=
);
collectElementSymbols(element, bindings, parent);
} catch (TeiidException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30298, e);
+ throw new TeiidRuntimeException(e);
}
}
=
@@ -176,7 +175,7 @@
}
}
} catch (TeiidException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30299, e);
+ throw new TeiidRuntimeException(e);
}
}
=
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml=
/XMLQueryPlanner.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLQu=
eryPlanner.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLQu=
eryPlanner.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -106,7 +106,7 @@
}
=
} catch (Exception e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEI=
ID30292, e);
+ throw new TeiidRuntimeException(e);
} =
} =
=
@@ -132,7 +132,7 @@
ProcessorPlan queryPlan =3D optimizePlan(cmd, planEnv);
rsInfo.setPlan(queryPlan); =
} catch (Exception e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEI=
ID30293, e);
+ throw new TeiidRuntimeException(e);
}
}
};
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml=
/XMLStagaingQueryPlanner.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLSt=
againgQueryPlanner.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLSt=
againgQueryPlanner.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -38,7 +38,6 @@
import org.teiid.core.TeiidRuntimeException;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.query.QueryPlugin;
import org.teiid.query.mapping.relational.QueryNode;
import org.teiid.query.mapping.xml.MappingBaseNode;
import org.teiid.query.mapping.xml.MappingDocument;
@@ -53,17 +52,7 @@
import org.teiid.query.resolver.QueryResolver;
import org.teiid.query.resolver.util.ResolverUtil;
import org.teiid.query.resolver.util.ResolverVisitor;
-import org.teiid.query.sql.lang.Command;
-import org.teiid.query.sql.lang.CompareCriteria;
-import org.teiid.query.sql.lang.Criteria;
-import org.teiid.query.sql.lang.ExistsCriteria;
-import org.teiid.query.sql.lang.From;
-import org.teiid.query.sql.lang.GroupBy;
-import org.teiid.query.sql.lang.Insert;
-import org.teiid.query.sql.lang.Option;
-import org.teiid.query.sql.lang.Query;
-import org.teiid.query.sql.lang.Select;
-import org.teiid.query.sql.lang.UnaryFromClause;
+import org.teiid.query.sql.lang.*;
import org.teiid.query.sql.symbol.Constant;
import org.teiid.query.sql.symbol.ElementSymbol;
import org.teiid.query.sql.symbol.Expression;
@@ -87,7 +76,7 @@
try {
stagePlannedQuery(sourceNode, planEnv);
} catch (Exception e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEI=
ID30291, e);
+ throw new TeiidRuntimeException(e);
}
}
};
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/parser/QueryP=
arser.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/parser/QueryParser.=
java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/parser/QueryParser.=
java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -148,7 +148,7 @@
throw convertParserException(pe);
} catch(TokenMgrError tme) {
if(sql.startsWith(XML_OPEN_BRACKET) || sql.startsWith(XQUERY_DECL=
ARE)) {
- throw new QueryParserException(QueryPlugin.Event.TEIID30379,=
tme, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30379, sql));
+ throw new QueryParserException(QueryPlugin.Event.TEIID30378,=
tme, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30378, sql));
}
throw handleTokenMgrError(tme);
}
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/processor/Ddl=
Plan.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.j=
ava 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.j=
ava 2012-05-02 17:00:12 UTC (rev 4049)
@@ -99,14 +99,14 @@
if (obj.getEnabled() =3D=3D null) {
if (obj.isCreate()) {
if (getPlanForEvent(t, event) !=3D null) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30156,=
new TeiidProcessingException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30=
156, t.getName(), obj.getEvent())));
+ throw new TeiidRuntimeException(new TeiidProcessingException(=
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30156, t.getName(), obj.getEvent=
())));
}
} else if (getPlanForEvent(t, event) =3D=3D null) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30158, new=
TeiidProcessingException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30158,=
t.getName(), obj.getEvent())));
+ throw new TeiidRuntimeException(new TeiidProcessingException(Quer=
yPlugin.Util.gs(QueryPlugin.Event.TEIID30158, t.getName(), obj.getEvent()))=
);
}
sql =3D obj.getDefinition().toString();
} else if (getPlanForEvent(t, event) =3D=3D null) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30158, new Tei=
idProcessingException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30158, t.g=
etName(), obj.getEvent())));
+ throw new TeiidRuntimeException(new TeiidProcessingException(QueryPlu=
gin.Util.gs(QueryPlugin.Event.TEIID30158, t.getName(), obj.getEvent())));
}
if (getMetadataRepository(vdb, t.getParent().getName()) !=3D null) {
if (sql !=3D null) {
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/processor/pro=
c/ErrorInstruction.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/processor/proc/Erro=
rInstruction.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/processor/proc/Erro=
rInstruction.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -22,7 +22,7 @@
=
package org.teiid.query.processor.proc;
=
-import static org.teiid.query.analysis.AnalysisRecord.PROP_EXPRESSION;
+import static org.teiid.query.analysis.AnalysisRecord.*;
=
import org.teiid.client.ProcedureErrorInstructionException;
import org.teiid.client.plan.PlanNode;
@@ -77,7 +77,7 @@
TeiidProcessingException {
Object value =3D env.evaluateExpression(expression);
LogManager.logTrace(org.teiid.logging.LogConstants.CTX_DQP, ne=
w Object[] {"Processing RaiseErrorInstruction with the value :", value}); /=
/$NON-NLS-1$ =
- throw new ProcedureErrorInstructionException(QueryPlugin.Event.TE=
IID30167, ERROR_PREFIX + (value !=3D null ? value.toString() : ""));
+ throw new ProcedureErrorInstructionException(QueryPlugin.Event.TE=
IID30167, ERROR_PREFIX + (value !=3D null ? value.toString() : "")); //$NON=
-NLS-1$ =
}
=
}
\ No newline at end of file
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/processor/rel=
ational/XMLTableNode.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/processor/relationa=
l/XMLTableNode.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/processor/relationa=
l/XMLTableNode.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -332,7 +332,7 @@
this.notifyAll();
}
} catch (TeiidException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30173, e);
+ throw new TeiidRuntimeException(e);
}
}
=
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/processor/xml=
/NodeDescriptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/processor/xml/NodeD=
escriptor.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/processor/xml/NodeD=
escriptor.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -287,7 +287,7 @@
} else if(namespacePrefix.equals(MappingNodeConstants.INSTANCE=
S_NAMESPACE_PREFIX)) {
uri =3D MappingNodeConstants.INSTANCES_NAMESPACE;
}else {
- String msg =3D QueryPlugin.Util.getString("XMLPlanner.no_u=
ri", new Object[] {namespacePrefix, name}); //$NON-NLS-1$
+ String msg =3D QueryPlugin.Util.gs(QueryPlugin.Event.TEIID=
30213, new Object[] {namespacePrefix, name}); //$NON-NLS-1$
throw new TeiidComponentException(QueryPlugin.Event.TEIID=
30213, msg);
}
}
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/processor/xml=
/XMLContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/processor/xml/XMLCo=
ntext.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/processor/xml/XMLCo=
ntext.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -77,13 +77,7 @@
* @return
*/
public List getCurrentRow(String aliasResultName) throws TeiidCompo=
nentException, TeiidProcessingException {
- PlanExecutor executor =3D this.resultsMap.get(aliasResultName);
- if (executor =3D=3D null) {
- if (this.parentContext !=3D null) {
- return this.parentContext.getCurrentRow(aliasResultName);
- }
- throw new TeiidComponentException(QueryPlugin.Event.TEIID3021=
4, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30214, aliasResultName));
- }
+ PlanExecutor executor =3D getExecutor(aliasResultName);
return executor.currentRow();
}
=
@@ -94,13 +88,7 @@
* @throws TeiidComponentException
*/
public List getNextRow(String aliasResultName) throws TeiidComponen=
tException, TeiidProcessingException {
- PlanExecutor executor =3D this.resultsMap.get(aliasResultName);
- if (executor =3D=3D null) {
- if (this.parentContext !=3D null) {
- return this.parentContext.getNextRow(aliasResultName);
- }
- throw new TeiidComponentException(QueryPlugin.Event.TEIID3021=
5, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30215, aliasResultName));
- }
+ PlanExecutor executor =3D getExecutor(aliasResultName);
return executor.nextRow();
}
=
@@ -132,15 +120,21 @@
* @throws TeiidComponentException
*/
public List getOutputElements(String resultName) throws TeiidCompon=
entException {
- PlanExecutor executor =3D this.resultsMap.get(resultName);
+ PlanExecutor executor =3D getExecutor(resultName);
+ return executor.getOutputElements(); =
+ }
+
+ private PlanExecutor getExecutor(String resultName)
+ throws TeiidComponentException {
+ PlanExecutor executor =3D this.resultsMap.get(resultName);
if (executor =3D=3D null) {
if (this.parentContext !=3D null) {
- return this.parentContext.getOutputElements(resultName);
+ return this.parentContext.getExecutor(resultName);
}
throw new TeiidComponentException(QueryPlugin.Event.TEIID3021=
6, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30216, resultName));
}
- return executor.getOutputElements(); =
- }
+ return executor;
+ }
=
=
/**
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/comm=
and/SimpleQueryResolver.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/command/Si=
mpleQueryResolver.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/command/Si=
mpleQueryResolver.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -210,7 +210,7 @@
try {
ResolverUtil.resolveGroup(obj, metadata);
} catch (TeiidException err) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30=
104, err);
+ throw new TeiidRuntimeException(err);
}
}
=
@@ -223,7 +223,7 @@
try {
QueryResolver.resolveCommand(command, metadata.getMetadata=
(), false);
} catch (TeiidException err) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30=
105, err);
+ throw new TeiidRuntimeException(err);
}
}
=
@@ -240,7 +240,7 @@
}
obj.setElementSymbols(elementSymbols);
} catch (TeiidException err) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30=
106, err);
+ throw new TeiidRuntimeException(err);
} =
}
=
@@ -288,7 +288,7 @@
try {
obj.setFile(ResolverUtil.convertExpression(obj.getFile(), DataTypeMana=
ger.DefaultDataTypes.CLOB, metadata));
} catch (QueryResolverException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30107, e);
+ throw new TeiidRuntimeException(e);
}
postTableFunctionReference(obj, saved);
//set to fixed width if any column has width specified
@@ -324,7 +324,7 @@
column.setDefaultExpression(ex);
}
} catch (TeiidException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30108, e);
+ throw new TeiidRuntimeException(e);
}
}
=
@@ -357,7 +357,7 @@
try {
ResolverUtil.addTempGroup(metadata, obj.getGroupSymbol(), =
obj.getProjectedSymbols(), false);
} catch (QueryResolverException err) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30=
109, err);
+ throw new TeiidRuntimeException(err);
}
obj.getGroupSymbol().setMetadataID(metadata.getMetadataStore()=
.getTempGroupID(obj.getGroupSymbol().getName()));
//now resolve the projected symbols
@@ -367,7 +367,7 @@
try {
ResolverVisitor.resolveLanguageObject(symbol, groups, null, metadata);
} catch (TeiidException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30110, e);
+ throw new TeiidRuntimeException(e);
} =
}
}
@@ -383,7 +383,7 @@
try {
ResolverUtil.addTempGroup(metadata, obj.getGroupSymbol(), =
obj.getCommand().getProjectedSymbols(), false);
} catch (QueryResolverException err) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30=
111, err);
+ throw new TeiidRuntimeException(err);
}
obj.getGroupSymbol().setMetadataID(metadata.getMetadataStore()=
.getTempGroupID(obj.getGroupSymbol().getName())); =
}
@@ -400,7 +400,7 @@
createProcRelational(obj);
}
} catch(TeiidException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30=
113, e);
+ throw new TeiidRuntimeException(e);
}
}
=
@@ -524,9 +524,9 @@
for (GroupSymbol group : discoveredGroups) {
if (!this.currentGroups.add(group)) {
String msg =3D QueryPlugin.Util.getString("ERR.015.008.00=
46", group.getName()); //$NON-NLS-1$
- QueryResolverException qre =3D new QueryResolverException=
(msg);
+ QueryResolverException qre =3D new QueryResolverException=
(QueryPlugin.Event.TEIID30115, msg);
qre.addUnresolvedSymbol(new UnresolvedSymbolDescription(g=
roup.toString(), msg));
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID3=
0115, qre);
+ throw new TeiidRuntimeException(qre);
}
}
discoveredGroups.clear();
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/comm=
and/TempTableResolver.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/command/Te=
mpTableResolver.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/command/Te=
mpTableResolver.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -73,13 +73,13 @@
throw new QueryResolverException(QueryPlugin.Event.TEIID3=
0118, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30118, group.getName()));
}
if (metadata.getMetadata().hasProcedure(group.getName())) {
- throw new QueryResolverException(QueryPlugin.Event.TEIID30119, =
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30119, group.getName()));
+ throw new QueryResolverException(QueryPlugin.Event.TEIID30118, =
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30118, group.getName()));
}
=
//now we will be more specific for temp groups
TempMetadataID id =3D metadata.getMetadataStore().getTempGroup=
ID(group.getName());
if (id !=3D null && !metadata.isTemporaryTable(id)) {
- throw new QueryResolverException(QueryPlugin.Event.TEIID3=
0120, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30120, group.getName()));
+ throw new QueryResolverException(QueryPlugin.Event.TEIID3=
0118, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30118, group.getName()));
}
//if we get here then either the group does not exist or has a=
lready been defined as a temp table
//if it has been defined as a temp table, that's ok we'll use =
this as the new definition and throw an
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/comm=
and/UpdateProcedureResolver.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/command/Up=
dateProcedureResolver.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/command/Up=
dateProcedureResolver.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -203,7 +203,7 @@
AssignmentStatement assStmt =3D (AssignmentStatement)stat=
ement;
ResolverVisitor.resolveLanguageObject(assStmt.getVaria=
ble(), null, externalGroups, metadata);
if (!metadata.elementSupports(assStmt.getVariable().ge=
tMetadataID(), SupportConstants.Element.UPDATE)) {
- throw new QueryResolverException(QueryPlugin.Even=
t.TEIID30122, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30122, assStmt.get=
Variable()));
+ throw new QueryResolverException(QueryPlugin.Even=
t.TEIID30121, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30121, assStmt.get=
Variable()));
}
//don't allow variable assignments to be external
assStmt.getVariable().setIsExternalReference(false);
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/comm=
and/XMLQueryResolver.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/command/XM=
LQueryResolver.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/command/XM=
LQueryResolver.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -295,7 +295,7 @@
try {
ResolverUtil.addTempGroup(metadata, new GroupSymbol(baseNode.getFull=
yQualifiedName()), Collections.EMPTY_LIST, false).setMetadataType(Type.XML);
} catch (QueryResolverException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30132, e);
+ throw new TeiidRuntimeException(e);
}
}
}
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/util=
/ResolverVisitor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/util/Resol=
verVisitor.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/util/Resol=
verVisitor.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -672,7 +672,7 @@
=
if (commonType =3D=3D null) {
// Neither are aggs, but types can't be reconciled
- throw new QueryResolverException(QueryPlugin.Event.TEIID30073, Q=
ueryPlugin.Util.gs(QueryPlugin.Event.TEIID30073, new Object[] { leftTypeNam=
e, rightTypeName, ccrit }));
+ throw new QueryResolverException(QueryPlugin.Event.TEIID30072, Q=
ueryPlugin.Util.gs(QueryPlugin.Event.TEIID30072, new Object[] { leftTypeNam=
e, rightTypeName, ccrit }));
}
ccrit.setLeftExpression(ResolverUtil.convertExpression(leftExpression, l=
eftTypeName, commonType, metadata) );
ccrit.setRightExpression(ResolverUtil.convertExpression(rightExpression,=
rightTypeName, commonType, metadata) );
@@ -855,7 +855,7 @@
}
String thenTypeName =3D ResolverUtil.getCommonType((String[])thenType=
Names.toArray(new String[thenTypeNames.size()]));
if (thenTypeName =3D=3D null) {
- throw new QueryResolverException(QueryPlugin.Event.TEIID30080, Q=
ueryPlugin.Util.gs(QueryPlugin.Event.TEIID30080, "THEN/ELSE", obj));//$NON-=
NLS-1$
+ throw new QueryResolverException(QueryPlugin.Event.TEIID30079, Q=
ueryPlugin.Util.gs(QueryPlugin.Event.TEIID30079, "THEN/ELSE", obj));//$NON-=
NLS-1$
}
obj.setExpression(ResolverUtil.convertExpression(obj.getExpression(),=
whenTypeName, metadata));
ArrayList whens =3D new ArrayList(whenCount);
@@ -941,7 +941,7 @@
// 3. Perform implicit type conversions
String thenTypeName =3D ResolverUtil.getCommonType(thenTypeNames.toAr=
ray(new String[thenTypeNames.size()]));
if (thenTypeName =3D=3D null) {
- throw new QueryResolverException(QueryPlugin.Event.TEIID30081, Q=
ueryPlugin.Util.gs(QueryPlugin.Event.TEIID30081, "THEN/ELSE", obj)); //$NON=
-NLS-1$
+ throw new QueryResolverException(QueryPlugin.Event.TEIID30079, Q=
ueryPlugin.Util.gs(QueryPlugin.Event.TEIID30079, "THEN/ELSE", obj)); //$NON=
-NLS-1$
}
ArrayList thens =3D new ArrayList(whenCount);
for (int i =3D 0; i < whenCount; i++) {
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/rewriter/Quer=
yRewriter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewri=
ter.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewri=
ter.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -541,7 +541,7 @@
try {
return rewriteExpressionDirect(element);
} catch (TeiidException err) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEI=
ID30368, err);
+ throw new TeiidRuntimeException(err);
}
}
};
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/sql/lang/Matc=
hCriteria.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/sql/lang/MatchCrite=
ria.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/sql/lang/MatchCrite=
ria.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -340,7 +340,7 @@
}
=
if (escaped) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TE=
IID30450, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30450, new Object[] {p=
attern, new Character(escape)}));
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TE=
IID30449, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30449, new Object[] {p=
attern, new Character(escape)}));
}
=
if (!endsWithMatchAny) {
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/tempdata/Temp=
TableStore.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/java/org/teiid/query/tempdata/TempTableS=
tore.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/tempdata/TempTableS=
tore.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -336,7 +336,7 @@
return tempTable;
}
} else if (tempTable.getActive().get() !=3D 0) {
- throw new TeiidProcessingException(QueryPlugin.Event.TEIID302=
28, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30228, tempTableID));
+ throw new TeiidProcessingException(QueryPlugin.Event.TEIID302=
27, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30227, tempTableID));
}
}
} else if (transactionMode =3D=3D TransactionMode.ISOLATE_READS) {
Modified: branches/8.0.x/engine/src/main/resources/org/teiid/query/i18n.pro=
perties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/main/resources/org/teiid/query/i18n.propertie=
s 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/main/resources/org/teiid/query/i18n.propertie=
s 2012-05-02 17:00:12 UTC (rev 4049)
@@ -29,15 +29,13 @@
TEIID30384=3DError while evaluating function {0}
TEIID30385=3DUnable to access function implementation for [{0}]
ERR.015.001.0005=3DERROR loading system functions: {0}
-TEIID30397=3DLeft count is invalid: {0}
TEIID30402=3DPad length must be > 0.
TEIID30403=3DPad string for lpad/rpad must have length greater than 0.
TEIID30404=3DSource and destination character lists must be the same lengt=
h.
TEIID30405=3DError converting [{0}] of type {1} to type {2}
TEIID30406=3DThe context function may only be used in XML queries.
-TEIID30408=3DThe rowlimit and rowlimitexception functions may only be used=
in XML queries.
TEIID30411=3DIllegal argument for formating: {0}
-TEIID30412=3DParse Exception occurs for executing: {0} {1}
+TEIID30412=3DCould not parse number using format: {0} {1}
ERR.015.001.0044=3DFunction metadata source is of invalid type: {0}
TEIID30011=3DThe function "{0}" will not be added because a function with =
the same name and signature already exists.
TEIID30389=3DUnexpected exception while loading "{1}.{2}" for UDF "{0}"
@@ -74,16 +72,14 @@
QueryParser.lexicalError=3DLexical error: {0}
QueryParser.nullSqlExpr=3DParser cannot parse a null sql expression.
TEIID30378=3DDirect usage of XQuery is no longer supported, use XMLQUERY i=
nstead.
-TEIID30379=3DDirect usage of XQuery is no longer supported, use XMLQUERY i=
nstead.
=
# processor (006)
TEIID30311=3DUnknown criteria type: {0}
-TEIID30315=3DUnable to evaluate {0} expression of {1}
+TEIID30312=3DUnable to evaluate {0} expression of {1}
TEIID30325=3DUnknown compare criteria operator: {0}
TEIID30448=3DFailed to create regular expression from match pattern: {0}. =
{1}
TEIID30323=3DUnable to evaluate expression of {0}
TEIID30329=3DUnknown expression type: {0}
-TEIID30340=3DUnable to evaluate {0}: {1}
TEIID30342=3DUnable to evaluate LOOKUP function.
TEIID30326=3DUnknown subquery comparison predicate quantifier: {0}
TEIID30345=3DThe command of this scalar subquery returned more than one va=
lue: {0}
@@ -101,7 +97,6 @@
ERR.015.008.0022=3DFailed parsing reference binding: {0}
ERR.015.008.0025=3DBinding reference cannot be a function: {0}
TEIID30083=3DExpression ''{0}'' has a parameter with non-determinable type=
information. The use of an explicit convert may be necessary.
-TEIID30073=3DThe expressions in this criteria are being compared but are o=
f differing types ({0} and {1}) and no implicit conversion is available: {=
2}
TEIID30074=3DThis criteria must have string or CLOB expressions on each si=
de: {0}
TEIID30092=3DType cannot be null for expression: {0}
TEIID30078=3DThis criteria must have values only of the same type as the l=
eft expression: {0}
@@ -111,7 +106,6 @@
TEIID30068=3DThe function ''{0}'' is an unknown form. Check that the func=
tion name and number of arguments is correct.
TEIID30069=3DThe function ''{0}'' has more than one possible signature.
TEIID30071=3DThe conversion from {0} to {1} is not allowed.
-TEIID30068=3DThe function ''{0}'' is an unknown form. Check that the func=
tion name and number of arguments is correct.
TEIID30070=3DThe function ''{0}'' is a valid function form, but the argume=
nts do not match a known type signature and cannot be converted using impli=
cit type conversions.
TEIID30082=3DExpected value of type ''{0}'' but ''{1}'' is of type ''{2}''=
and no implicit conversion is available.
TEIID30084=3DElement ''{0}'' in ORDER BY is ambiguous and may refer to mor=
e than one element of SELECT clause.
@@ -127,12 +121,10 @@
TEIID30358=3DProcedure ''{0}'' is ambiguous, use the fully qualified name =
instead
ERR.015.008.0056=3DGroup does not exist
TEIID30143=3DUnable to resolve stored procedure {0} the datatype for the p=
arameter {1} is not specified.
-TEIID30099=3DUnable to resolve return element referred to by LOOKUP functi=
on: {0}
+TEIID30099=3DUnable to resolve key element referred to by LOOKUP function:=
{0}
TEIID30095=3DThe first three arguments for the LOOKUP function must be spe=
cified as constants.
TEIID30096=3DGroup {0} is not allowed in LOOKUP function.
TEIID30079=3DCould not find a common type to which all {0} expressions can=
be implicitly converted: {1}
-TEIID30080=3DCould not find a common type to which all {0} expressions can=
be implicitly converted: {1}
-TEIID30081=3DCould not find a common type to which all {0} expressions can=
be implicitly converted: {1}
TEIID30135=3DAliased Select Symbols are not valid in XML Queries.
TEIID30134=3DExpressions cannot be selected by XML Queries
TEIID30129=3DAliased subquery contexts are not allowed: {0}
@@ -241,7 +233,7 @@
TEIID30268=3DUnable to create a query plan that sends a criteria to \"{0}\=
". This connection factory requires criteria set to true indicating that a=
query against this model requires criteria.
TEIID30283=3DCould not resolve group symbol {0}
TEIID30306=3DThe criteria {0} has elements from the root staging table and=
the document nodes which is not allowed.
-TEIID30309=3DNo mapping node found named, ''{0}', in use of ''context''
+TEIID30309=3DNo mapping node found named, ''{0}'', in use of ''context''
TEIID30287=3DThe XML document element(s) {0} are not mapped to data and ca=
nnot be used in the criteria \"{1}\".
TEIID30281=3DCould not parse query transformation for {0}: {1}
TEIID30300=3DContext functions within the same conjunct refer to different=
contexts: {0}
@@ -276,7 +268,7 @@
SQLParser.Invalid_char=3D{0} value must be a single character: [{1}].
SQLParser.expected_non_reserved=3DExpected non-reserved word {0}, but was =
{1}.
SQLParser.invalid_window=3DCannot window a non-aggregate expression {0}.
-SQLParser.virtual_proc_def=3DVirtual procedure {0} must define the procedu=
re block after 'AS' keyword
+SQLParser.virtual_proc_def=3DVirtual procedure {0} must define the procedu=
re block after ''AS'' keyword
SQLParser.view_def=3DVirtual view {0} must be defined with a query express=
ion.
SQLParser.pk_exists=3DPrimary Key is already defined on {0}
SQLParser.no_column=3DColumn name {0} not found on table {1}
@@ -720,7 +712,6 @@
TEIID30133=3DIf any symbol in SELECT clause is ''xml'' or group.''xml'' , =
then no other element is allowed.
TEIID30123=3DThe datatype for the expression was not resolvable.
TEIID30117=3DCannot create temporary table "{0}". Local temporary tables m=
ust be created with unqualified names.
-TEIID30120=3DCannot create temporary table "{0}". An object with the same =
name already exists.
ValidationVisitor.drop_of_nontemptable=3DCannot drop a non temporary table=
"{0}". =
ValidationVisitor.orderby_expression_xml=3DXML queries cannot order by an =
expression.
ValidationVisitor.text_table_invalid_width=3DFor a fixed width text table,=
all columns must have width set.
@@ -745,10 +736,8 @@
ValidationVisitor.xmlparse_type=3DXMLPARSE expects a STRING, CLOB, or BLOB=
value.
ValidationVisitor.invalid_encoding=3DEncoding {0} is not valid.
ValidationVisitor.subquery_insert=3DSELECT INTO should not be used in a su=
bquery.
-TEIID30122=3DVariable "{0}" is read only and cannot be assigned a value.
MappingLoader.unknown_node_type=3DUnknown Node Type "{0}" being loaded by =
the XML mapping document.
MappingLoader.invalid_criteria_node=3DInvalid criteria node found; A crite=
ria node must have criteria specified or it must be a default node.
-TEIID30460=3DWrong type of child node is being added.
NoCriteria=3DFailed to add the node, because Criteria nodes must have "cri=
teria" value set on them, or they need to be the default node.
TEIID30462=3DRoot node assigned to a document can be null.
TEIID30457=3DFound recursive node {0} without recursive root node.
@@ -757,7 +746,6 @@
TEIID30155=3DColumn "{0}" has an invalid path expression: {1}
TEIID30151=3DError building Source for context item.
MappingLoader.invalidName=3DNull or blank name found in the Mapping Docume=
nt, Must have valid name. Re-build the VDB
-TEIID30450=3DInvalid escape sequence "{0}" with escape character "{1}"
QueryUtil.wrong_number_of_values=3DThe number of bound values ''{0}'' does=
not match the number of parameters ''{1}'' in the prepared statement.
QueryUtil.Error_executing_conversion_function_to_convert_value=3DError con=
verting parameter number {0} with value "{1}" to expected type {2}.
TEIID30128=3DCannot convert insert query expression projected symbol ''{0}=
'' of type {1} to insert column ''{2}'' of type {3}
@@ -769,8 +757,8 @@
=
TEIID30238=3DDuplicate key
TEIID30236=3DNull value is not allowed for column {0}
-ValidationVisitor.group_in_both_dep=3DTable specified in both dependent an=
d independent queries '{0}'
-XMLQuery.resolvingError=3DFailed to resolve the query '{0}'
+ValidationVisitor.group_in_both_dep=3DTable specified in both dependent an=
d independent queries ''{0}''
+XMLQuery.resolvingError=3DFailed to resolve the query ''{0}''
TEIID30085=3DInvalid order by at {0}
=
TEIID30367=3DInfinite loop detected, procedure will not be executed.
@@ -778,9 +766,9 @@
TEIID30244=3DThe batch contained an unrecognized command: {0}
TEIID30243=3DError while planning update procedure, unknown statement type=
encountered: {0}
TEIID30272=3DError getting modelID
-XMLPlanner.no_uri=3DCannot find namespace URI for namespace {0} of element=
{1}
+TEIID30213=3DCannot find namespace URI for namespace {0} of element {1}
=
-XMLPlanner.The_XML_document_element_{0}_is_not_mapped_to_data_and_cannot_b=
e_used_in_the_ORDER_BY_clause__{1}_1=3DThe XML document element {0} is not =
mapped to data and cannot be used in the ORDER BY clause: {1}
+TEIID30288=3DThe XML document element {0} is not mapped to data and cannot=
be used in the ORDER BY clause: {1}
XMLPlanner.The_rowlimit_parameter_{0}_is_not_in_the_scope_of_any_mapping_c=
lass=3DThe ''rowlimit'' or ''rowlimitexception'' function parameter ''{0}''=
is not an XML node within the scope of any mapping class.
XMLPlanner.Criteria_{0}_contains_conflicting_row_limits=3DThe criteria ''{=
0}'' contains conflicting row limits for an XML mapping class.
TEIID30174=3DFailed to rewrite the command: {0}
@@ -797,10 +785,8 @@
ExecDynamicSqlInstruction.6=3DThe datatype ''{0}'' for element ''{1}'' in =
the dynamic SQL cannot be implicitly converted to ''{2}''.
TEIID30168=3DCouldn''t execute the dynamic SQL command "{0}" with the SQL =
statement "{1}" due to: {2}
=
-TEIID30277=3DJoin region with unsatisfied access patterns cannot be satisf=
ied by the join criteria, Access patterns: {0}
TEIID30229=3DTemporary table "{0}" already exists.
TEIID30226=3DTemporary table "{0}" does not exist.
-TEIID30228=3DTable {0} is locked by pending transaction update.
=
TEIID30295=3DCannot create a query for MappingClass with user criteria {0}
TEIID30296=3DConjunct "{0}" has no relationship with target context {1}.
@@ -841,7 +827,7 @@
TEIID30233=3D{0} does not target an internal materialized view.
TEIID30230=3DMaterialized view {0} cannot have a row refreshed since there=
is no primary key.
TEIID30231=3DMaterialized view {0} cannot have a row refreshed because it =
uses a composite key.
-TEIID30232=3DMaterialized view {0} cannot have a row refreshed because it'=
s cache hint did not specify \"updatable\".
+TEIID30232=3DMaterialized view {0} cannot have a row refreshed because it'=
's cache hint did not specify \"updatable\".
TEIID30012=3DRefreshing row {1} for materialized view {0}.
TEIID30303=3DNo root node found.
=
@@ -856,7 +842,7 @@
TEIID30005=3Drollback failed for requestID=3D{0}
ConnectorWorker.process_failed=3DConnector worker process failed for atomi=
c-request=3D{0}
TEIID30479=3DCould not process stored procedure results for {0}. Expected=
{1} result set columns, but was {2}. Please update your models to allow f=
or stored procedure results batching.
-TEIID30554=3DCould not obtain connection factory for model {0} in VDB name
+TEIID30554=3DA single source is not assigned to model {0} in VDB name {1}.=
{2}
TEIID30548=3DProperty value length exceeds max of {0}.
TEIID30549=3DCould not find a metadata record with uuid {0}.
TEIID30489=3DUnable to load metadata for VDB name
@@ -876,9 +862,9 @@
ERR.018.005.0095 =3D User <{0}> is not entitled to action <{1}> for 1 or m=
ore of the groups/elements/procedures.
=
# services (003)
-TEIID30032=3DWrong type of data found or no data found; expecting streamab=
le object from the buffer manager.
-TEIID30033=3DWrong type of data found or no data found; expecting streamab=
le object from the buffer manager.
-TEIID30034=3DWrong type of data found or no data found; expecting streamab=
le object from the buffer manager.
+TEIID30032=3DNo lob manager found.
+TEIID30033=3DNo existing lob reference found.
+TEIID30034=3DExpected lob to have a reference value.
TEIID30035=3DWrong type of data found or no data found; expecting streamab=
le object from the buffer manager.
TEIID30491=3DBind variables (represented as "?") were found but are allowe=
d only in prepared or callable statements.
Request.no_result_set=3DThe query does not return a result set.
@@ -890,7 +876,7 @@
TransactionServer.no_transaction=3DNo transaction found for client {0}.
TEIID30525=3DConcurrent enlistment in global transaction {0} is not suppor=
ted.
TEIID30521=3DExpected an existing global transaction {0} but there was non=
e for client {1}
-TEIID30520=3DUnknown flags
+TEIID30520=3DUnknown END flags
TEIID30521=3DNo global transaction found for {0}.
TEIID30524=3DClient is not currently enlisted in transaction {0}.
TEIID30518=3DCannot resume, transaction {0} was not suspended by client {1=
}.
@@ -927,14 +913,12 @@
TEIID30481=3DFailed to find the Connection Factory with JNDI name {0}. Ple=
ase check the name or deploy the Connection Factory with specified name.
TEIID31097=3DConnection Factory (no data source found) provided is null; C=
an not proceed with metadata load.
=
-TEIID30256=3DSource UPDATE or DELETE command "{0}" contains non-pushdown c=
onstructs and no compensating action can be taken as the table lacks a uniq=
ue key or the source does not support equality predicates.
TEIID30254=3DSource UPDATE or DELETE command "{0}" contains non-pushdown c=
onstructs that cannot be simplified into a compensating action.
=
Translate.error=3DCannot translate criteria "{0}", it is not matched by se=
lector "{1}"
=
TEIID30561=3DThe multisource plan must execute a procedure returning param=
eter values exactly 1: {0}
=
-TEIID30417=3DExpected a java.sql.Array, or java array type, but got: {0}
TEIID30546=3DUnknown log level: {0}, expected one of {1}
TEIID30415=3DArray index out of range: {0}
TEIID30190=3DCould not convert value for column: {0}
@@ -972,54 +956,40 @@
TEIID30269=3DUnexpected Exception
TEIID30153=3DCould not define global variable
=
-TEIID30072=3D The expressions in this criteria are being compared but are =
of differing types ({0} and {1}) and no implicit conversion is available: =
{2}
-TEIID30097=3D Unable to resolve return element referred to by LOOKUP funct=
ion: {0}
+TEIID30072=3D The expressions in this criteria are being compared but are =
of differing types ({0} and {1}) and no implicit conversion is available: {=
2}
+TEIID30097=3D Unable to resolve LOOKUP function group: {0}
TEIID30098=3D Unable to resolve return element referred to by LOOKUP funct=
ion: {0}
TEIID30118=3DCannot create temporary table "{0}". An object with the same =
name already exists.
-TEIID30119=3DCannot create temporary table "{0}". An object with the same =
name already exists.
TEIID30121=3DVariable "{0}" is read only and cannot be assigned a value.
TEIID30140=3D Incorrect number of parameters specified on the stored proce=
dure {2} - expected {0} but got {1}
TEIID30146=3D {1} is not allowed on the view {0}: a procedure must be defi=
ned to handle the {1}.
TEIID30183=3DText parse error: Non-whitespace character found between the =
qualifier and the delimiter in text line {0} in {1}.
TEIID30189=3DExpected a java.sql.Array, or java array type, but got: {0}
TEIID30191=3DArray index out of range: {0}
-TEIID30214=3DResults for the mapping class {0} are not found; =
-TEIID30215=3DResults for the mapping class {0} are not found; =
TEIID30227=3DTable {0} is locked by pending transaction update.
TEIID30240=3DCould not determine INSERT target for a partitioned UNION vie=
w {0} with values {1}.
TEIID30253=3DSource UPDATE or DELETE command "{0}" contains non-pushdown c=
onstructs and no compensating action can be taken as the table lacks a uniq=
ue key or the source does not support equality predicates. =
-TEIID30255=3DSource UPDATE or DELETE command "{0}" contains non-pushdown c=
onstructs and no compensating action can be taken as the table lacks a uniq=
ue key or the source does not support equality predicates. =
TEIID30275=3DJoin region with unsatisfied access patterns cannot be satisf=
ied by the join criteria, Access patterns: {0} =
-TEIID30276=3DJoin region with unsatisfied access patterns cannot be satisf=
ied by the join criteria, Access patterns: {0} =
TEIID30314=3DUnknown compare criteria operator: {0}
TEIID30346=3DUnable to evaluate {0}: {1}
TEIID30348=3DUnable to evaluate {0}: {1}
TEIID30349=3DUnable to evaluate {0}: {1}
-TEIID30375=3DThe specified change set {0} against an inherently updatable =
view does not map to a key preserving group.
+TEIID30375=3DThe specified insert variables {0} against an inherently upda=
table view does not map to a key preserving group.
TEIID30377=3DParser cannot parse an empty sql statement.
TEIID30390=3DUDF "{0}" method "{1}" must not return void.
TEIID30391=3DUDF "{0}" method "{1}" must be public.
TEIID30392=3DUDF "{0}" method "{1}" must be static.
-TEIID30393=3DUnknown type signature for evaluating function of: {0} ({1})
-TEIID30394=3DUnknown type signature for evaluating function of: {0} ({1})
-TEIID30395=3DUnknown type signature for evaluating function of: {0} ({1})
-TEIID30396=3DLeft count is invalid: {0}
+TEIID30396=3DLeft/Right count {0} is invalid. It must be >=3D 0.
TEIID30398=3D{0} value must be a single character: [{1}].
TEIID30407=3DThe rowlimit and rowlimitexception functions may only be used=
in XML queries.
-TEIID30409=3DIllegal argument for formating: {0}
-TEIID30410=3DParse Exception occurs for executing: {0} {1}
+TEIID30409=3DIllegal date format: {0}
+TEIID30410=3DCould not parse date using format: {0} {1}
TEIID30413=3DUnable to evaluate {0}: expected Properties for command paylo=
ad but got object of type {1}
TEIID30416=3DExpected a java.sql.Array, or java array type, but got: {0}
TEIID30431=3D{0} has invalid character: {1}
TEIID30449=3DInvalid escape sequence "{0}" with escape character "{1}"
TEIID30451=3DUnable to evaluate {0}: {1}
TEIID30452=3DWrong type of child node is being added.
-TEIID30453=3DWrong type of child node is being added.
-TEIID30454=3DWrong type of child node is being added.
-TEIID30455=3DWrong type of child node is being added.
-TEIID30456=3DWrong type of child node is being added.
-TEIID30458=3DWrong type of child node is being added.
-TEIID30459=3DWrong type of child node is being added.
TEIID30461=3DRoot node assigned to a document can be null.
TEIID30477=3DFailed to unwrap the source connection.
TEIID30563=3DThe request {0} has been cancelled.=3D=3D=3D=3D=3D=3D=3D
@@ -1027,7 +997,7 @@
TEIID30565=3DUsing collator for locale {0}
TEIID30499=3DNo sources were given for the model {0} =
TEIID30523=3DClient thread already involved in a transaction. Transaction =
nesting is not supported. The current transaction must be completed first.
-TEIID30519=3DUnknown flags
+TEIID30519=3DUnknown START flags
TransactionServer.existing_transaction=3DClient thread already involved in=
a transaction. Transaction nesting is not supported. The current transacti=
on must be completed first.
TEIID30517=3DClient thread already involved in a transaction. Transaction =
nesting is not supported. The current transaction must be completed first.
=
Modified: branches/8.0.x/engine/src/test/java/org/teiid/dqp/internal/proces=
s/TestTransactionServer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/test/java/org/teiid/dqp/internal/process/Test=
TransactionServer.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/test/java/org/teiid/dqp/internal/process/Test=
TransactionServer.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -35,7 +35,6 @@
import org.teiid.client.xa.XATransactionException;
import org.teiid.client.xa.XidImpl;
import org.teiid.common.queue.FakeWorkManager;
-import org.teiid.dqp.internal.process.TransactionServerImpl;
import org.teiid.dqp.service.TransactionContext;
=
public class TestTransactionServer {
@@ -234,7 +233,7 @@
server.start(THREAD1, XID1, Integer.MAX_VALUE, 100,false);
fail("exception expected"); //$NON-NLS-1$
} catch (XATransactionException ex) {
- assertEquals("Error Code:TEIID30519 Message:TEIID30519 Unknown=
flags", ex.getMessage()); //$NON-NLS-1$
+ assertEquals("Error Code:TEIID30519 Message:TEIID30519 Unknown=
START flags", ex.getMessage()); //$NON-NLS-1$
}
}
=
Modified: branches/8.0.x/engine/src/test/java/org/teiid/query/function/Test=
Function.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFuncti=
on.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFuncti=
on.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -1108,12 +1108,6 @@
Double d =3D (Double)FunctionMethods.rand(new CommandContext(), ne=
w Integer(100));
assertEquals(new Double(0.7220096548596434), d);
=
- try {
- FunctionMethods.rand(new CommandContext(), new Double(34.5));
- fail("should have failed to take a double"); //$NON-NLS-1$
- } catch (FunctionExecutionException e) { =
- } =
-
FunctionMethods.rand(new CommandContext()); =
}
=
Modified: branches/8.0.x/engine/src/test/java/org/teiid/query/processor/eva=
l/TestCriteriaEvaluator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/test/java/org/teiid/query/processor/eval/Test=
CriteriaEvaluator.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/test/java/org/teiid/query/processor/eval/Test=
CriteriaEvaluator.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -39,16 +39,7 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
import org.teiid.query.eval.Evaluator;
-import org.teiid.query.sql.lang.CollectionValueIterator;
-import org.teiid.query.sql.lang.CompareCriteria;
-import org.teiid.query.sql.lang.Criteria;
-import org.teiid.query.sql.lang.ExistsCriteria;
-import org.teiid.query.sql.lang.IsNullCriteria;
-import org.teiid.query.sql.lang.MatchCriteria;
-import org.teiid.query.sql.lang.Query;
-import org.teiid.query.sql.lang.SetCriteria;
-import org.teiid.query.sql.lang.SubqueryCompareCriteria;
-import org.teiid.query.sql.lang.SubqueryContainer;
+import org.teiid.query.sql.lang.*;
import org.teiid.query.sql.symbol.Constant;
import org.teiid.query.sql.symbol.ElementSymbol;
import org.teiid.query.sql.util.ValueIterator;
@@ -327,7 +318,7 @@
try {
helpTestMatch("abc", "a", 'a', true); //$NON-NLS-1$ //$NON-NLS=
-2$
} catch (ExpressionEvaluationException cee) {
- assertEquals("Error Code:TEIID30450 Message:TEIID30450 Invalid=
escape sequence \"a\" with escape character \"a\"", cee.getMessage()); //$=
NON-NLS-1$
+ assertEquals("Error Code:TEIID30449 Message:TEIID30449 Invalid=
escape sequence \"a\" with escape character \"a\"", cee.getMessage()); //$=
NON-NLS-1$
}
}
=
Modified: branches/8.0.x/engine/src/test/java/org/teiid/query/processor/xml=
/TestXMLProcessor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/test/java/org/teiid/query/processor/xml/TestX=
MLProcessor.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/test/java/org/teiid/query/processor/xml/TestX=
MLProcessor.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -3325,7 +3325,7 @@
"", metadata, dataMgr); //$NON-NLS-1$
fail("Should have failed with QueryPlannerException but didn't=
"); //$NON-NLS-1$
} catch (QueryPlannerException e) {
- String expectedMsg =3D "Error Code:TEIID30288 Message:The XML =
document element [element] name=3D'Suppliers' minOccurs=3D1 maxOccurs=3D1 i=
s not mapped to data and cannot be used in the ORDER BY clause: ORDER BY Su=
ppliers"; //$NON-NLS-1$
+ String expectedMsg =3D "Error Code:TEIID30288 Message:TEIID302=
88 The XML document element [element] name=3D'Suppliers' minOccurs=3D1 maxO=
ccurs=3D1 is not mapped to data and cannot be used in the ORDER BY clause: =
ORDER BY Suppliers"; //$NON-NLS-1$
assertEquals(expectedMsg, e.getMessage());
} =
} =
Modified: branches/8.0.x/engine/src/test/java/org/teiid/query/resolver/Test=
ProcedureResolving.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/test/java/org/teiid/query/resolver/TestProced=
ureResolving.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/test/java/org/teiid/query/resolver/TestProced=
ureResolving.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -855,7 +855,7 @@
=
String userUpdateStr =3D "UPDATE vm1.g1 SET e1=3D'x'"; //$NON-NLS-=
1$
=
- helpFailUpdateProcedure(proc.toString(), userUpdateStr, Table.Trig=
gerEvent.UPDATE, "Error Code:TEIID30120 Message:TEIID30120 Cannot create te=
mporary table \"loopCursor\". An object with the same name already exists."=
); //$NON-NLS-1$
+ helpFailUpdateProcedure(proc.toString(), userUpdateStr, Table.Trig=
gerEvent.UPDATE, "Error Code:TEIID30118 Message:TEIID30118 Cannot create te=
mporary table \"loopCursor\". An object with the same name already exists."=
); //$NON-NLS-1$
}
=
@Test public void testProcedureCreateDrop() {
Modified: branches/8.0.x/engine/src/test/java/org/teiid/query/resolver/Test=
Resolver.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/src/test/java/org/teiid/query/resolver/TestResolv=
er.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/engine/src/test/java/org/teiid/query/resolver/TestResolv=
er.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -1405,7 +1405,7 @@
} =
=
@Test public void testFailedConversion_defect9725() throws Exception{
- helpResolveException("select * from pm3.g1 where pm3.g1.e4 > {b 'true=
'}", "Error Code:TEIID30073 Message:TEIID30073 The expressions in this crit=
eria are being compared but are of differing types (timestamp and boolean) =
and no implicit conversion is available: pm3.g1.e4 > TRUE"); //$NON-NLS-1$=
//$NON-NLS-2$
+ helpResolveException("select * from pm3.g1 where pm3.g1.e4 > {b 'true=
'}", "Error Code:TEIID30072 Message:TEIID30072 The expressions in this crit=
eria are being compared but are of differing types (timestamp and boolean) =
and no implicit conversion is available: pm3.g1.e4 > TRUE"); //$NON-NLS-1$ =
//$NON-NLS-2$
} =
=
@Test public void testLookupFunction() { =
Modified: branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/In=
tegrationPlugin.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/Integrat=
ionPlugin.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/Integrat=
ionPlugin.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -84,13 +84,11 @@
TEIID50047,
TEIID50048,
TEIID50049,
- TEIID50050,
TEIID50051,
TEIID50054,
TEIID50055,
TEIID50056,
TEIID50057,
- TEIID50061,
TEIID50062,
TEIID50063,
TEIID50064,
Modified: branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/Te=
iidOperationHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/TeiidOpe=
rationHandler.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/TeiidOpe=
rationHandler.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -1039,12 +1039,8 @@
String mappedRole =3D operation.get(OperationsConstants.MAPPED_ROLE).asS=
tring();
=
try {
- DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy =3D VDBService.getPolicy(vdb, policyName);
=
- if (policy =3D=3D null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50050=
, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50050, policyName,=
vdb.getName(), vdb.getVersion()));
- } =
- =
policy.addMappedRoleName(mappedRole);
save(vdb);
} catch (AdminProcessingException e) {
@@ -1087,12 +1083,8 @@
String mappedRole =3D operation.get(OperationsConstants.MAPPED_ROLE).asS=
tring();
=
try {
- DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy =3D VDBService.getPolicy(vdb, policyName); =
=
- if (policy =3D=3D null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50051=
, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50051, policyName,=
vdb.getName(), vdb.getVersion()));
- } =
- =
policy.removeMappedRoleName(mappedRole);
save(vdb);
} catch (AdminProcessingException e) {
@@ -1130,12 +1122,8 @@
String policyName =3D operation.get(OperationsConstants.DATA_ROLE).asStr=
ing();
=
try {
- DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy =3D VDBService.getPolicy(vdb, policyName);
=
- if (policy =3D=3D null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50051=
, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50051, policyName,=
vdb.getName(), vdb.getVersion()));
- } =
- =
policy.setAnyAuthenticated(true);
save(vdb);
} catch (AdminProcessingException e) {
@@ -1170,12 +1158,8 @@
String policyName =3D operation.get(OperationsConstants.DATA_ROLE).asStr=
ing();
=
try {
- DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy =3D VDBService.getPolicy(vdb, policyName);
=
- if (policy =3D=3D null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50051=
, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50051, policyName,=
vdb.getName(), vdb.getVersion()));
- } =
- =
policy.setAnyAuthenticated(false);
save(vdb);
} catch (AdminProcessingException e) {
Modified: branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/VD=
BService.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/VDBServi=
ce.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/VDBServi=
ce.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -429,45 +429,29 @@
}
=
public void addDataRole(String policyName, String mappedRole) throws Admi=
nProcessingException{
- DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy =3D getPolicy(vdb, policyName); =
=
- if (policy =3D=3D null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50061,=
IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50061, policyName, =
this.vdb.getName(), this.vdb.getVersion()));
- } =
- =
policy.addMappedRoleName(mappedRole);
save();
}
=
public void remoteDataRole(String policyName, String mappedRole) throws A=
dminProcessingException{
- DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy =3D getPolicy(vdb, policyName);
=
- if (policy =3D=3D null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50061,=
IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50061, policyName, =
this.vdb.getName(), this.vdb.getVersion()));
- } =
- =
policy.removeMappedRoleName(mappedRole);
save();
} =
=
public void addAnyAuthenticated(String policyName) throws AdminProcessing=
Exception{
- DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy =3D getPolicy(vdb, policyName); =
=
- if (policy =3D=3D null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50061,=
IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50061, policyName, =
this.vdb.getName(), this.vdb.getVersion()));
- } =
- =
policy.setAnyAuthenticated(true);
save();
} =
=
public void removeAnyAuthenticated(String policyName) throws AdminProcess=
ingException{
- DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy =3D getPolicy(vdb, policyName);
=
- if (policy =3D=3D null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50061,=
IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50061, policyName, =
this.vdb.getName(), this.vdb.getVersion()));
- } =
- =
policy.setAnyAuthenticated(false);
save();
} =
@@ -504,6 +488,16 @@
}
}
=
+ static DataPolicyMetadata getPolicy(VDBMetaData vdb, String policyName)
+ throws AdminProcessingException {
+ DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
+ =
+ if (policy =3D=3D null) {
+ throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50051,=
IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50051, policyName, =
vdb.getName(), vdb.getVersion()));
+ }
+ return policy;
+ }
+
@SuppressWarnings("serial")
static class TranslatorNotFoundException extends TeiidException {
public TranslatorNotFoundException(String msg) {
Modified: branches/8.0.x/jboss-integration/src/main/resources/org/teiid/jbo=
ss/i18n.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/jboss-integration/src/main/resources/org/teiid/jboss/i18=
n.properties 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/jboss-integration/src/main/resources/org/teiid/jboss/i18=
n.properties 2012-05-02 17:00:12 UTC (rev 4049)
@@ -30,14 +30,12 @@
TEIID50002=3DTeiid Engine stopped {0}
TEIID50062=3DModel name "{0}" not found in the VDB with name "{1}" version=
"{2}"
TEIID50062=3DSource name "{0}" not found for model {1} in the VDB with nam=
e "{2}" version "{3}"
-TEIID50061=3DPolicy name "{0}" not found in the VDB with name "{1}" versio=
n "{2}"
TEIID50063=3DSource with name {0} not found in the Model {1} in VDB {2}.{3}
TEIID50062=3DModel with name {0} not found in the VDB {1}.{2}
event_distributor_bound=3Dorg.teiid.events.EventDistributorFactory is boun=
d to {0} for manual control of Teiid events. =
TEIID50004=3DCould not replicate object {0}
TEIID50019=3DRe-deploying VDB {0}
TEIID50066=3DCache system has been shutdown
-TEIID50050=3DPolicy {0} not found in VDB {1}.{2}
TEIID50051=3DPolicy {0} not found in VDB {1}.{2}
TEIID50054=3DModel {0} not found in VDB {1}.{2}
TEIID50055=3DSource name {0} not found in Model {1} in VDB {1}.{2} =
Modified: branches/8.0.x/metadata/src/main/java/org/teiid/metadata/index/Ru=
ntimeMetadataPlugin.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/metadata/src/main/java/org/teiid/metadata/index/RuntimeM=
etadataPlugin.java 2012-05-02 15:00:34 UTC (rev 4048)
+++ branches/8.0.x/metadata/src/main/java/org/teiid/metadata/index/RuntimeM=
etadataPlugin.java 2012-05-02 17:00:12 UTC (rev 4049)
@@ -44,7 +44,6 @@
=
public static enum Event implements BundleUtil.Event {
TEIID80000,
- TEIID80001,
TEIID80002,
TEIID80003,
TEIID80004
--===============7454087660650285541==--
From teiid-commits at lists.jboss.org Wed May 2 13:05:08 2012
Content-Type: multipart/mixed; boundary="===============2904501722670022839=="
MIME-Version: 1.0
From: teiid-commits at lists.jboss.org
To: teiid-commits at lists.jboss.org
Subject: [teiid-commits] teiid SVN: r4050 -
trunk/client/src/main/java/org/teiid/jdbc.
Date: Wed, 02 May 2012 13:05:08 -0400
Message-ID: <201205021705.q42H58Ac014389@svn01.web.mwc.hst.phx2.redhat.com>
--===============2904501722670022839==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: shawkins
Date: 2012-05-02 13:05:07 -0400 (Wed, 02 May 2012)
New Revision: 4050
Modified:
trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java
trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
Log:
TEIID-2023 fix for prepared metadata
Modified: trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java 20=
12-05-02 17:00:12 UTC (rev 4049)
+++ trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java 20=
12-05-02 17:05:07 UTC (rev 4050)
@@ -261,12 +261,16 @@
=
private MetadataResult getMetadataResults() throws TeiidSQLException {
if (metadataResults =3D=3D null) {
- try {
- metadataResults =3D this.getDQP().getMetadata(this.currentRequestID, p=
repareSql, Boolean.valueOf(getExecutionProperty(ExecutionProperties.ANSI_QU=
OTED_IDENTIFIERS)).booleanValue());
- } catch (TeiidComponentException e) {
- throw TeiidSQLException.create(e);
- } catch (TeiidProcessingException e) {
- throw TeiidSQLException.create(e);
+ if (StatementImpl.SET_STATEMENT.matcher(prepareSql).matches() || Statem=
entImpl.TRANSACTION_STATEMENT.matcher(prepareSql).matches() || StatementImp=
l.SHOW_STATEMENT.matcher(prepareSql).matches()) {
+ metadataResults =3D new MetadataResult();
+ } else {
+ try {
+ metadataResults =3D this.getDQP().getMetadata(this.currentRequestID, =
prepareSql, Boolean.valueOf(getExecutionProperty(ExecutionProperties.ANSI_Q=
UOTED_IDENTIFIERS)).booleanValue());
+ } catch (TeiidComponentException e) {
+ throw TeiidSQLException.create(e);
+ } catch (TeiidProcessingException e) {
+ throw TeiidSQLException.create(e);
+ }
}
}
return metadataResults;
Modified: trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2012-05-02=
17:00:12 UTC (rev 4049)
+++ trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2012-05-02=
17:05:07 UTC (rev 4050)
@@ -155,9 +155,9 @@
protected Map outParamIndexMap =3D new HashMap();
protected Map outParamByName =3D new TreeMap(String.CASE_INSENSITIVE_ORDER);
=
- private static Pattern TRANSACTION_STATEMENT =3D Pattern.compile("\\s*=
(commit|rollback|(start\\s+transaction))\\s*;?", Pattern.CASE_INSENSITIVE);=
//$NON-NLS-1$
- private static Pattern SET_STATEMENT =3D Pattern.compile("\\s*set(?:\\=
s+(payload))?\\s+((?:session authorization)|(?:[a-zA-Z]\\w*))\\s+(?:([a-zA-=
Z]\\w*)|((?:'[^']*')+));?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
- private static Pattern SHOW_STATEMENT =3D Pattern.compile("\\s*show\\s=
+([a-zA-Z]\\w*);?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
+ static Pattern TRANSACTION_STATEMENT =3D Pattern.compile("\\s*(commit|=
rollback|(start\\s+transaction))\\s*;?", Pattern.CASE_INSENSITIVE); //$NON-=
NLS-1$
+ static Pattern SET_STATEMENT =3D Pattern.compile("\\s*set(?:\\s+(paylo=
ad))?\\s+((?:session authorization)|(?:[a-zA-Z]\\w*))\\s+(?:([a-zA-Z]\\w*)|=
((?:'[^']*')+));?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
+ static Pattern SHOW_STATEMENT =3D Pattern.compile("\\s*show\\s+([a-zA-=
Z]\\w*);?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
/**
* Factory Constructor =
* @param driverConnection
--===============2904501722670022839==--
From teiid-commits at lists.jboss.org Wed May 2 13:06:29 2012
Content-Type: multipart/mixed; boundary="===============2229842339804954163=="
MIME-Version: 1.0
From: teiid-commits at lists.jboss.org
To: teiid-commits at lists.jboss.org
Subject: [teiid-commits] teiid SVN: r4051 - in trunk:
runtime/src/main/java/org/teiid/transport and 1 other directories.
Date: Wed, 02 May 2012 13:06:24 -0400
Message-ID: <201205021706.q42H6OAu014442@svn01.web.mwc.hst.phx2.redhat.com>
--===============2229842339804954163==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: shawkins
Date: 2012-05-02 13:06:23 -0400 (Wed, 02 May 2012)
New Revision: 4051
Modified:
trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java
trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBC=
SocketTransport.java
Log:
TEIID-2025 using getCharacterStream for pg_text
Modified: trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java 2012-05-02 17:05=
:07 UTC (rev 4050)
+++ trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java 2012-05-02 17:06=
:23 UTC (rev 4051)
@@ -102,8 +102,6 @@
=
case Types.LONGVARCHAR:
case Types.CLOB: =
- return PG_TYPE_TEXT;
- =
case Types.SQLXML: =
return PG_TYPE_TEXT;
=
Modified: trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java =
2012-05-02 17:05:07 UTC (rev 4050)
+++ trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java =
2012-05-02 17:06:23 UTC (rev 4051)
@@ -32,7 +32,6 @@
import java.nio.charset.Charset;
import java.security.GeneralSecurityException;
import java.sql.Blob;
-import java.sql.Clob;
import java.sql.ParameterMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -482,9 +481,8 @@
break;
=
case PG_TYPE_TEXT:
- Clob clob =3D rs.getClob(column);
- if (clob !=3D null) {
- Reader r =3D clob.getCharacterStream();
+ Reader r =3D rs.getCharacterStream(column);
+ if (r !=3D null) {
try {
ObjectConverterUtil.write(writer, r, this.maxLobSize, false);
} finally {
Modified: trunk/test-integration/common/src/test/java/org/teiid/transport/T=
estODBCSocketTransport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/test-integration/common/src/test/java/org/teiid/transport/TestODB=
CSocketTransport.java 2012-05-02 17:05:07 UTC (rev 4050)
+++ trunk/test-integration/common/src/test/java/org/teiid/transport/TestODB=
CSocketTransport.java 2012-05-02 17:06:23 UTC (rev 4051)
@@ -345,4 +345,25 @@
assertTrue(s.execute("select * from tables order by name"));
TestMMDatabaseMetaData.compareResultSet("TestODBCSocketTransport/testSel=
ect", s.getResultSet());
}
+ =
+ @Test public void testPayload() throws Exception {
+ Statement s =3D conn.createStatement();
+ assertFalse(s.execute("SET PAYLOAD x y"));
+ assertTrue(s.execute("SELECT commandpayload('x')"));
+ ResultSet rs =3D s.getResultSet();
+ assertTrue(rs.next());
+ String str =3D rs.getString(1);
+ assertEquals("y", str);
+ }
+ =
+ @Test public void testShowPlan() throws Exception {
+ Statement s =3D conn.createStatement();
+ assertFalse(s.execute("SET SHOWPLAN ON"));
+ assertTrue(s.execute("SELECT 1"));
+ assertTrue(s.execute("SHOW PLAN"));
+ ResultSet rs =3D s.getResultSet();
+ assertTrue(rs.next());
+ String str =3D rs.getString(1);
+ assertEquals("ProjectNode\n + Output Columns:expr1 (integer)\n + Stati=
stics:\n 0: Node Output Rows: 1\n 1: Node Process Time: 0\n 2: Nod=
e Cumulative Process Time: 0\n 3: Node Cumulative Next Batch Process Tim=
e: 0\n 4: Node Next Batch Calls: 1\n 5: Node Blocks: 0\n + Cost Esti=
mates:Estimated Node Cardinality: 1.0\n + Select Columns:1\n", str);
+ }
}
--===============2229842339804954163==--
From teiid-commits at lists.jboss.org Wed May 2 15:06:54 2012
Content-Type: multipart/mixed; boundary="===============6244746014089864758=="
MIME-Version: 1.0
From: teiid-commits at lists.jboss.org
To: teiid-commits at lists.jboss.org
Subject: [teiid-commits] teiid SVN: r4052 - in branches/8.0.x: admin and 30
other directories.
Date: Wed, 02 May 2012 15:06:54 -0400
Message-ID: <201205021906.q42J6siv005366@svn01.web.mwc.hst.phx2.redhat.com>
--===============6244746014089864758==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: shawkins
Date: 2012-05-02 15:06:52 -0400 (Wed, 02 May 2012)
New Revision: 4052
Modified:
branches/8.0.x/admin/pom.xml
branches/8.0.x/adminshell/pom.xml
branches/8.0.x/api/pom.xml
branches/8.0.x/build/pom.xml
branches/8.0.x/client-jdk15/pom.xml
branches/8.0.x/client/pom.xml
branches/8.0.x/common-core/pom.xml
branches/8.0.x/connectors/connector-file/pom.xml
branches/8.0.x/connectors/connector-ldap/pom.xml
branches/8.0.x/connectors/connector-salesforce/pom.xml
branches/8.0.x/connectors/connector-ws/pom.xml
branches/8.0.x/connectors/pom.xml
branches/8.0.x/connectors/salesforce-api/pom.xml
branches/8.0.x/connectors/sandbox/pom.xml
branches/8.0.x/connectors/sandbox/translator-yahoo/pom.xml
branches/8.0.x/connectors/translator-file/pom.xml
branches/8.0.x/connectors/translator-hive/pom.xml
branches/8.0.x/connectors/translator-jdbc/pom.xml
branches/8.0.x/connectors/translator-ldap/pom.xml
branches/8.0.x/connectors/translator-loopback/pom.xml
branches/8.0.x/connectors/translator-olap/pom.xml
branches/8.0.x/connectors/translator-salesforce/pom.xml
branches/8.0.x/connectors/translator-ws/pom.xml
branches/8.0.x/engine/pom.xml
branches/8.0.x/hibernate-dialect/pom.xml
branches/8.0.x/jboss-integration/pom.xml
branches/8.0.x/metadata/pom.xml
branches/8.0.x/pom.xml
branches/8.0.x/runtime/pom.xml
branches/8.0.x/test-integration/common/pom.xml
branches/8.0.x/test-integration/db/pom.xml
branches/8.0.x/test-integration/pom.xml
Log:
[maven-release-plugin] prepare release teiid-parent-8.0.0.Final
Modified: branches/8.0.x/admin/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/admin/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/admin/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
teiid-admin
Modified: branches/8.0.x/adminshell/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/adminshell/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/adminshell/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
teiid-adminshell
Modified: branches/8.0.x/api/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/api/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/api/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
teiid-api
Modified: branches/8.0.x/build/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/build/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/build/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -2,7 +2,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
teiid
Modified: branches/8.0.x/client/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/client/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/client/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
teiid-client
Modified: branches/8.0.x/client-jdk15/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/client-jdk15/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/client-jdk15/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
teiid-client-jdk15
Modified: branches/8.0.x/common-core/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/common-core/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/common-core/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
teiid-common-core
Modified: branches/8.0.x/connectors/connector-file/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/connector-file/pom.xml 2012-05-02 17:06:23 UT=
C (rev 4051)
+++ branches/8.0.x/connectors/connector-file/pom.xml 2012-05-02 19:06:52 UT=
C (rev 4052)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
connector-file
Modified: branches/8.0.x/connectors/connector-ldap/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/connector-ldap/pom.xml 2012-05-02 17:06:23 UT=
C (rev 4051)
+++ branches/8.0.x/connectors/connector-ldap/pom.xml 2012-05-02 19:06:52 UT=
C (rev 4052)
@@ -2,7 +2,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
connector-ldap
Modified: branches/8.0.x/connectors/connector-salesforce/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/connector-salesforce/pom.xml 2012-05-02 17:06=
:23 UTC (rev 4051)
+++ branches/8.0.x/connectors/connector-salesforce/pom.xml 2012-05-02 19:06=
:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
connector-salesforce
Modified: branches/8.0.x/connectors/connector-ws/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/connector-ws/pom.xml 2012-05-02 17:06:23 UTC =
(rev 4051)
+++ branches/8.0.x/connectors/connector-ws/pom.xml 2012-05-02 19:06:52 UTC =
(rev 4052)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
connector-ws
Modified: branches/8.0.x/connectors/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/connectors/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
org.jboss.teiid
Modified: branches/8.0.x/connectors/salesforce-api/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/salesforce-api/pom.xml 2012-05-02 17:06:23 UT=
C (rev 4051)
+++ branches/8.0.x/connectors/salesforce-api/pom.xml 2012-05-02 19:06:52 UT=
C (rev 4052)
@@ -2,7 +2,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
salesforce-api
Modified: branches/8.0.x/connectors/sandbox/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/sandbox/pom.xml 2012-05-02 17:06:23 UTC (rev =
4051)
+++ branches/8.0.x/connectors/sandbox/pom.xml 2012-05-02 19:06:52 UTC (rev =
4052)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
org.jboss.teiid.connectors
Modified: branches/8.0.x/connectors/sandbox/translator-yahoo/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/sandbox/translator-yahoo/pom.xml 2012-05-02 1=
7:06:23 UTC (rev 4051)
+++ branches/8.0.x/connectors/sandbox/translator-yahoo/pom.xml 2012-05-02 1=
9:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
sandbox
org.jboss.teiid.connectors
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
translator-yahoo
Modified: branches/8.0.x/connectors/translator-file/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/translator-file/pom.xml 2012-05-02 17:06:23 U=
TC (rev 4051)
+++ branches/8.0.x/connectors/translator-file/pom.xml 2012-05-02 19:06:52 U=
TC (rev 4052)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
translator-file
Modified: branches/8.0.x/connectors/translator-hive/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/translator-hive/pom.xml 2012-05-02 17:06:23 U=
TC (rev 4051)
+++ branches/8.0.x/connectors/translator-hive/pom.xml 2012-05-02 19:06:52 U=
TC (rev 4052)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
translator-hive
Modified: branches/8.0.x/connectors/translator-jdbc/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/translator-jdbc/pom.xml 2012-05-02 17:06:23 U=
TC (rev 4051)
+++ branches/8.0.x/connectors/translator-jdbc/pom.xml 2012-05-02 19:06:52 U=
TC (rev 4052)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
translator-jdbc
Modified: branches/8.0.x/connectors/translator-ldap/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/translator-ldap/pom.xml 2012-05-02 17:06:23 U=
TC (rev 4051)
+++ branches/8.0.x/connectors/translator-ldap/pom.xml 2012-05-02 19:06:52 U=
TC (rev 4052)
@@ -2,7 +2,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
translator-ldap
Modified: branches/8.0.x/connectors/translator-loopback/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/translator-loopback/pom.xml 2012-05-02 17:06:=
23 UTC (rev 4051)
+++ branches/8.0.x/connectors/translator-loopback/pom.xml 2012-05-02 19:06:=
52 UTC (rev 4052)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
translator-loopback
Modified: branches/8.0.x/connectors/translator-olap/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/translator-olap/pom.xml 2012-05-02 17:06:23 U=
TC (rev 4051)
+++ branches/8.0.x/connectors/translator-olap/pom.xml 2012-05-02 19:06:52 U=
TC (rev 4052)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
translator-olap
Modified: branches/8.0.x/connectors/translator-salesforce/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/translator-salesforce/pom.xml 2012-05-02 17:0=
6:23 UTC (rev 4051)
+++ branches/8.0.x/connectors/translator-salesforce/pom.xml 2012-05-02 19:0=
6:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
translator-salesforce
Modified: branches/8.0.x/connectors/translator-ws/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/translator-ws/pom.xml 2012-05-02 17:06:23 UTC=
(rev 4051)
+++ branches/8.0.x/connectors/translator-ws/pom.xml 2012-05-02 19:06:52 UTC=
(rev 4052)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
translator-ws
Modified: branches/8.0.x/engine/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/engine/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
teiid-engine
Modified: branches/8.0.x/hibernate-dialect/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/hibernate-dialect/pom.xml 2012-05-02 17:06:23 UTC (rev 4=
051)
+++ branches/8.0.x/hibernate-dialect/pom.xml 2012-05-02 19:06:52 UTC (rev 4=
052)
@@ -2,7 +2,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
teiid-hibernate-dialect
Modified: branches/8.0.x/jboss-integration/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/jboss-integration/pom.xml 2012-05-02 17:06:23 UTC (rev 4=
051)
+++ branches/8.0.x/jboss-integration/pom.xml 2012-05-02 19:06:52 UTC (rev 4=
052)
@@ -2,7 +2,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
org.jboss.teiid
Modified: branches/8.0.x/metadata/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/metadata/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/metadata/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
teiid-metadata
Modified: branches/8.0.x/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -10,7 +10,7 @@
teiid-parent
pom
Teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
Federated SQL and XML query engine.
1.7.0
@@ -37,9 +37,9 @@
4.10
- scm:svn:https://anonsvn.jboss.org/repos/teiid/branches=
/8.0.x
- scm:svn:https://svn.jboss.org/repos/teiid/branches/=
8.0.x
- http://anonsvn.jboss.org/repos/teiid/branches/8.0.x
+ scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/tei=
id-parent-8.0.0.Final
+ scm:svn:https://svn.jboss.org/repos/teiid/tags/teii=
d-parent-8.0.0.Final
+ http://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-8.0.0.Final<=
/url>
Modified: branches/8.0.x/runtime/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/runtime/pom.xml 2012-05-02 17:06:23 UTC (rev 4051)
+++ branches/8.0.x/runtime/pom.xml 2012-05-02 19:06:52 UTC (rev 4052)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
org.jboss.teiid
Modified: branches/8.0.x/test-integration/common/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/test-integration/common/pom.xml 2012-05-02 17:06:23 UTC =
(rev 4051)
+++ branches/8.0.x/test-integration/common/pom.xml 2012-05-02 19:06:52 UTC =
(rev 4052)
@@ -3,7 +3,7 @@
teiid-test-integration
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
test-integration-common
Modified: branches/8.0.x/test-integration/db/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/test-integration/db/pom.xml 2012-05-02 17:06:23 UTC (rev=
4051)
+++ branches/8.0.x/test-integration/db/pom.xml 2012-05-02 19:06:52 UTC (rev=
4052)
@@ -9,7 +9,7 @@
teiid-test-integration
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
=
4.0.0
Modified: branches/8.0.x/test-integration/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/test-integration/pom.xml 2012-05-02 17:06:23 UTC (rev 40=
51)
+++ branches/8.0.x/test-integration/pom.xml 2012-05-02 19:06:52 UTC (rev 40=
52)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final-SNAPSHOT
+ 8.0.0.Final
4.0.0
teiid-test-integration
--===============6244746014089864758==--
From teiid-commits at lists.jboss.org Wed May 2 15:07:05 2012
Content-Type: multipart/mixed; boundary="===============1963608343172016365=="
MIME-Version: 1.0
From: teiid-commits at lists.jboss.org
To: teiid-commits at lists.jboss.org
Subject: [teiid-commits] teiid SVN: r4053 - tags.
Date: Wed, 02 May 2012 15:07:05 -0400
Message-ID: <201205021907.q42J75C8005376@svn01.web.mwc.hst.phx2.redhat.com>
--===============1963608343172016365==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: shawkins
Date: 2012-05-02 15:07:05 -0400 (Wed, 02 May 2012)
New Revision: 4053
Added:
tags/teiid-parent-8.0.0.Final/
Log:
[maven-release-plugin] copy for tag teiid-parent-8.0.0.Final
--===============1963608343172016365==--
From teiid-commits at lists.jboss.org Wed May 2 15:07:30 2012
Content-Type: multipart/mixed; boundary="===============6967654335790679537=="
MIME-Version: 1.0
From: teiid-commits at lists.jboss.org
To: teiid-commits at lists.jboss.org
Subject: [teiid-commits] teiid SVN: r4054 - in branches/8.0.x: admin and 30
other directories.
Date: Wed, 02 May 2012 15:07:29 -0400
Message-ID: <201205021907.q42J7TjU005401@svn01.web.mwc.hst.phx2.redhat.com>
--===============6967654335790679537==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: shawkins
Date: 2012-05-02 15:07:28 -0400 (Wed, 02 May 2012)
New Revision: 4054
Modified:
branches/8.0.x/admin/pom.xml
branches/8.0.x/adminshell/pom.xml
branches/8.0.x/api/pom.xml
branches/8.0.x/build/pom.xml
branches/8.0.x/client-jdk15/pom.xml
branches/8.0.x/client/pom.xml
branches/8.0.x/common-core/pom.xml
branches/8.0.x/connectors/connector-file/pom.xml
branches/8.0.x/connectors/connector-ldap/pom.xml
branches/8.0.x/connectors/connector-salesforce/pom.xml
branches/8.0.x/connectors/connector-ws/pom.xml
branches/8.0.x/connectors/pom.xml
branches/8.0.x/connectors/salesforce-api/pom.xml
branches/8.0.x/connectors/sandbox/pom.xml
branches/8.0.x/connectors/sandbox/translator-yahoo/pom.xml
branches/8.0.x/connectors/translator-file/pom.xml
branches/8.0.x/connectors/translator-hive/pom.xml
branches/8.0.x/connectors/translator-jdbc/pom.xml
branches/8.0.x/connectors/translator-ldap/pom.xml
branches/8.0.x/connectors/translator-loopback/pom.xml
branches/8.0.x/connectors/translator-olap/pom.xml
branches/8.0.x/connectors/translator-salesforce/pom.xml
branches/8.0.x/connectors/translator-ws/pom.xml
branches/8.0.x/engine/pom.xml
branches/8.0.x/hibernate-dialect/pom.xml
branches/8.0.x/jboss-integration/pom.xml
branches/8.0.x/metadata/pom.xml
branches/8.0.x/pom.xml
branches/8.0.x/runtime/pom.xml
branches/8.0.x/test-integration/common/pom.xml
branches/8.0.x/test-integration/db/pom.xml
branches/8.0.x/test-integration/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: branches/8.0.x/admin/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/admin/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/admin/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
teiid-admin
Modified: branches/8.0.x/adminshell/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/adminshell/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/adminshell/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
teiid-adminshell
Modified: branches/8.0.x/api/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/api/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/api/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
teiid-api
Modified: branches/8.0.x/build/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/build/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/build/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -2,7 +2,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
teiid
Modified: branches/8.0.x/client/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/client/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/client/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
teiid-client
Modified: branches/8.0.x/client-jdk15/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/client-jdk15/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/client-jdk15/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
teiid-client-jdk15
Modified: branches/8.0.x/common-core/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/common-core/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/common-core/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
teiid-common-core
Modified: branches/8.0.x/connectors/connector-file/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/connector-file/pom.xml 2012-05-02 19:07:05 UT=
C (rev 4053)
+++ branches/8.0.x/connectors/connector-file/pom.xml 2012-05-02 19:07:28 UT=
C (rev 4054)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
connector-file
Modified: branches/8.0.x/connectors/connector-ldap/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/connector-ldap/pom.xml 2012-05-02 19:07:05 UT=
C (rev 4053)
+++ branches/8.0.x/connectors/connector-ldap/pom.xml 2012-05-02 19:07:28 UT=
C (rev 4054)
@@ -2,7 +2,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
connector-ldap
Modified: branches/8.0.x/connectors/connector-salesforce/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/connector-salesforce/pom.xml 2012-05-02 19:07=
:05 UTC (rev 4053)
+++ branches/8.0.x/connectors/connector-salesforce/pom.xml 2012-05-02 19:07=
:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
connector-salesforce
Modified: branches/8.0.x/connectors/connector-ws/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/connector-ws/pom.xml 2012-05-02 19:07:05 UTC =
(rev 4053)
+++ branches/8.0.x/connectors/connector-ws/pom.xml 2012-05-02 19:07:28 UTC =
(rev 4054)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
connector-ws
Modified: branches/8.0.x/connectors/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/connectors/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
org.jboss.teiid
Modified: branches/8.0.x/connectors/salesforce-api/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/salesforce-api/pom.xml 2012-05-02 19:07:05 UT=
C (rev 4053)
+++ branches/8.0.x/connectors/salesforce-api/pom.xml 2012-05-02 19:07:28 UT=
C (rev 4054)
@@ -2,7 +2,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
salesforce-api
Modified: branches/8.0.x/connectors/sandbox/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/sandbox/pom.xml 2012-05-02 19:07:05 UTC (rev =
4053)
+++ branches/8.0.x/connectors/sandbox/pom.xml 2012-05-02 19:07:28 UTC (rev =
4054)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
org.jboss.teiid.connectors
Modified: branches/8.0.x/connectors/sandbox/translator-yahoo/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/sandbox/translator-yahoo/pom.xml 2012-05-02 1=
9:07:05 UTC (rev 4053)
+++ branches/8.0.x/connectors/sandbox/translator-yahoo/pom.xml 2012-05-02 1=
9:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
sandbox
org.jboss.teiid.connectors
- 8.0.0.Final
+ 8.0.1
4.0.0
translator-yahoo
Modified: branches/8.0.x/connectors/translator-file/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/translator-file/pom.xml 2012-05-02 19:07:05 U=
TC (rev 4053)
+++ branches/8.0.x/connectors/translator-file/pom.xml 2012-05-02 19:07:28 U=
TC (rev 4054)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
translator-file
Modified: branches/8.0.x/connectors/translator-hive/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/translator-hive/pom.xml 2012-05-02 19:07:05 U=
TC (rev 4053)
+++ branches/8.0.x/connectors/translator-hive/pom.xml 2012-05-02 19:07:28 U=
TC (rev 4054)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
translator-hive
Modified: branches/8.0.x/connectors/translator-jdbc/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/translator-jdbc/pom.xml 2012-05-02 19:07:05 U=
TC (rev 4053)
+++ branches/8.0.x/connectors/translator-jdbc/pom.xml 2012-05-02 19:07:28 U=
TC (rev 4054)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
translator-jdbc
Modified: branches/8.0.x/connectors/translator-ldap/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/translator-ldap/pom.xml 2012-05-02 19:07:05 U=
TC (rev 4053)
+++ branches/8.0.x/connectors/translator-ldap/pom.xml 2012-05-02 19:07:28 U=
TC (rev 4054)
@@ -2,7 +2,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
translator-ldap
Modified: branches/8.0.x/connectors/translator-loopback/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/translator-loopback/pom.xml 2012-05-02 19:07:=
05 UTC (rev 4053)
+++ branches/8.0.x/connectors/translator-loopback/pom.xml 2012-05-02 19:07:=
28 UTC (rev 4054)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
translator-loopback
Modified: branches/8.0.x/connectors/translator-olap/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/translator-olap/pom.xml 2012-05-02 19:07:05 U=
TC (rev 4053)
+++ branches/8.0.x/connectors/translator-olap/pom.xml 2012-05-02 19:07:28 U=
TC (rev 4054)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
translator-olap
Modified: branches/8.0.x/connectors/translator-salesforce/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/translator-salesforce/pom.xml 2012-05-02 19:0=
7:05 UTC (rev 4053)
+++ branches/8.0.x/connectors/translator-salesforce/pom.xml 2012-05-02 19:0=
7:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
translator-salesforce
Modified: branches/8.0.x/connectors/translator-ws/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/connectors/translator-ws/pom.xml 2012-05-02 19:07:05 UTC=
(rev 4053)
+++ branches/8.0.x/connectors/translator-ws/pom.xml 2012-05-02 19:07:28 UTC=
(rev 4054)
@@ -3,7 +3,7 @@
connectors
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
translator-ws
Modified: branches/8.0.x/engine/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/engine/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/engine/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
teiid-engine
Modified: branches/8.0.x/hibernate-dialect/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/hibernate-dialect/pom.xml 2012-05-02 19:07:05 UTC (rev 4=
053)
+++ branches/8.0.x/hibernate-dialect/pom.xml 2012-05-02 19:07:28 UTC (rev 4=
054)
@@ -2,7 +2,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
teiid-hibernate-dialect
Modified: branches/8.0.x/jboss-integration/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/jboss-integration/pom.xml 2012-05-02 19:07:05 UTC (rev 4=
053)
+++ branches/8.0.x/jboss-integration/pom.xml 2012-05-02 19:07:28 UTC (rev 4=
054)
@@ -2,7 +2,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
org.jboss.teiid
Modified: branches/8.0.x/metadata/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/metadata/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/metadata/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
teiid-metadata
Modified: branches/8.0.x/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -10,7 +10,7 @@
teiid-parent
pom
Teiid
- 8.0.0.Final
+ 8.0.1
Federated SQL and XML query engine.
1.7.0
@@ -37,9 +37,9 @@
4.10
- scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/tei=
id-parent-8.0.0.Final
- scm:svn:https://svn.jboss.org/repos/teiid/tags/teii=
d-parent-8.0.0.Final
- http://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-8.0.0.Final<=
/url>
+ scm:svn:https://anonsvn.jboss.org/repos/teiid/branches=
/8.0.x
+ scm:svn:https://svn.jboss.org/repos/teiid/branches/=
8.0.x
+ http://anonsvn.jboss.org/repos/teiid/branches/8.0.x
Modified: branches/8.0.x/runtime/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/runtime/pom.xml 2012-05-02 19:07:05 UTC (rev 4053)
+++ branches/8.0.x/runtime/pom.xml 2012-05-02 19:07:28 UTC (rev 4054)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
org.jboss.teiid
Modified: branches/8.0.x/test-integration/common/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/test-integration/common/pom.xml 2012-05-02 19:07:05 UTC =
(rev 4053)
+++ branches/8.0.x/test-integration/common/pom.xml 2012-05-02 19:07:28 UTC =
(rev 4054)
@@ -3,7 +3,7 @@
teiid-test-integration
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
test-integration-common
Modified: branches/8.0.x/test-integration/db/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/test-integration/db/pom.xml 2012-05-02 19:07:05 UTC (rev=
4053)
+++ branches/8.0.x/test-integration/db/pom.xml 2012-05-02 19:07:28 UTC (rev=
4054)
@@ -9,7 +9,7 @@
teiid-test-integration
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
=
4.0.0
Modified: branches/8.0.x/test-integration/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/8.0.x/test-integration/pom.xml 2012-05-02 19:07:05 UTC (rev 40=
53)
+++ branches/8.0.x/test-integration/pom.xml 2012-05-02 19:07:28 UTC (rev 40=
54)
@@ -3,7 +3,7 @@
teiid-parent
org.jboss.teiid
- 8.0.0.Final
+ 8.0.1
4.0.0
teiid-test-integration
--===============6967654335790679537==--
From teiid-commits at lists.jboss.org Wed May 2 17:36:48 2012
Content-Type: multipart/mixed; boundary="===============2968965142478545221=="
MIME-Version: 1.0
From: teiid-commits at lists.jboss.org
To: teiid-commits at lists.jboss.org
Subject: [teiid-commits] teiid SVN: r4055 - in trunk:
admin/src/main/java/org/teiid/adminapi and 200 other directories.
Date: Wed, 02 May 2012 17:36:44 -0400
Message-ID: <201205022136.q42Lai8j031231@svn01.web.mwc.hst.phx2.redhat.com>
--===============2968965142478545221==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: shawkins
Date: 2012-05-02 17:36:21 -0400 (Wed, 02 May 2012)
New Revision: 4055
Modified:
trunk/
trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java
trunk/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java
trunk/adminshell/src/main/java/groovy/
trunk/adminshell/src/main/java/groovy/sql/
trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java
trunk/adminshell/src/main/java/org/teiid/adminshell/
trunk/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java
trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java
trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.j=
ava
trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java
trunk/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.=
java
trunk/adminshell/src/main/java/org/teiid/adminshell/Help.java
trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java
trunk/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java
trunk/adminshell/src/main/resources/org/
trunk/adminshell/src/main/resources/org/codehaus/
trunk/adminshell/src/main/resources/org/codehaus/groovy/
trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/
trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/
trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/comm=
ands.xml
trunk/adminshell/src/main/resources/org/teiid/
trunk/adminshell/src/main/resources/org/teiid/adminshell/
trunk/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpComman=
d.properties
trunk/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.=
properties
trunk/adminshell/src/test/java/org/
trunk/adminshell/src/test/java/org/teiid/
trunk/adminshell/src/test/java/org/teiid/adminshell/
trunk/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java
trunk/adminshell/src/test/resources/foo/
trunk/adminshell/src/test/resources/foo/bar.txt
trunk/api/src/main/java/org/teiid/connector/DataPlugin.java
trunk/api/src/main/java/org/teiid/events/
trunk/api/src/main/java/org/teiid/events/EventDistributor.java
trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java
trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java
trunk/build/kits/
trunk/build/kits/adminshell/
trunk/build/kits/jboss-as7/
trunk/client/src/main/java/org/teiid/client/util/
trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java
trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java
trunk/client/src/main/java/org/teiid/client/util/ResultsFuture.java
trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java
trunk/client/src/main/java/org/teiid/gss/MakeGSS.java
trunk/client/src/main/java/org/teiid/jdbc/
trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java
trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java
trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java
trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java
trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java
trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java
trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java
trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java
trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java
trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java
trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java
trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java
trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java
trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java
trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java
trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java
trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java
trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java
trunk/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java
trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java
trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java
trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java
trunk/client/src/main/java/org/teiid/jdbc/RequestOptions.java
trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java
trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java
trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java
trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java
trunk/client/src/main/java/org/teiid/jdbc/StatementCallback.java
trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java
trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java
trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java
trunk/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java
trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java
trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java
trunk/client/src/main/java/org/teiid/jdbc/TeiidStatement.java
trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java
trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java
trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java
trunk/client/src/main/java/org/teiid/net/socket/
trunk/client/src/main/java/org/teiid/net/socket/AuthenticationType.java
trunk/client/src/main/java/org/teiid/net/socket/Handshake.java
trunk/client/src/main/java/org/teiid/net/socket/Message.java
trunk/client/src/main/java/org/teiid/net/socket/ObjectChannel.java
trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java
trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.=
java
trunk/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java
trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.=
java
trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicat=
ionException.java
trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.j=
ava
trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFa=
ctory.java
trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java
trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFact=
ory.java
trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl=
.java
trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java
trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java
trunk/client/src/main/resources/org/
trunk/client/src/main/resources/org/teiid/
trunk/client/src/main/resources/org/teiid/jdbc/
trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties
trunk/client/src/main/resources/org/teiid/net/
trunk/client/src/test/java/org/teiid/client/plan/
trunk/client/src/test/java/org/teiid/client/plan/TestPlanNode.java
trunk/client/src/test/java/org/teiid/client/util/
trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java
trunk/client/src/test/java/org/teiid/client/util/TestResultsFuture.java
trunk/client/src/test/java/org/teiid/jdbc/
trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java
trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java
trunk/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java
trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java
trunk/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java
trunk/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java
trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java
trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java
trunk/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java
trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java
trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java
trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java
trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java
trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java
trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java
trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java
trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java
trunk/client/src/test/java/org/teiid/jdbc/util/
trunk/client/src/test/java/org/teiid/net/
trunk/client/src/test/java/org/teiid/net/TestTeiidURL.java
trunk/client/src/test/java/org/teiid/net/socket/
trunk/common-core/src/main/java/org/
trunk/common-core/src/main/java/org/teiid/
trunk/common-core/src/main/java/org/teiid/core/
trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java
trunk/common-core/src/main/java/org/teiid/core/ComponentNotFoundExceptio=
n.java
trunk/common-core/src/main/java/org/teiid/core/CoreConstants.java
trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java
trunk/common-core/src/main/java/org/teiid/core/TeiidComponentException.j=
ava
trunk/common-core/src/main/java/org/teiid/core/TeiidException.java
trunk/common-core/src/main/java/org/teiid/core/TeiidProcessingException.=
java
trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java
trunk/common-core/src/main/java/org/teiid/core/crypto/
trunk/common-core/src/main/java/org/teiid/core/types/
trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java
trunk/common-core/src/main/java/org/teiid/core/types/BinaryType.java
trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java
trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java
trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java
trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java
trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java
trunk/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.=
java
trunk/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java
trunk/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java
trunk/common-core/src/main/java/org/teiid/core/types/NullType.java
trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java
trunk/common-core/src/main/java/org/teiid/core/types/Sequencable.java
trunk/common-core/src/main/java/org/teiid/core/types/SourceTransform.java
trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslat=
or.java
trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java
trunk/common-core/src/main/java/org/teiid/core/types/Transform.java
trunk/common-core/src/main/java/org/teiid/core/types/TransformationExcep=
tion.java
trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java
trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java
trunk/common-core/src/main/java/org/teiid/core/types/basic/
trunk/common-core/src/main/java/org/teiid/core/types/basic/BlobToBinaryT=
ransform.java
trunk/common-core/src/main/java/org/teiid/core/types/basic/ClobToStringT=
ransform.java
trunk/common-core/src/main/java/org/teiid/core/types/basic/ObjectToAnyTr=
ansform.java
trunk/common-core/src/main/java/org/teiid/core/types/basic/SQLXMLToStrin=
gTransform.java
trunk/common-core/src/main/java/org/teiid/core/types/basic/StringToDateT=
ransform.java
trunk/common-core/src/main/java/org/teiid/core/util/
trunk/common-core/src/main/java/org/teiid/core/util/FileUtils.java
trunk/common-core/src/main/java/org/teiid/core/util/ReflectionHelper.java
trunk/common-core/src/main/resources/org/teiid/core/i18n.properties
trunk/common-core/src/test/java/org/
trunk/common-core/src/test/java/org/teiid/
trunk/common-core/src/test/java/org/teiid/core/
trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.j=
ava
trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeExce=
ption.java
trunk/common-core/src/test/java/org/teiid/core/crypto/
trunk/common-core/src/test/java/org/teiid/core/types/
trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java
trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java
trunk/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager=
.java
trunk/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java
trunk/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSource=
Translator.java
trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java
trunk/common-core/src/test/java/org/teiid/core/types/basic/
trunk/common-core/src/test/java/org/teiid/core/util/
trunk/common-core/src/test/java/org/teiid/core/util/TestFileUtils.java
trunk/common-core/src/test/java/org/teiid/query/
trunk/common-core/src/test/java/org/teiid/query/unittest/
trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/
trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter=
/file/
trunk/connectors/connector-file/src/main/resources/org/
trunk/connectors/connector-file/src/main/resources/org/teiid/
trunk/connectors/connector-file/src/main/resources/org/teiid/resource/
trunk/connectors/connector-file/src/main/resources/org/teiid/resource/ad=
apter/
trunk/connectors/connector-file/src/main/resources/org/teiid/resource/ad=
apter/file/
trunk/connectors/connector-file/src/main/resources/org/teiid/resource/ad=
apter/file/i18n.properties
trunk/connectors/connector-file/src/test/java/org/
trunk/connectors/connector-file/src/test/java/org/teiid/
trunk/connectors/connector-file/src/test/java/org/teiid/resource/
trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/
trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter=
/file/
trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter=
/file/TestFileConnection.java
trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/
trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter=
/ldap/
trunk/connectors/connector-ws/src/main/resources/org/
trunk/connectors/connector-ws/src/main/resources/org/teiid/
trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/
trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adap=
ter/
trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adap=
ter/ws/
trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adap=
ter/ws/i18n.properties
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc=
/FunctionModifier.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc=
/JDBCPlugin.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc=
/ingres/
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc=
/ingres/TestIngresConvertModifier.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc=
/ingres/TestIngresExecutionFactory.java
trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/
trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/
trunk/engine/src/main/java/org/teiid/api/
trunk/engine/src/main/java/org/teiid/api/exception/
trunk/engine/src/main/java/org/teiid/api/exception/query/
trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvalu=
ationException.java
trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecuti=
onException.java
trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadat=
aException.java
trunk/engine/src/main/java/org/teiid/api/exception/query/InvalidFunction=
Exception.java
trunk/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataEx=
ception.java
trunk/engine/src/main/java/org/teiid/api/exception/query/QueryParserExce=
ption.java
trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerExc=
eption.java
trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessing=
Exception.java
trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverEx=
ception.java
trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorE=
xception.java
trunk/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbo=
lDescription.java
trunk/engine/src/main/java/org/teiid/common/
trunk/engine/src/main/java/org/teiid/common/buffer/
trunk/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.j=
ava
trunk/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java
trunk/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java
trunk/engine/src/main/java/org/teiid/common/buffer/BatchManager.java
trunk/engine/src/main/java/org/teiid/common/buffer/BlockedException.java
trunk/engine/src/main/java/org/teiid/common/buffer/BufferManager.java
trunk/engine/src/main/java/org/teiid/common/buffer/Cache.java
trunk/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java
trunk/engine/src/main/java/org/teiid/common/buffer/CacheKey.java
trunk/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInp=
utStream.java
trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java
trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamF=
actory.java
trunk/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.ja=
va
trunk/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWrit=
eList.java
trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java
trunk/engine/src/main/java/org/teiid/common/buffer/SPage.java
trunk/engine/src/main/java/org/teiid/common/buffer/STree.java
trunk/engine/src/main/java/org/teiid/common/buffer/Serializer.java
trunk/engine/src/main/java/org/teiid/common/buffer/StorageManager.java
trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java
trunk/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java
trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java
trunk/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java
trunk/engine/src/main/java/org/teiid/common/buffer/TupleSource.java
trunk/engine/src/main/java/org/teiid/common/buffer/impl/
trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFil=
eStoreCache.java
trunk/engine/src/main/java/org/teiid/core/
trunk/engine/src/main/java/org/teiid/core/id/
trunk/engine/src/main/java/org/teiid/dqp/internal/process/TransactionSer=
verImpl.java
trunk/engine/src/main/java/org/teiid/query/
trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java
trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java
trunk/engine/src/main/java/org/teiid/query/ReplicatedObject.java
trunk/engine/src/main/java/org/teiid/query/analysis/
trunk/engine/src/main/java/org/teiid/query/eval/
trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java
trunk/engine/src/main/java/org/teiid/query/function/
trunk/engine/src/main/java/org/teiid/query/function/CharsetUtils.java
trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.j=
ava
trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java
trunk/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java
trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSour=
ce.java
trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java
trunk/engine/src/main/java/org/teiid/query/function/FunctionTree.java
trunk/engine/src/main/java/org/teiid/query/function/SystemFunctionManage=
r.java
trunk/engine/src/main/java/org/teiid/query/function/UDFSource.java
trunk/engine/src/main/java/org/teiid/query/function/aggregate/
trunk/engine/src/main/java/org/teiid/query/function/metadata/
trunk/engine/src/main/java/org/teiid/query/function/source/
trunk/engine/src/main/java/org/teiid/query/mapping/
trunk/engine/src/main/java/org/teiid/query/mapping/relational/
trunk/engine/src/main/java/org/teiid/query/mapping/xml/
trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingChoiceNode=
.java
trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingDocument.j=
ava
trunk/engine/src/main/java/org/teiid/query/metadata/
trunk/engine/src/main/java/org/teiid/query/optimizer/
trunk/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanne=
r.java
trunk/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java
trunk/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java
trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.ja=
va
trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java
trunk/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanne=
r.java
trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGen=
erator.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/Optimize=
rRule.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/Partitio=
nAnalyzer.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHint=
s.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToPr=
ocessConverter.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/Relation=
alPlanner.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStac=
k.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree/
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/Fr=
ameUtil.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/Ru=
lePlanJoins.java
trunk/engine/src/main/java/org/teiid/query/optimizer/xml/
trunk/engine/src/main/java/org/teiid/query/optimizer/xml/NameInSourceRes=
olverVisitor.java
trunk/engine/src/main/java/org/teiid/query/optimizer/xml/SourceNodePlann=
erVisitor.java
trunk/engine/src/main/java/org/teiid/query/optimizer/xml/ValidateMappedC=
riteriaVisitor.java
trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPlanner.java
trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLProjectionMi=
nimizer.java
trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLQueryPlanner=
.java
trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLStagaingQuer=
yPlanner.java
trunk/engine/src/main/java/org/teiid/query/parser/
trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java
trunk/engine/src/main/java/org/teiid/query/processor/
trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java
trunk/engine/src/main/java/org/teiid/query/processor/BatchIterator.java
trunk/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.j=
ava
trunk/engine/src/main/java/org/teiid/query/processor/CollectionTupleSour=
ce.java
trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java
trunk/engine/src/main/java/org/teiid/query/processor/ProcessorDataManage=
r.java
trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java
trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java
trunk/engine/src/main/java/org/teiid/query/processor/proc/
trunk/engine/src/main/java/org/teiid/query/processor/proc/ErrorInstructi=
on.java
trunk/engine/src/main/java/org/teiid/query/processor/relational/
trunk/engine/src/main/java/org/teiid/query/processor/relational/XMLTable=
Node.java
trunk/engine/src/main/java/org/teiid/query/processor/xml/
trunk/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor.=
java
trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLContext.java
trunk/engine/src/main/java/org/teiid/query/report/
trunk/engine/src/main/java/org/teiid/query/resolver/
trunk/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java
trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerRe=
solver.java
trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java
trunk/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java
trunk/engine/src/main/java/org/teiid/query/resolver/command/
trunk/engine/src/main/java/org/teiid/query/resolver/command/SimpleQueryR=
esolver.java
trunk/engine/src/main/java/org/teiid/query/resolver/command/TempTableRes=
olver.java
trunk/engine/src/main/java/org/teiid/query/resolver/command/UpdateProced=
ureResolver.java
trunk/engine/src/main/java/org/teiid/query/resolver/command/XMLQueryReso=
lver.java
trunk/engine/src/main/java/org/teiid/query/resolver/util/
trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor=
.java
trunk/engine/src/main/java/org/teiid/query/rewriter/
trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
trunk/engine/src/main/java/org/teiid/query/sql/
trunk/engine/src/main/java/org/teiid/query/sql/LanguageObject.java
trunk/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java
trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.ja=
va
trunk/engine/src/main/java/org/teiid/query/sql/lang/
trunk/engine/src/main/java/org/teiid/query/sql/lang/MatchCriteria.java
trunk/engine/src/main/java/org/teiid/query/sql/navigator/
trunk/engine/src/main/java/org/teiid/query/sql/proc/
trunk/engine/src/main/java/org/teiid/query/sql/symbol/
trunk/engine/src/main/java/org/teiid/query/sql/util/
trunk/engine/src/main/java/org/teiid/query/sql/visitor/
trunk/engine/src/main/java/org/teiid/query/tempdata/
trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableStore.java
trunk/engine/src/main/java/org/teiid/query/util/
trunk/engine/src/main/java/org/teiid/query/validator/
trunk/engine/src/main/java/org/teiid/query/xquery/
trunk/engine/src/main/java/org/teiid/query/xquery/saxon/
trunk/engine/src/main/java/org/teiid/query/xquery/saxon/XQueryEvaluator.=
java
trunk/engine/src/main/java/org/teiid/vdb/
trunk/engine/src/main/java/org/teiid/vdb/runtime/
trunk/engine/src/main/resources/org/teiid/query/i18n.properties
trunk/engine/src/test/java/org/teiid/cache/
trunk/engine/src/test/java/org/teiid/cache/TestDefaultCache.java
trunk/engine/src/test/java/org/teiid/common/
trunk/engine/src/test/java/org/teiid/common/buffer/
trunk/engine/src/test/java/org/teiid/common/queue/
trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestTransactio=
nServer.java
trunk/engine/src/test/java/org/teiid/query/
trunk/engine/src/test/java/org/teiid/query/analysis/
trunk/engine/src/test/java/org/teiid/query/function/
trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java
trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.=
java
trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMetadata=
Reader.java
trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.=
java
trunk/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java
trunk/engine/src/test/java/org/teiid/query/function/TestResolvedFunction=
s.java
trunk/engine/src/test/java/org/teiid/query/function/metadata/
trunk/engine/src/test/java/org/teiid/query/function/source/
trunk/engine/src/test/java/org/teiid/query/mapping/
trunk/engine/src/test/java/org/teiid/query/mapping/xml/
trunk/engine/src/test/java/org/teiid/query/metadata/
trunk/engine/src/test/java/org/teiid/query/optimizer/
trunk/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadat=
aSource.java
trunk/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.=
java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdo=
wn.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdow=
n.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePl=
anner.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetad=
ataPushdown.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.=
java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGr=
oupBy.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimizatio=
n.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRes=
trictions.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunctio=
n.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.j=
ava
trunk/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoin=
Planning.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtua=
l.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.j=
ava
trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts=
.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimizatio=
n.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedure=
Planning.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdow=
n.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.j=
ava
trunk/engine/src/test/java/org/teiid/query/optimizer/capabilities/
trunk/engine/src/test/java/org/teiid/query/optimizer/proc/
trunk/engine/src/test/java/org/teiid/query/optimizer/relational/
trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestAlia=
sGenerator.java
trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMate=
rialization.java
trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestRule=
Stack.java
trunk/engine/src/test/java/org/teiid/query/optimizer/relational/plantree/
trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules/
trunk/engine/src/test/java/org/teiid/query/optimizer/xml/
trunk/engine/src/test/java/org/teiid/query/parser/
trunk/engine/src/test/java/org/teiid/query/processor/
trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java
trunk/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java
trunk/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.j=
ava
trunk/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java
trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManage=
r.java
trunk/engine/src/test/java/org/teiid/query/processor/TestAggregateProces=
sing.java
trunk/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java
trunk/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPl=
an.java
trunk/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.j=
ava
trunk/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePl=
an.java
trunk/engine/src/test/java/org/teiid/query/processor/TestCollectionTuple=
Source.java
trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.=
java
trunk/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdow=
n.java
trunk/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdat=
ableViews.java
trunk/engine/src/test/java/org/teiid/query/processor/TestInsertProcessin=
g.java
trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunctio=
n.java
trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization=
.java
trunk/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.j=
ava
trunk/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessi=
ng.java
trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelati=
onal.java
trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java
trunk/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.=
java
trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessin=
g.java
trunk/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctio=
ns.java
trunk/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.j=
ava
trunk/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java
trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java
trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java
trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.=
java
trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.=
java
trunk/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions=
.java
trunk/engine/src/test/java/org/teiid/query/processor/TestWithClauseProce=
ssing.java
trunk/engine/src/test/java/org/teiid/query/processor/eval/
trunk/engine/src/test/java/org/teiid/query/processor/eval/TestCriteriaEv=
aluator.java
trunk/engine/src/test/java/org/teiid/query/processor/proc/
trunk/engine/src/test/java/org/teiid/query/processor/relational/
trunk/engine/src/test/java/org/teiid/query/processor/xml/
trunk/engine/src/test/java/org/teiid/query/processor/xml/TestXMLProcesso=
r.java
trunk/engine/src/test/java/org/teiid/query/resolver/
trunk/engine/src/test/java/org/teiid/query/resolver/TestProcedureResolvi=
ng.java
trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java
trunk/engine/src/test/java/org/teiid/query/rewriter/
trunk/engine/src/test/java/org/teiid/query/sql/
trunk/engine/src/test/java/org/teiid/query/sql/lang/
trunk/engine/src/test/java/org/teiid/query/sql/proc/
trunk/engine/src/test/java/org/teiid/query/sql/symbol/
trunk/engine/src/test/java/org/teiid/query/sql/util/
trunk/engine/src/test/java/org/teiid/query/sql/visitor/
trunk/engine/src/test/java/org/teiid/query/unittest/
trunk/engine/src/test/java/org/teiid/query/util/
trunk/engine/src/test/java/org/teiid/query/validator/
trunk/engine/src/test/java/org/teiid/vdb/
trunk/engine/src/test/java/org/teiid/vdb/runtime/
trunk/engine/src/test/resources/text/
trunk/engine/src/test/resources/text/TextParts_HeaderRow2.csv
trunk/engine/src/test/resources/text/cdm_dos.txt
trunk/engine/src/test/resources/text/cdm_dos_win.txt
trunk/engine/src/test/resources/text/test-file.txt.csv
trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.=
java
trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHand=
ler.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/Addres=
sWrapper.java
trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroup=
sInputStream.java
trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroup=
sObjectReplicator.java
trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroup=
sOutputStream.java
trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properti=
es
trunk/metadata/src/main/java/org/teiid/metadata/index/RuntimeMetadataPlu=
gin.java
trunk/metadata/src/test/java/org/teiid/cdk/
trunk/metadata/src/test/java/org/teiid/cdk/api/
trunk/metadata/src/test/java/org/teiid/cdk/unittest/
trunk/metadata/src/test/java/org/teiid/core/
trunk/metadata/src/test/java/org/teiid/core/util/
trunk/metadata/src/test/java/org/teiid/internal/
trunk/metadata/src/test/java/org/teiid/internal/core/
trunk/metadata/src/test/java/org/teiid/internal/core/index/
trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java
trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java
trunk/runtime/src/main/java/org/teiid/transport/pg/
trunk/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java
trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties
trunk/runtime/src/main/resources/org/teiid/transport/
trunk/runtime/src/test/java/org/teiid/dqp/
trunk/runtime/src/test/java/org/teiid/dqp/service/
trunk/runtime/src/test/java/org/teiid/dqp/service/buffer/
trunk/test-integration/common/src/test/java/org/teiid/cdk/
trunk/test-integration/common/src/test/java/org/teiid/cdk/api/
trunk/test-integration/common/src/test/java/org/teiid/dqp/
trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/
trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/proce=
ss/
trunk/test-integration/common/src/test/java/org/teiid/transport/
trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBC=
SocketTransport.java
trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBC=
SocketTransport.java
trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/
trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport=
/testSelect.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport=
/testColumnMetadataWithAlias.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport=
/testPk.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport=
/testPkPrepared.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport=
/testSelect.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/=
testColumns.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/=
testDataTypes.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/=
testKeyColumns.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/=
testKeys.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/=
testProcedureParams.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/=
testProcedures.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/=
testReferenceKeyColumns.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/=
testSchemas.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/=
testTableIsSystem.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/=
testTables.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/=
testVDBResources.expected
trunk/test-integration/db/src/main/java/org/teiid/internal/
trunk/test-integration/db/src/main/java/org/teiid/internal/core/
trunk/test-integration/db/src/main/java/org/teiid/internal/core/xml/
trunk/test-integration/db/src/test/java/com/
trunk/test-integration/db/src/test/java/org/teiid/internal/
trunk/test-integration/db/src/test/java/org/teiid/internal/core/
Log:
forward merge from 8.0
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x:3535-3555
/branches/7.6.x:3673-3711,3754-3769
/branches/7.7.x:3816-3868,3876-3915,3920-3983
/branches/8.0.x:4002-4046
/trunk:3188-3450,3452-3666
+ /branches/7.4.x:3535-3555
/branches/7.6.x:3673-3711,3754-3769
/branches/7.7.x:3816-3868,3876-3915,3920-3983
/branches/8.0.x:4002-4046,4048-4051
/trunk:3188-3450,3452-3666
Modified: trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java 2012-05-=
02 19:07:28 UTC (rev 4054)
+++ trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java 2012-05-=
02 21:36:21 UTC (rev 4055)
@@ -22,25 +22,15 @@
=
package org.teiid.adminapi;
=
-import static org.jboss.as.controller.client.helpers.ClientConstants.DEPLO=
YMENT_REMOVE_OPERATION;
-import static org.jboss.as.controller.client.helpers.ClientConstants.DEPLO=
YMENT_UNDEPLOY_OPERATION;
+import static org.jboss.as.controller.client.helpers.ClientConstants.*;
=
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
+import java.util.*;
+import java.util.logging.Logger;
=
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -64,10 +54,10 @@
import org.teiid.adminapi.impl.PropertyDefinitionMetadata;
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.adminapi.impl.VDBMetadataMapper;
+import org.teiid.adminapi.impl.VDBTranslatorMetaData;
import org.teiid.adminapi.impl.VDBMetadataMapper.RequestMetadataMapper;
import org.teiid.adminapi.impl.VDBMetadataMapper.SessionMetadataMapper;
import org.teiid.adminapi.impl.VDBMetadataMapper.TransactionMetadataMapper;
-import org.teiid.adminapi.impl.VDBTranslatorMetaData;
import org.teiid.core.util.ObjectConverterUtil;
=
=
@@ -76,6 +66,7 @@
*/
@SuppressWarnings("nls")
public class AdminFactory {
+ private static final Logger LOGGER =3D Logger.getLogger(AdminFactory.clas=
s.getName());
private static AdminFactory INSTANCE =3D new AdminFactory();
=
public static AdminFactory getInstance() {
@@ -106,12 +97,12 @@
List nodeTypes =3D Util.getNodeTypes(newClient, new De=
faultOperationRequestAddress());
if (!nodeTypes.isEmpty()) {
boolean domainMode =3D nodeTypes.contains("server-group");=
//$NON-NLS-1$ =
- System.out.println("Connected to " //$NON-NLS-1$ =
+ LOGGER.info("Connected to " //$NON-NLS-1$ =
+ (domainMode ? "domain controller at " : "standal=
one controller at ") //$NON-NLS-1$ //$NON-NLS-2$
+ host + ":" + port); //$NON-NLS-1$ =
return new AdminImpl(newClient);
} =
- System.out.println(AdminPlugin.Util.gs(AdminPlugin.Event.TEIID=
70051, host, port)); //$NON-NLS-1$ //$NON-NLS-2$
+ LOGGER.info(AdminPlugin.Util.gs(AdminPlugin.Event.TEIID70051, =
host, port)); //$NON-NLS-1$ //$NON-NLS-2$
} catch (UnknownHostException e) {
throw new AdminProcessingException(AdminPlugin.Event.TEIID70000,=
AdminPlugin.Util.gs(AdminPlugin.Event.TEIID70000, host, e.getLocalizedMess=
age()));
}
@@ -619,7 +610,7 @@
} catch (OperationFormatException e) {
throw new AdminProcessingException(AdminPlugin.Event.TEIID70011, e, e=
.getMessage());
} catch (IOException e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70012, e, e=
.getMessage());
+ throw new AdminProcessingException(AdminPlugin.Event.TEIID70011, e, e=
.getMessage());
} =
}
=
Modified: trunk/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java 2012-05-0=
2 19:07:28 UTC (rev 4054)
+++ trunk/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java 2012-05-0=
2 21:36:21 UTC (rev 4055)
@@ -32,8 +32,6 @@
=
public static enum Event implements BundleUtil.Event {
TEIID70000,
- TEIID70001,
- TEIID70002,
TEIID70003,
TEIID70004,
TEIID70005,
@@ -43,14 +41,11 @@
TEIID70009,
TEIID70010,
TEIID70011,
- TEIID70012,
TEIID70013,
TEIID70014,
TEIID70015,
TEIID70016,
TEIID70017,
- TEIID70018,
- TEIID70019,
TEIID70020,
TEIID70021,
TEIID70022,
Property changes on: trunk/adminshell/src/main/java/groovy
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/groovy:3535-3555*
/branches/7.6.x/adminshell/src/main/java/groovy:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/java/groovy:3816-3868*,3876-3915*,3920-=
3983*
/branches/8.0.x/adminshell/src/main/java/groovy:4002-4046*
/trunk/adminshell/src/main/java/groovy:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/groovy:3535-3555*
/branches/7.6.x/adminshell/src/main/java/groovy:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/java/groovy:3816-3868*,3876-3915*,3920-=
3983*
/branches/8.0.x/adminshell/src/main/java/groovy:4002-4046*,4048-4051*
/trunk/adminshell/src/main/java/groovy:3507-3666
Property changes on: trunk/adminshell/src/main/java/groovy/sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/groovy/sql:3535-3555*
/branches/7.6.x/adminshell/src/main/java/groovy/sql:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/java/groovy/sql:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/adminshell/src/main/java/groovy/sql:4002-4046*
/trunk/adminshell/src/main/java/groovy/sql:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/groovy/sql:3535-3555*
/branches/7.6.x/adminshell/src/main/java/groovy/sql:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/java/groovy/sql:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/adminshell/src/main/java/groovy/sql:4002-4046*,4048-4051*
/trunk/adminshell/src/main/java/groovy/sql:3507-3666
Property changes on: trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3535=
-3555
/branches/7.6.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3673-3711=
,3754-3769
/branches/7.7.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3816-3868=
,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:4002-4046
/trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3535=
-3555
/branches/7.6.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3673-3711=
,3754-3769
/branches/7.7.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3816-3868=
,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:4002-4046=
,4048-4051
/trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java:3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell:3535-355=
5*
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell:3673-3711*,37=
54-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell:3816-3868*,38=
76-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell:4002-4046*
/trunk/adminshell/src/main/java/org/teiid/adminshell:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell:3535-355=
5*
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell:3673-3711*,37=
54-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell:3816-3868*,38=
76-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell:4002-4046*,40=
48-4051*
/trunk/adminshell/src/main/java/org/teiid/adminshell:3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/Ad=
minHelpCommand.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminHel=
pCommand.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpComm=
and.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpComm=
and.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpComm=
and.java:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:=
3507-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminHel=
pCommand.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpComm=
and.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpComm=
and.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpComm=
and.java:4002-4046,4048-4051
/trunk/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:=
3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/Ad=
minShell.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShe=
ll.java:2901-2940
/branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.ja=
va:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.ja=
va:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.ja=
va:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3188-3=
450,3452-3666
+ /branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShe=
ll.java:2901-2940
/branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.ja=
va:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.ja=
va:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.ja=
va:4002-4046,4048-4051
/trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3188-3=
450,3452-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/Gr=
oovyAdminConsole.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAd=
minConsole.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminCo=
nsole.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminCo=
nsole.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminCo=
nsole.java:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.jav=
a:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAd=
minConsole.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminCo=
nsole.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminCo=
nsole.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminCo=
nsole.java:4002-4046,4048-4051
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.jav=
a:3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/Gr=
oovyAdminShell.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAd=
minShell.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminSh=
ell.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminSh=
ell.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminSh=
ell.java:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:=
3507-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAd=
minShell.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminSh=
ell.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminSh=
ell.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminSh=
ell.java:4002-4046,4048-4051
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:=
3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/Gr=
oovySqlExtensions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovySq=
lExtensions.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExte=
nsions.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExte=
nsions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExte=
nsions.java:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.ja=
va:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovySq=
lExtensions.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExte=
nsions.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExte=
nsions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExte=
nsions.java:4002-4046,4048-4051
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.ja=
va:3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/He=
lp.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/Help.jav=
a:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:367=
3-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:400=
2-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/Help.java:3507-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/Help.jav=
a:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:367=
3-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:400=
2-4046,4048-4051
/trunk/adminshell/src/main/java/org/teiid/adminshell/Help.java:3507-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/Mi=
grationUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/Migratio=
nUtil.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil=
.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil=
.java:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:350=
7-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/Migratio=
nUtil.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil=
.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil=
.java:4002-4046,4048-4051
/trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:350=
7-3666
Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/Sq=
lHelpCommand.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpC=
ommand.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpComman=
d.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpComman=
d.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpComman=
d.java:4002-4046
/trunk/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:35=
07-3666
+ /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpC=
ommand.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpComman=
d.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpComman=
d.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpComman=
d.java:4002-4046,4048-4051
/trunk/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:35=
07-3666
Property changes on: trunk/adminshell/src/main/resources/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org:3816-3868*,3876-3915*,392=
0-3983*
/branches/8.0.x/adminshell/src/main/resources/org:4002-4046*
/trunk/adminshell/src/main/resources/org:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org:3816-3868*,3876-3915*,392=
0-3983*
/branches/8.0.x/adminshell/src/main/resources/org:4002-4046*,4048-4051*
/trunk/adminshell/src/main/resources/org:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/codehaus
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/codehaus:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus:3673-3711*,3754-=
3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus:3816-3868*,3876-=
3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/codehaus:4002-4046*
/trunk/adminshell/src/main/resources/org/codehaus:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/codehaus:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus:3673-3711*,3754-=
3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus:3816-3868*,3876-=
3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/codehaus:4002-4046*,4048-=
4051*
/trunk/adminshell/src/main/resources/org/codehaus:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groovy
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy:3535=
-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy:3673-3711=
*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy:3816-3868=
*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy:4002-4046*
/trunk/adminshell/src/main/resources/org/codehaus/groovy:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy:3535=
-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy:3673-3711=
*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy:3816-3868=
*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy:4002-4046=
*,4048-4051*
/trunk/adminshell/src/main/resources/org/codehaus/groovy:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groov=
y/tools
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tool=
s:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools:367=
3-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools:381=
6-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy/tools:400=
2-4046*
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tool=
s:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools:367=
3-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools:381=
6-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy/tools:400=
2-4046*,4048-4051*
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groov=
y/tools/shell
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tool=
s/shell:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll:4002-4046*
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3507-3=
666
+ /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tool=
s/shell:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll:4002-4046*,4048-4051*
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3507-3=
666
Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groov=
y/tools/shell/commands.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tool=
s/shell/commands.xml:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll/commands.xml:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll/commands.xml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll/commands.xml:4002-4046
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/comman=
ds.xml:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tool=
s/shell/commands.xml:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll/commands.xml:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll/commands.xml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy/tools/she=
ll/commands.xml:4002-4046,4048-4051
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/comman=
ds.xml:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid:3816-3868*,3876-391=
5*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/teiid:4002-4046*
/trunk/adminshell/src/main/resources/org/teiid:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid:3816-3868*,3876-391=
5*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/teiid:4002-4046*,4048-405=
1*
/trunk/adminshell/src/main/resources/org/teiid:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/teiid/adminshe=
ll
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell:353=
5-3555*
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell:3673-371=
1*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell:3816-386=
8*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/teiid/adminshell:4002-404=
6*
/trunk/adminshell/src/main/resources/org/teiid/adminshell:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell:353=
5-3555*
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell:3673-371=
1*,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell:3816-386=
8*,3876-3915*,3920-3983*
/branches/8.0.x/adminshell/src/main/resources/org/teiid/adminshell:4002-404=
6*,4048-4051*
/trunk/adminshell/src/main/resources/org/teiid/adminshell:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/teiid/adminshe=
ll/AdminHelpCommand.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/Adm=
inHelpCommand.properties:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHel=
pCommand.properties:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHel=
pCommand.properties:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHel=
pCommand.properties:4002-4046
/trunk/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.=
properties:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/Adm=
inHelpCommand.properties:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHel=
pCommand.properties:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHel=
pCommand.properties:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHel=
pCommand.properties:4002-4046,4048-4051
/trunk/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.=
properties:3507-3666
Property changes on: trunk/adminshell/src/main/resources/org/teiid/adminshe=
ll/SqlHelpCommand.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/Sql=
HelpCommand.properties:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpC=
ommand.properties:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpC=
ommand.properties:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpC=
ommand.properties:4002-4046
/trunk/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.pr=
operties:3507-3666
+ /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/Sql=
HelpCommand.properties:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpC=
ommand.properties:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpC=
ommand.properties:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpC=
ommand.properties:4002-4046,4048-4051
/trunk/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.pr=
operties:3507-3666
Property changes on: trunk/adminshell/src/test/java/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/test/java/org:3535-3555*
/branches/7.6.x/adminshell/src/test/java/org:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/test/java/org:3816-3868*,3876-3915*,3920-398=
3*
/branches/8.0.x/adminshell/src/test/java/org:4002-4046*
/trunk/adminshell/src/test/java/org:3507-3666
+ /branches/7.4.x/adminshell/src/test/java/org:3535-3555*
/branches/7.6.x/adminshell/src/test/java/org:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/test/java/org:3816-3868*,3876-3915*,3920-398=
3*
/branches/8.0.x/adminshell/src/test/java/org:4002-4046*,4048-4051*
/trunk/adminshell/src/test/java/org:3507-3666
Property changes on: trunk/adminshell/src/test/java/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/test/java/org/teiid:3535-3555*
/branches/7.6.x/adminshell/src/test/java/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/test/java/org/teiid:3816-3868*,3876-3915*,39=
20-3983*
/branches/8.0.x/adminshell/src/test/java/org/teiid:4002-4046*
/trunk/adminshell/src/test/java/org/teiid:3507-3666
+ /branches/7.4.x/adminshell/src/test/java/org/teiid:3535-3555*
/branches/7.6.x/adminshell/src/test/java/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/test/java/org/teiid:3816-3868*,3876-3915*,39=
20-3983*
/branches/8.0.x/adminshell/src/test/java/org/teiid:4002-4046*,4048-4051*
/trunk/adminshell/src/test/java/org/teiid:3507-3666
Property changes on: trunk/adminshell/src/test/java/org/teiid/adminshell
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell:3535-355=
5*
/branches/7.6.x/adminshell/src/test/java/org/teiid/adminshell:3673-3711*,37=
54-3769
/branches/7.7.x/adminshell/src/test/java/org/teiid/adminshell:3816-3868*,38=
76-3915*,3920-3983*
/branches/8.0.x/adminshell/src/test/java/org/teiid/adminshell:4002-4046*
/trunk/adminshell/src/test/java/org/teiid/adminshell:3507-3666
+ /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell:3535-355=
5*
/branches/7.6.x/adminshell/src/test/java/org/teiid/adminshell:3673-3711*,37=
54-3769
/branches/7.7.x/adminshell/src/test/java/org/teiid/adminshell:3816-3868*,38=
76-3915*,3920-3983*
/branches/8.0.x/adminshell/src/test/java/org/teiid/adminshell:4002-4046*,40=
48-4051*
/trunk/adminshell/src/test/java/org/teiid/adminshell:3507-3666
Property changes on: trunk/adminshell/src/test/java/org/teiid/adminshell/Te=
stAdminShell.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell/TestAdmi=
nShell.java:3535-3555
/branches/7.6.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShel=
l.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShel=
l.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShel=
l.java:4002-4046
/trunk/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:35=
07-3666
+ /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell/TestAdmi=
nShell.java:3535-3555
/branches/7.6.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShel=
l.java:3673-3711,3754-3769
/branches/7.7.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShel=
l.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShel=
l.java:4002-4046,4048-4051
/trunk/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:35=
07-3666
Property changes on: trunk/adminshell/src/test/resources/foo
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/test/resources/foo:3535-3555*
/branches/7.6.x/adminshell/src/test/resources/foo:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/test/resources/foo:3816-3868*,3876-3915*,392=
0-3983*
/branches/8.0.x/adminshell/src/test/resources/foo:4002-4046*
/trunk/adminshell/src/test/resources/foo:3507-3666
+ /branches/7.4.x/adminshell/src/test/resources/foo:3535-3555*
/branches/7.6.x/adminshell/src/test/resources/foo:3673-3711*,3754-3769
/branches/7.7.x/adminshell/src/test/resources/foo:3816-3868*,3876-3915*,392=
0-3983*
/branches/8.0.x/adminshell/src/test/resources/foo:4002-4046*,4048-4051*
/trunk/adminshell/src/test/resources/foo:3507-3666
Property changes on: trunk/adminshell/src/test/resources/foo/bar.txt
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/adminshell/src/test/resources/foo/bar.txt:3535-3555
/branches/7.6.x/adminshell/src/test/resources/foo/bar.txt:3673-3711,3754-37=
69
/branches/7.7.x/adminshell/src/test/resources/foo/bar.txt:3816-3868,3876-39=
15,3920-3983
/branches/8.0.x/adminshell/src/test/resources/foo/bar.txt:4002-4046
/trunk/adminshell/src/test/resources/foo/bar.txt:3507-3666
+ /branches/7.4.x/adminshell/src/test/resources/foo/bar.txt:3535-3555
/branches/7.6.x/adminshell/src/test/resources/foo/bar.txt:3673-3711,3754-37=
69
/branches/7.7.x/adminshell/src/test/resources/foo/bar.txt:3816-3868,3876-39=
15,3920-3983
/branches/8.0.x/adminshell/src/test/resources/foo/bar.txt:4002-4046,4048-40=
51
/trunk/adminshell/src/test/resources/foo/bar.txt:3507-3666
Modified: trunk/api/src/main/java/org/teiid/connector/DataPlugin.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/api/src/main/java/org/teiid/connector/DataPlugin.java 2012-05-02 =
19:07:28 UTC (rev 4054)
+++ trunk/api/src/main/java/org/teiid/connector/DataPlugin.java 2012-05-02 =
21:36:21 UTC (rev 4055)
@@ -40,8 +40,6 @@
TEIID60003,
TEIID60004,
TEIID60005,
- TEIID60006,
- TEIID60007,
TEIID60008,
TEIID60009,
TEIID60010,
Property changes on: trunk/api/src/main/java/org/teiid/events
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/api/src/main/java/org/teiid/events:3535-3555*
/branches/7.6.x/api/src/main/java/org/teiid/events:3673-3711*,3754-3769
/branches/7.7.x/api/src/main/java/org/teiid/events:3816-3868*,3876-3915*,39=
20-3983*
/branches/8.0.x/api/src/main/java/org/teiid/events:4002-4046*
/trunk/api/src/main/java/org/teiid/events:3507-3666
+ /branches/7.4.x/api/src/main/java/org/teiid/events:3535-3555*
/branches/7.6.x/api/src/main/java/org/teiid/events:3673-3711*,3754-3769
/branches/7.7.x/api/src/main/java/org/teiid/events:3816-3868*,3876-3915*,39=
20-3983*
/branches/8.0.x/api/src/main/java/org/teiid/events:4002-4046*,4048-4051*
/trunk/api/src/main/java/org/teiid/events:3507-3666
Property changes on: trunk/api/src/main/java/org/teiid/events/EventDistribu=
tor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributor.ja=
va:3340-3349,3535-3555
/branches/7.6.x/api/src/main/java/org/teiid/events/EventDistributor.java:36=
73-3711,3754-3769
/branches/7.7.x/api/src/main/java/org/teiid/events/EventDistributor.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/api/src/main/java/org/teiid/events/EventDistributor.java:40=
02-4046
/trunk/api/src/main/java/org/teiid/events/EventDistributor.java:3188-3450,3=
452-3666
+ /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributor.ja=
va:3340-3349,3535-3555
/branches/7.6.x/api/src/main/java/org/teiid/events/EventDistributor.java:36=
73-3711,3754-3769
/branches/7.7.x/api/src/main/java/org/teiid/events/EventDistributor.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/api/src/main/java/org/teiid/events/EventDistributor.java:40=
02-4046,4048-4051
/trunk/api/src/main/java/org/teiid/events/EventDistributor.java:3188-3450,3=
452-3666
Property changes on: trunk/api/src/main/java/org/teiid/events/EventDistribu=
torFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributorFac=
tory.java:3535-3555
/branches/7.6.x/api/src/main/java/org/teiid/events/EventDistributorFactory.=
java:3673-3711,3754-3769
/branches/7.7.x/api/src/main/java/org/teiid/events/EventDistributorFactory.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/api/src/main/java/org/teiid/events/EventDistributorFactory.=
java:4002-4046
/trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3507=
-3666
+ /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributorFac=
tory.java:3535-3555
/branches/7.6.x/api/src/main/java/org/teiid/events/EventDistributorFactory.=
java:3673-3711,3754-3769
/branches/7.7.x/api/src/main/java/org/teiid/events/EventDistributorFactory.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/api/src/main/java/org/teiid/events/EventDistributorFactory.=
java:4002-4046,4048-4051
/trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3507=
-3666
Modified: trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012=
-05-02 19:07:28 UTC (rev 4054)
+++ trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012=
-05-02 21:36:21 UTC (rev 4055)
@@ -819,9 +819,9 @@
} catch (TeiidException e) {
throw new TranslatorException(DataPlugin.Event.TEIID60005, e);
} catch (IllegalAccessException e) {
- throw new TranslatorException(DataPlugin.Event.TEIID60006, e);
+ throw new TranslatorException(DataPlugin.Event.TEIID60005, e);
} catch(InstantiationException e) {
- throw new TranslatorException(DataPlugin.Event.TEIID60007, e);
+ throw new TranslatorException(DataPlugin.Event.TEIID60005, e);
} =
} =
=
Property changes on: trunk/build/kits
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/build/kits:3535-3555*
/branches/7.6.x/build/kits:3673-3711*,3754-3769
/branches/7.7.x/build/kits:3816-3868,3876-3915,3920-3983
/branches/8.0.x/build/kits:4002-4046
/trunk/build/kits:3507-3666
+ /branches/7.4.x/build/kits:3535-3555*
/branches/7.6.x/build/kits:3673-3711*,3754-3769
/branches/7.7.x/build/kits:3816-3868,3876-3915,3920-3983
/branches/8.0.x/build/kits:4002-4046,4048-4051
/trunk/build/kits:3507-3666
Property changes on: trunk/build/kits/adminshell
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/build/kits/adminshell:3535-3555
/branches/7.6.x/build/kits/adminshell:3673-3711,3754-3769
/branches/7.7.x/build/kits/adminshell:3816-3868,3876-3915,3920-3983
/branches/8.0.x/build/kits/adminshell:4002-4046
/trunk/build/kits/adminshell:3507-3666
+ /branches/7.4.x/build/kits/adminshell:3535-3555
/branches/7.6.x/build/kits/adminshell:3673-3711,3754-3769
/branches/7.7.x/build/kits/adminshell:3816-3868,3876-3915,3920-3983
/branches/8.0.x/build/kits/adminshell:4002-4046,4048-4051
/trunk/build/kits/adminshell:3507-3666
Property changes on: trunk/build/kits/jboss-as7
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/8.0.x/build/kits/jboss-as7:4048-4051
Property changes on: trunk/client/src/main/java/org/teiid/client/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/client/util:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/client/util:3673-3711*,3754-=
3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util:3816-3868*,3876-=
3915*,3920-3983*
/branches/8.0.x/client/src/main/java/org/teiid/client/util:4002-4046*
/trunk/client/src/main/java/org/teiid/client/util:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/client/util:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/client/util:3673-3711*,3754-=
3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util:3816-3868*,3876-=
3915*,3920-3983*
/branches/8.0.x/client/src/main/java/org/teiid/client/util:4002-4046*,4048-=
4051*
/trunk/client/src/main/java/org/teiid/client/util:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/client/util/Excep=
tionHolder.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionHo=
lder.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.=
java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.=
java:4002-4046
/trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3507=
-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionHo=
lder.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.=
java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.=
java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3507=
-3666
Property changes on: trunk/client/src/main/java/org/teiid/client/util/Excep=
tionUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionUt=
il.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.ja=
va:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.ja=
va:4002-4046
/trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3507-3=
666
+ /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionUt=
il.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.ja=
va:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.ja=
va:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3507-3=
666
Property changes on: trunk/client/src/main/java/org/teiid/client/util/Resul=
tsFuture.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsFutu=
re.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ResultsFuture.ja=
va:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ResultsFuture.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/client/util/ResultsFuture.ja=
va:4002-4046
/trunk/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3507-3=
666
+ /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsFutu=
re.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ResultsFuture.ja=
va:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ResultsFuture.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/client/util/ResultsFuture.ja=
va:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3507-3=
666
Property changes on: trunk/client/src/main/java/org/teiid/client/util/Resul=
tsReceiver.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsRece=
iver.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.=
java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.=
java:4002-4046
/trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3507=
-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsRece=
iver.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.=
java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.=
java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3507=
-3666
Modified: trunk/client/src/main/java/org/teiid/gss/MakeGSS.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/gss/MakeGSS.java 2012-05-02 19:07:=
28 UTC (rev 4054)
+++ trunk/client/src/main/java/org/teiid/gss/MakeGSS.java 2012-05-02 21:36:=
21 UTC (rev 4055)
@@ -100,7 +100,7 @@
} =
=
if (errors.length() > 0) {
- throw new LogonException(JDBCPlugin.Event.TEIID20004, errors.toS=
tring());
+ throw new LogonException(JDBCPlugin.Event.TEIID20005, errors.toS=
tring());
}
=
String user =3D props.getProperty(TeiidURL.CONNECTION.USER_NAME);
@@ -124,7 +124,7 @@
else if (result instanceof CommunicationException)
throw (CommunicationException)result;
else if (result instanceof Exception)
- throw new LogonException(JDBCPlugin.Event.TEIID20006, (Exception=
)result, JDBCPlugin.Util.gs(JDBCPlugin.Event.TEIID20006));
+ throw new LogonException(JDBCPlugin.Event.TEIID20005, (Exception=
)result, JDBCPlugin.Util.gs(JDBCPlugin.Event.TEIID20005));
=
return (LogonResult)result;
}
Property changes on: trunk/client/src/main/java/org/teiid/jdbc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/jdbc:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/client/src/main/java/org/teiid/jdbc:4002-4046*
/trunk/client/src/main/java/org/teiid/jdbc:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/jdbc:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/client/src/main/java/org/teiid/jdbc:4002-4046*,4048-4051*
/trunk/client/src/main/java/org/teiid/jdbc:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/BaseDataSour=
ce.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.jav=
a:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:367=
3-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:400=
2-4046
/trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.jav=
a:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:367=
3-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:400=
2-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/BatchResults=
.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:=
3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3673-=
3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3816-=
3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:4002-=
4046
/trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:=
3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3673-=
3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3816-=
3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:4002-=
4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/CallableStat=
ementImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/CallableStatementI=
mpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.j=
ava:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3507-=
3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/CallableStatementI=
mpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.j=
ava:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3507-=
3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ConnectionIm=
pl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.jav=
a:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:367=
3-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:400=
2-4046
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3188-3450,34=
52-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.jav=
a:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:367=
3-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:400=
2-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3188-3450,34=
52-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ConnectionLi=
stener.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionListener=
.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java=
:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java=
:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionListener=
.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java=
:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java=
:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ConnectionPr=
ofile.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.=
java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:=
3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:=
4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.=
java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:=
3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:=
4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/DataTypeTran=
sformer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DataTypeTransforme=
r.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.jav=
a:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3507-36=
66
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DataTypeTransforme=
r.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.jav=
a:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3507-36=
66
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/DatabaseMeta=
DataImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataIm=
pl.java:3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.ja=
va:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.ja=
va:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3188-3=
450,3452-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataIm=
pl.java:3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.ja=
va:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.ja=
va:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3188-3=
450,3452-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/DeferredMeta=
dataProvider.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataPr=
ovider.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvide=
r.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvide=
r.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvide=
r.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:35=
07-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataPr=
ovider.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvide=
r.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvide=
r.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvide=
r.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:35=
07-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProf=
ile.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.ja=
va:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:37=
54-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:40=
02-4046
/trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3188-3450,3=
452-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.ja=
va:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:37=
54-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:40=
02-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3188-3450,3=
452-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/EnhancedTime=
r.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java=
:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:4002=
-4046
/trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java=
:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:4002=
-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ExecutionPro=
perties.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ExecutionPropertie=
s.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.jav=
a:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3507-36=
66
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ExecutionPropertie=
s.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.jav=
a:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3507-36=
66
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/FilteredResu=
ltsMetadata.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMet=
adata.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata=
.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata=
.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:350=
7-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMet=
adata.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata=
.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata=
.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:350=
7-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNa=
mes.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.ja=
va:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:40=
02-4046
/trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.ja=
va:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:40=
02-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPo=
sitions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPosition=
s.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.jav=
a:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3507-36=
66
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPosition=
s.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.jav=
a:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3507-36=
66
Modified: trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java 2012-05-02 19=
:07:28 UTC (rev 4054)
+++ trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java 2012-05-02 21=
:36:21 UTC (rev 4055)
@@ -42,14 +42,11 @@
TEIID20001,
TEIID20002,
TEIID20003,
- TEIID20004,
TEIID20005,
- TEIID20006,
TEIID20007,
TEIID20008,
TEIID20009,
TEIID20010,
- TEIID20011,
TEIID20012,
TEIID20013,
TEIID20014,
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.j=
ava
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:35=
35-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3673-37=
11,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3816-38=
68,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:4002-40=
46
/trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:35=
35-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3673-37=
11,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3816-38=
68,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:4002-40=
46,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3149-=
3217,3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3673-3711,=
3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3816-3868,=
3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3188-3450,3452-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3149-=
3217,3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3673-3711,=
3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3816-3868,=
3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:4002-4046,=
4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3188-3450,3452-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/MetadataProv=
ider.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.j=
ava:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:4=
002-4046
/trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.j=
ava:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:4=
002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/NonBlockingR=
owProcessor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProc=
essor.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor=
.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:359=
8-3666
+ /branches/7.6.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProc=
essor.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor=
.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:359=
8-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ParameterMet=
aDataImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataI=
mpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.j=
ava:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3507-=
3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataI=
mpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.j=
ava:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3507-=
3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/PartialResul=
tsWarning.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarn=
ing.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.j=
ava:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3507-=
3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarn=
ing.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.j=
ava:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3507-=
3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/PreparedStat=
ementImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PreparedStatementI=
mpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.j=
ava:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3507-=
3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PreparedStatementI=
mpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.j=
ava:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3507-=
3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/RequestOptio=
ns.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/client/src/main/java/org/teiid/jdbc/RequestOptions.jav=
a:3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/RequestOptions.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/RequestOptions.java:400=
2-4046
/trunk/client/src/main/java/org/teiid/jdbc/RequestOptions.java:3507-3666
+ /branches/7.6.x/client/src/main/java/org/teiid/jdbc/RequestOptions.jav=
a:3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/RequestOptions.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/RequestOptions.java:400=
2-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/RequestOptions.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ResultSetImp=
l.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java=
:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:4002=
-4046
/trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java=
:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:4002=
-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ResultSetMet=
aDataImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataI=
mpl.java:3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.j=
ava:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3188-=
3450,3452-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataI=
mpl.java:3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.j=
ava:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3188-=
3450,3452-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/SQLStates.ja=
va
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:322=
0-3275,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3673-371=
1,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java:3188-3450,3452-36=
66
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:322=
0-3275,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3673-371=
1,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:4002-404=
6,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java:3188-3450,3452-36=
66
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/SocketProfil=
e.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java=
:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:4002=
-4046
/trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java=
:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:4002=
-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/StatementCal=
lback.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/client/src/main/java/org/teiid/jdbc/StatementCallback.=
java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/StatementCallback.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/StatementCallback.java:=
4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3598-3666
+ /branches/7.6.x/client/src/main/java/org/teiid/jdbc/StatementCallback.=
java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/StatementCallback.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/StatementCallback.java:=
4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3598-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/StatementImp=
l.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java=
:3149-3217,3220-3275,3281-3325,3355-3365,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:4002=
-4046
/trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3188-3450,345=
2-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java=
:3149-3217,3220-3275,3281-3325,3355-3365,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:4002=
-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3188-3450,345=
2-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidConnect=
ion.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.ja=
va:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:40=
02-4046
/trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.ja=
va:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:40=
02-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSou=
rce.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.ja=
va:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:40=
02-4046
/trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.ja=
va:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:40=
02-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.=
java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3=
535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3673-3=
711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:4002-4=
046
/trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3=
535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3673-3=
711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:4002-4=
046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidPrepare=
dStatement.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedState=
ment.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.=
java:4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:3598=
-3666
+ /branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedState=
ment.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.=
java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:3598=
-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLExce=
ption.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.=
java:3220-3275,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:=
3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:=
4002-4046
/trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3188-3450=
,3452-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.=
java:3220-3275,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:=
3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:=
4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3188-3450=
,3452-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarn=
ing.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.ja=
va:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:40=
02-4046
/trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:3598-3666
+ /branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.ja=
va:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:40=
02-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:3598-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidStateme=
nt.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.jav=
a:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:367=
3-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:400=
2-4046
/trunk/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.jav=
a:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:367=
3-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:400=
2-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.=
java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3=
535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3673-3=
711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:4002-4=
046
/trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3=
535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3673-3=
711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:4002-4=
046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.=
java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3=
535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3673-3=
711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:4002-4=
046
/trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3=
535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3673-3=
711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:4002-4=
046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/XAConnection=
Impl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.j=
ava:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:4=
002-4046
/trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.j=
ava:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:4=
002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/net/socket:3673-3711*,3754-3=
769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket:3816-3868*,3876-3=
915*,3920-3983*
/branches/8.0.x/client/src/main/java/org/teiid/net/socket:4002-4046*
/trunk/client/src/main/java/org/teiid/net/socket:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/net/socket:3673-3711*,3754-3=
769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket:3816-3868*,3876-3=
915*,3920-3983*
/branches/8.0.x/client/src/main/java/org/teiid/net/socket:4002-4046*,4048-4=
051*
/trunk/client/src/main/java/org/teiid/net/socket:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Authen=
ticationType.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/client/src/main/java/org/teiid/net/socket/Authenticati=
onType.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/AuthenticationTyp=
e.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/AuthenticationTyp=
e.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:35=
98-3666
+ /branches/7.6.x/client/src/main/java/org/teiid/net/socket/Authenticati=
onType.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/AuthenticationTyp=
e.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/AuthenticationTyp=
e.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:35=
98-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Handsh=
ake.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Handshake.ja=
va:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/Handshake.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/Handshake.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/Handshake.java:40=
02-4046
/trunk/client/src/main/java/org/teiid/net/socket/Handshake.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Handshake.ja=
va:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/Handshake.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/Handshake.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/Handshake.java:40=
02-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/Handshake.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Messag=
e.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Message.java=
:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/Message.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/Message.java:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/Message.java:4002=
-4046
/trunk/client/src/main/java/org/teiid/net/socket/Message.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Message.java=
:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/Message.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/Message.java:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/Message.java:4002=
-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/Message.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Object=
Channel.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChanne=
l.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.jav=
a:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3507-36=
66
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChanne=
l.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.jav=
a:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3507-36=
66
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Object=
ChannelFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChanne=
lFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFact=
ory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFact=
ory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFact=
ory.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:=
3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChanne=
lFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFact=
ory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFact=
ory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFact=
ory.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:=
3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/OioOjb=
ectChannelFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/OioOjbectCha=
nnelFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelF=
actory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelF=
actory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelF=
actory.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.ja=
va:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/OioOjbectCha=
nnelFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelF=
actory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelF=
actory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelF=
actory.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.ja=
va:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Server=
Discovery.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServerDiscov=
ery.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.j=
ava:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3507-=
3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServerDiscov=
ery.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.j=
ava:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3507-=
3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Servic=
eInvocationStruct.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServiceInvoc=
ationStruct.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ServiceInvocation=
Struct.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ServiceInvocation=
Struct.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/ServiceInvocation=
Struct.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.ja=
va:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServiceInvoc=
ationStruct.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ServiceInvocation=
Struct.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/ServiceInvocation=
Struct.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/ServiceInvocation=
Struct.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.ja=
va:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Single=
InstanceCommunicationException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SingleInstan=
ceCommunicationException.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCom=
municationException.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCom=
municationException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCom=
municationException.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicatio=
nException.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SingleInstan=
ceCommunicationException.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCom=
municationException.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCom=
municationException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCom=
municationException.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicatio=
nException.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Socket=
ServerConnection.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServer=
Connection.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ction.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ction.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ction.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.jav=
a:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServer=
Connection.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ction.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ction.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ction.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.jav=
a:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Socket=
ServerConnectionFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServer=
ConnectionFactory.java:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ctionFactory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ctionFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ctionFactory.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFact=
ory.java:3188-3450,3452-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServer=
ConnectionFactory.java:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ctionFactory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ctionFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerConne=
ctionFactory.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFact=
ory.java:3188-3450,3452-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Socket=
ServerInstance.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServer=
Instance.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nce.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nce.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nce.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:=
3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServer=
Instance.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nce.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nce.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nce.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:=
3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Socket=
ServerInstanceFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServer=
InstanceFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceFactory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceFactory.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactor=
y.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServer=
InstanceFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceFactory.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceFactory.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactor=
y.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Socket=
ServerInstanceImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServer=
InstanceImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceImpl.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.j=
ava:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServer=
InstanceImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceImpl.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceImpl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInsta=
nceImpl.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.j=
ava:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Socket=
Util.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketUtil.j=
ava:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:4=
002-4046
/trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3507-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketUtil.j=
ava:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:4=
002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3507-3666
Property changes on: trunk/client/src/main/java/org/teiid/net/socket/UrlSer=
verDiscovery.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/java/org/teiid/net/socket/UrlServerDis=
covery.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscover=
y.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscover=
y.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscover=
y.java:4002-4046
/trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:35=
07-3666
+ /branches/7.4.x/client/src/main/java/org/teiid/net/socket/UrlServerDis=
covery.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscover=
y.java:3673-3711,3754-3769
/branches/7.7.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscover=
y.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscover=
y.java:4002-4046,4048-4051
/trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:35=
07-3666
Property changes on: trunk/client/src/main/resources/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/resources/org:3535-3555*
/branches/7.6.x/client/src/main/resources/org:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/resources/org:3816-3868*,3876-3915*,3920-39=
83*
/branches/8.0.x/client/src/main/resources/org:4002-4046*
/trunk/client/src/main/resources/org:3507-3666
+ /branches/7.4.x/client/src/main/resources/org:3535-3555*
/branches/7.6.x/client/src/main/resources/org:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/resources/org:3816-3868*,3876-3915*,3920-39=
83*
/branches/8.0.x/client/src/main/resources/org:4002-4046*,4048-4051*
/trunk/client/src/main/resources/org:3507-3666
Property changes on: trunk/client/src/main/resources/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/client/src/main/resources/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/resources/org/teiid:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/client/src/main/resources/org/teiid:4002-4046*
/trunk/client/src/main/resources/org/teiid:3507-3666
+ /branches/7.4.x/client/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/client/src/main/resources/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/resources/org/teiid:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/client/src/main/resources/org/teiid:4002-4046*,4048-4051*
/trunk/client/src/main/resources/org/teiid:3507-3666
Property changes on: trunk/client/src/main/resources/org/teiid/jdbc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/resources/org/teiid/jdbc:3535-3555
/branches/7.6.x/client/src/main/resources/org/teiid/jdbc:3673-3711,3754-3769
/branches/7.7.x/client/src/main/resources/org/teiid/jdbc:3816-3868,3876-391=
5,3920-3983
/branches/8.0.x/client/src/main/resources/org/teiid/jdbc:4002-4046
/trunk/client/src/main/resources/org/teiid/jdbc:3507-3666
+ /branches/7.4.x/client/src/main/resources/org/teiid/jdbc:3535-3555
/branches/7.6.x/client/src/main/resources/org/teiid/jdbc:3673-3711,3754-3769
/branches/7.7.x/client/src/main/resources/org/teiid/jdbc:3816-3868,3876-391=
5,3920-3983
/branches/8.0.x/client/src/main/resources/org/teiid/jdbc:4002-4046,4048-4051
/trunk/client/src/main/resources/org/teiid/jdbc:3507-3666
Modified: trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties 2012-05-=
02 19:07:28 UTC (rev 4054)
+++ trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties 2012-05-=
02 21:36:21 UTC (rev 4055)
@@ -152,7 +152,6 @@
=
=
no_krb_ticket=3DNo cached kerberos ticket found and/or no password supplied
-TEIID20006=3DGSS Authentication failed
TEIID20005=3DGSS Authentication failed
TEIID20007=3DDuplicate class
setup_failed=3DProtocol error. Session setup failed.
Property changes on: trunk/client/src/main/resources/org/teiid/net
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/main/resources/org/teiid/net:3535-3555*
/branches/7.6.x/client/src/main/resources/org/teiid/net:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/resources/org/teiid/net:3816-3868*,3876-391=
5*,3920-3983*
/branches/8.0.x/client/src/main/resources/org/teiid/net:4002-4046*
/trunk/client/src/main/resources/org/teiid/net:3507-3666
+ /branches/7.4.x/client/src/main/resources/org/teiid/net:3535-3555*
/branches/7.6.x/client/src/main/resources/org/teiid/net:3673-3711*,3754-3769
/branches/7.7.x/client/src/main/resources/org/teiid/net:3816-3868*,3876-391=
5*,3920-3983*
/branches/8.0.x/client/src/main/resources/org/teiid/net:4002-4046*,4048-405=
1*
/trunk/client/src/main/resources/org/teiid/net:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/client/plan
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/client/plan:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/client/plan:3673-3711*,3754-=
3769
/branches/7.7.x/client/src/test/java/org/teiid/client/plan:3816-3868*,3876-=
3915*,3920-3983*
/branches/8.0.x/client/src/test/java/org/teiid/client/plan:4002-4046*
/trunk/client/src/test/java/org/teiid/client/plan:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/client/plan:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/client/plan:3673-3711*,3754-=
3769
/branches/7.7.x/client/src/test/java/org/teiid/client/plan:3816-3868*,3876-=
3915*,3920-3983*
/branches/8.0.x/client/src/test/java/org/teiid/client/plan:4002-4046*,4048-=
4051*
/trunk/client/src/test/java/org/teiid/client/plan:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/client/plan/TestP=
lanNode.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/client/plan/TestPlanNod=
e.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.jav=
a:4002-4046
/trunk/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3507-36=
66
+ /branches/7.4.x/client/src/test/java/org/teiid/client/plan/TestPlanNod=
e.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.jav=
a:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3507-36=
66
Property changes on: trunk/client/src/test/java/org/teiid/client/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/client/util:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/client/util:3673-3711*,3754-=
3769
/branches/7.7.x/client/src/test/java/org/teiid/client/util:3816-3868*,3876-=
3915*,3920-3983*
/branches/8.0.x/client/src/test/java/org/teiid/client/util:4002-4046*
/trunk/client/src/test/java/org/teiid/client/util:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/client/util:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/client/util:3673-3711*,3754-=
3769
/branches/7.7.x/client/src/test/java/org/teiid/client/util:3816-3868*,3876-=
3915*,3920-3983*
/branches/8.0.x/client/src/test/java/org/teiid/client/util:4002-4046*,4048-=
4051*
/trunk/client/src/test/java/org/teiid/client/util:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/client/util/TestE=
xceptionHolder.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestExcepti=
onHolder.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/util/TestExceptionHol=
der.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/util/TestExceptionHol=
der.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/client/util/TestExceptionHol=
der.java:4002-4046
/trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:=
3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestExcepti=
onHolder.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/util/TestExceptionHol=
der.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/util/TestExceptionHol=
der.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/client/util/TestExceptionHol=
der.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:=
3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/client/util/TestR=
esultsFuture.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestResults=
Future.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/util/TestResultsFutur=
e.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/util/TestResultsFutur=
e.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/client/util/TestResultsFutur=
e.java:4002-4046
/trunk/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:35=
07-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestResults=
Future.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/util/TestResultsFutur=
e.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/client/util/TestResultsFutur=
e.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/client/util/TestResultsFutur=
e.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:35=
07-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/jdbc:3673-3711*,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/client/src/test/java/org/teiid/jdbc:4002-4046*
/trunk/client/src/test/java/org/teiid/jdbc:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/jdbc:3673-3711*,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/client/src/test/java/org/teiid/jdbc:4002-4046*,4048-4051*
/trunk/client/src/test/java/org/teiid/jdbc:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestAllResul=
tsImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl=
.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java=
:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java=
:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl=
.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java=
:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java=
:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestBatchRes=
ults.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.j=
ava:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:4=
002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.j=
ava:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:4=
002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestCallable=
Statement.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestCallableStatem=
ent.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.j=
ava:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3507-=
3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestCallableStatem=
ent.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.j=
ava:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3507-=
3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestConnecti=
on.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestConnection.jav=
a:3281-3325,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:367=
3-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:400=
2-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java:3188-3450,34=
52-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestConnection.jav=
a:3281-3325,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:367=
3-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:400=
2-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java:3188-3450,34=
52-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestDataType=
Transformer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransf=
ormer.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer=
.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer=
.java:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:350=
7-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransf=
ormer.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer=
.java:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer=
.java:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:350=
7-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestEmbedded=
Profile.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfil=
e.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.jav=
a:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3507-36=
66
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfil=
e.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.jav=
a:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3507-36=
66
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestEnhanced=
Timer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.=
java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:=
3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:=
4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.=
java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:=
3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:=
4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.=
java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3=
535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3673-3=
711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:4002-4=
046
/trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3=
535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3673-3=
711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:4002-4=
046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestPrepared=
Statement.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatem=
ent.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.j=
ava:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3507-=
3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatem=
ent.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.j=
ava:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.j=
ava:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3507-=
3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestResultSe=
t.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java=
:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:4002=
-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java=
:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:4002=
-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestSQLExcep=
tion.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSQLException.j=
ava:3220-3275,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:4=
002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3188-3450,=
3452-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSQLException.j=
ava:3220-3275,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:4=
002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3188-3450,=
3452-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestSocketPr=
ofile.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.=
java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:=
3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:=
4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.=
java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:=
3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:=
4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestStatemen=
t.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestStatement.java=
:3149-3217,3220-3275,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:4002=
-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java:3188-3450,345=
2-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestStatement.java=
:3149-3217,3220-3275,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3673=
-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:4002=
-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java:3188-3450,345=
2-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDat=
aSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSourc=
e.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.jav=
a:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3507-36=
66
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSourc=
e.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.jav=
a:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.jav=
a:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3507-36=
66
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDri=
ver.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.ja=
va:3149-3217,3281-3325,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:40=
02-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3188-3450,3=
452-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.ja=
va:3149-3217,3281-3325,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:40=
02-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3188-3450,3=
452-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestWrapperI=
mpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.ja=
va:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:40=
02-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.ja=
va:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:36=
73-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:40=
02-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestXAConnec=
tion.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.j=
ava:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:4=
002-4046
/trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.j=
ava:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3=
673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:4=
002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/jdbc/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/jdbc/util:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/util:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/util:3816-3868,3876-391=
5,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/util:4002-4046
/trunk/client/src/test/java/org/teiid/jdbc/util:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/jdbc/util:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/util:3673-3711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/jdbc/util:3816-3868,3876-391=
5,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/jdbc/util:4002-4046,4048-4051
/trunk/client/src/test/java/org/teiid/jdbc/util:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/net
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/net:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/net:3673-3711*,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/net:3816-3868*,3876-3915*,39=
20-3983*
/branches/8.0.x/client/src/test/java/org/teiid/net:4002-4046*
/trunk/client/src/test/java/org/teiid/net:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/net:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/net:3673-3711*,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/net:3816-3868*,3876-3915*,39=
20-3983*
/branches/8.0.x/client/src/test/java/org/teiid/net:4002-4046*,4048-4051*
/trunk/client/src/test/java/org/teiid/net:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/net/TestTeiidURL.=
java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3=
535-3555
/branches/7.6.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3673-3=
711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:4002-4=
046
/trunk/client/src/test/java/org/teiid/net/TestTeiidURL.java:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3=
535-3555
/branches/7.6.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3673-3=
711,3754-3769
/branches/7.7.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:4002-4=
046,4048-4051
/trunk/client/src/test/java/org/teiid/net/TestTeiidURL.java:3507-3666
Property changes on: trunk/client/src/test/java/org/teiid/net/socket
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/client/src/test/java/org/teiid/net/socket:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/net/socket:3673-3711,3754-37=
69
/branches/7.7.x/client/src/test/java/org/teiid/net/socket:3816-3868,3876-39=
15,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/net/socket:4002-4046
/trunk/client/src/test/java/org/teiid/net/socket:3507-3666
+ /branches/7.4.x/client/src/test/java/org/teiid/net/socket:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/net/socket:3673-3711,3754-37=
69
/branches/7.7.x/client/src/test/java/org/teiid/net/socket:3816-3868,3876-39=
15,3920-3983
/branches/8.0.x/client/src/test/java/org/teiid/net/socket:4002-4046,4048-40=
51
/trunk/client/src/test/java/org/teiid/net/socket:3507-3666
Property changes on: trunk/common-core/src/main/java/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org:3535-3555*
/branches/7.6.x/common-core/src/main/java/org:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/main/java/org:3816-3868*,3876-3915*,3920-39=
83*
/branches/8.0.x/common-core/src/main/java/org:4002-4046*
/trunk/common-core/src/main/java/org:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org:3535-3555*
/branches/7.6.x/common-core/src/main/java/org:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/main/java/org:3816-3868*,3876-3915*,3920-39=
83*
/branches/8.0.x/common-core/src/main/java/org:4002-4046*,4048-4051*
/trunk/common-core/src/main/java/org:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid:3535-3555*
/branches/7.6.x/common-core/src/main/java/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/common-core/src/main/java/org/teiid:4002-4046*
/trunk/common-core/src/main/java/org/teiid:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid:3535-3555*
/branches/7.6.x/common-core/src/main/java/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/common-core/src/main/java/org/teiid:4002-4046*,4048-4051*
/trunk/common-core/src/main/java/org/teiid:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core:3535-3555*
/branches/7.6.x/common-core/src/main/java/org/teiid/core:3673-3711*,3754-37=
69
/branches/7.7.x/common-core/src/main/java/org/teiid/core:3816-3868*,3876-39=
15*,3920-3983*
/branches/8.0.x/common-core/src/main/java/org/teiid/core:4002-4046*
/trunk/common-core/src/main/java/org/teiid/core:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core:3535-3555*
/branches/7.6.x/common-core/src/main/java/org/teiid/core:3673-3711*,3754-37=
69
/branches/7.7.x/common-core/src/main/java/org/teiid/core:3816-3868*,3876-39=
15*,3920-3983*
/branches/8.0.x/common-core/src/main/java/org/teiid/core:4002-4046*,4048-40=
51*
/trunk/common-core/src/main/java/org/teiid/core:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/BundleU=
til.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/BundleUtil.ja=
va:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:36=
73-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:40=
02-4046
/trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/BundleUtil.ja=
va:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:36=
73-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:40=
02-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/Compone=
ntNotFoundException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/ComponentNotF=
oundException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundE=
xception.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundE=
xception.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundE=
xception.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.=
java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/ComponentNotF=
oundException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundE=
xception.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundE=
xception.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundE=
xception.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.=
java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/CoreCon=
stants.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/CoreConstants=
.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/CoreConstants.java=
:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/CoreConstants.java=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/CoreConstants.java=
:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/CoreConstants.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/CoreConstants=
.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/CoreConstants.java=
:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/CoreConstants.java=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/CoreConstants.java=
:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/CoreConstants.java:3507-3666
Modified: trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java 2012-05-=
02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java 2012-05-=
02 21:36:21 UTC (rev 4055)
@@ -66,11 +66,6 @@
TEIID10022,
TEIID10023,
TEIID10024,
- TEIID10025,
- TEIID10026,
- TEIID10027,
- TEIID10028,
- TEIID10029,
TEIID10030,
TEIID10031,
TEIID10032,
@@ -91,24 +86,17 @@
TEIID10047,
TEIID10048,
TEIID10049,
- TEIID10050,
TEIID10051,
TEIID10052,
TEIID10053,
TEIID10054,
- TEIID10055,
TEIID10056,
TEIID10057,
TEIID10058,
TEIID10059,
TEIID10060,
TEIID10061,
- TEIID10062,
TEIID10063,
- TEIID10064,
- TEIID10065,
- TEIID10066,
- TEIID10067,
TEIID10068,
TEIID10069,
TEIID10070,
@@ -116,11 +104,9 @@
TEIID10072,
TEIID10073,
TEIID10074,
- TEIID10075,
TEIID10076,
TEIID10077,
TEIID10078,
- TEIID10079,
TEIID10080,
TEIID10081, =
}
Property changes on: trunk/common-core/src/main/java/org/teiid/core/CorePlu=
gin.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/CorePlugin.ja=
va:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:36=
73-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:40=
02-4046
/trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/CorePlugin.ja=
va:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:36=
73-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:38=
16-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:40=
02-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidCo=
mponentException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidComponen=
tException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidComponentExce=
ption.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidComponentExce=
ption.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidComponentExce=
ption.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/TeiidComponentException.jav=
a:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidComponen=
tException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidComponentExce=
ption.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidComponentExce=
ption.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidComponentExce=
ption.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/TeiidComponentException.jav=
a:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidEx=
ception.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidExceptio=
n.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidException.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidException.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidException.jav=
a:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/TeiidException.java:3188-34=
50,3452-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidExceptio=
n.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidException.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidException.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidException.jav=
a:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/TeiidException.java:3188-34=
50,3452-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidPr=
ocessingException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidProcessi=
ngException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidProcessingExc=
eption.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidProcessingExc=
eption.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidProcessingExc=
eption.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/TeiidProcessingException.ja=
va:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidProcessi=
ngException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidProcessingExc=
eption.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidProcessingExc=
eption.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidProcessingExc=
eption.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/TeiidProcessingException.ja=
va:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidRu=
ntimeException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeE=
xception.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeExcept=
ion.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeExcept=
ion.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeExcept=
ion.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:=
3188-3450,3452-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeE=
xception.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeExcept=
ion.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeExcept=
ion.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeExcept=
ion.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:=
3188-3450,3452-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/crypto
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/crypto:3535-3=
555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/crypto:3673-3711,3=
754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/crypto:3816-3868,3=
876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/crypto:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/crypto:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/crypto:3535-3=
555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/crypto:3673-3711,3=
754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/crypto:3816-3868,3=
876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/crypto:4002-4046,4=
048-4051
/trunk/common-core/src/main/java/org/teiid/core/crypto:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types:3535-35=
55*
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types:3673-3711*,3=
754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types:4002-4046*
/trunk/common-core/src/main/java/org/teiid/core/types:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types:3535-35=
55*
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types:3673-3711*,3=
754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types:4002-4046*,4=
048-4051*
/trunk/common-core/src/main/java/org/teiid/core/types:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/B=
aseLob.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BaseLob=
.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java=
:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java=
:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BaseLob=
.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java=
:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java=
:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/B=
inaryType.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BinaryT=
ype.java:3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BinaryType.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BinaryType.j=
ava:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/BinaryType.java:3507-=
3666
+ /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BinaryT=
ype.java:3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BinaryType.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BinaryType.j=
ava:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/BinaryType.java:3507-=
3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/B=
lobImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobImp=
l.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.jav=
a:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3507-36=
66
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobImp=
l.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.jav=
a:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3507-36=
66
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/B=
lobType.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobTyp=
e.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BlobType.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BlobType.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BlobType.jav=
a:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java:3507-36=
66
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobTyp=
e.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BlobType.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BlobType.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BlobType.jav=
a:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java:3507-36=
66
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/C=
lobImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobImp=
l.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.jav=
a:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3507-36=
66
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobImp=
l.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.jav=
a:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3507-36=
66
Modified: trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java 2012=
-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java 2012=
-05-02 21:36:21 UTC (rev 4055)
@@ -33,8 +33,6 @@
import java.sql.Clob;
import java.sql.SQLException;
=
-import javax.sql.rowset.serial.SerialClob;
-
import org.teiid.core.CorePlugin;
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.util.ObjectConverterUtil;
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/C=
lobType.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobTyp=
e.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/ClobType.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/ClobType.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/ClobType.jav=
a:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java:3507-36=
66
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobTyp=
e.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/ClobType.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/ClobType.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/ClobType.jav=
a:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java:3507-36=
66
Modified: trunk/common-core/src/main/java/org/teiid/core/types/DataTypeMana=
ger.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.ja=
va 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.ja=
va 2012-05-02 21:36:21 UTC (rev 4055)
@@ -847,7 +847,7 @@
targetClass);
if (transform =3D=3D null) {
Object[] params =3D new Object[] { sourceType, targetClass, va=
lue};
- throw new TransformationException(CorePlugin.Event.TEIID1005=
0, CorePlugin.Util.gs(CorePlugin.Event.TEIID10050, params));
+ throw new TransformationException(CorePlugin.Event.TEIID1007=
6, CorePlugin.Util.gs(CorePlugin.Event.TEIID10076, params));
}
T result =3D (T) transform.transform(value);
return getCanonicalValue(result);
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/D=
ataTypeManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/DataTyp=
eManager.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/DataTypeMana=
ger.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/DataTypeMana=
ger.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/DataTypeMana=
ger.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:=
3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/DataTyp=
eManager.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/DataTypeMana=
ger.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/DataTypeMana=
ger.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/DataTypeMana=
ger.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:=
3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/I=
nputStreamFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/InputSt=
reamFactory.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/InputStreamF=
actory.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/InputStreamF=
actory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/InputStreamF=
actory.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.ja=
va:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/InputSt=
reamFactory.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/InputStreamF=
actory.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/InputStreamF=
actory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/InputStreamF=
actory.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.ja=
va:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/J=
DBCSQLTypeInfo.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/JDBCSQL=
TypeInfo.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeI=
nfo.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeI=
nfo.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeI=
nfo.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:=
3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/JDBCSQL=
TypeInfo.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeI=
nfo.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeI=
nfo.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeI=
nfo.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:=
3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/L=
obSearchUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/LobSear=
chUtil.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/LobSearchUti=
l.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/LobSearchUti=
l.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/LobSearchUti=
l.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:35=
07-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/LobSear=
chUtil.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/LobSearchUti=
l.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/LobSearchUti=
l.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/LobSearchUti=
l.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:35=
07-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/N=
ullType.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/NullTyp=
e.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/NullType.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/NullType.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/NullType.jav=
a:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/NullType.java:3507-36=
66
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/NullTyp=
e.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/NullType.jav=
a:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/NullType.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/NullType.jav=
a:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/NullType.java:3507-36=
66
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/S=
QLXMLImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SQLXMLI=
mpl.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.j=
ava:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.j=
ava:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3507-=
3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SQLXMLI=
mpl.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.j=
ava:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.j=
ava:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3507-=
3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/S=
equencable.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Sequenc=
able.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Sequencable.=
java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Sequencable.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Sequencable.=
java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3507=
-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Sequenc=
able.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Sequencable.=
java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Sequencable.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Sequencable.=
java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3507=
-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/S=
ourceTransform.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SourceT=
ransform.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/SourceTransf=
orm.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/SourceTransf=
orm.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/SourceTransf=
orm.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:=
3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SourceT=
ransform.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/SourceTransf=
orm.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/SourceTransf=
orm.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/SourceTransf=
orm.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:=
3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/S=
tandardXMLTranslator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Standar=
dXMLTranslator.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/StandardXMLT=
ranslator.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/StandardXMLT=
ranslator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/StandardXMLT=
ranslator.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator=
.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Standar=
dXMLTranslator.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/StandardXMLT=
ranslator.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/StandardXMLT=
ranslator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/StandardXMLT=
ranslator.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator=
.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/S=
treamable.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Streama=
ble.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Streamable.j=
ava:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Streamable.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Streamable.j=
ava:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java:3507-=
3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Streama=
ble.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Streamable.j=
ava:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Streamable.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Streamable.j=
ava:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java:3507-=
3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/T=
ransform.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Transfo=
rm.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Transform.ja=
va:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Transform.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Transform.ja=
va:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/Transform.java:3507-3=
666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Transfo=
rm.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Transform.ja=
va:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Transform.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Transform.ja=
va:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/Transform.java:3507-3=
666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/T=
ransformationException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Transfo=
rmationException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Transformati=
onException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Transformati=
onException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Transformati=
onException.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/TransformationExcepti=
on.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Transfo=
rmationException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Transformati=
onException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Transformati=
onException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Transformati=
onException.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/TransformationExcepti=
on.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/X=
MLTranslator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLTran=
slator.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/XMLTranslato=
r.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/XMLTranslato=
r.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/XMLTranslato=
r.java:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:35=
07-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLTran=
slator.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/XMLTranslato=
r.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/XMLTranslato=
r.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/XMLTranslato=
r.java:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:35=
07-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/X=
MLType.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLType=
.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/XMLType.java=
:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/XMLType.java=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/XMLType.java=
:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLType=
.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/XMLType.java=
:3673-3711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/XMLType.java=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/XMLType.java=
:4002-4046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java:3507-3666
Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/b=
asic
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/basic:3=
535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/basic:3673-3=
711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/basic:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic:4002-4=
046
/trunk/common-core/src/main/java/org/teiid/core/types/basic:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/basic:3=
535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/basic:3673-3=
711,3754-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/types/basic:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic:4002-4=
046,4048-4051
/trunk/common-core/src/main/java/org/teiid/core/types/basic:3507-3666
Modified: trunk/common-core/src/main/java/org/teiid/core/types/basic/BlobTo=
BinaryTransform.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common-core/src/main/java/org/teiid/core/types/basic/BlobToBinary=
Transform.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/java/org/teiid/core/types/basic/BlobToBinary=
Transform.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -51,7 +51,7 @@
byte[] bytes =3D ObjectConverterUtil.convertToByteArray(source.ge=
tBinaryStream(), DataTypeManager.MAX_LOB_MEMORY_BYTES, true);
return new BinaryType(bytes); =
} catch (SQLException e) {
- throw new TransformationException(CorePlugin.Event.TEIID1007=
9, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10079, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
+ throw new TransformationException(CorePlugin.Event.TEIID1008=
0, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10080, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
} catch(IOException e) {
throw new TransformationException(CorePlugin.Event.TEIID1008=
0, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10080, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
} =
Modified: trunk/common-core/src/main/java/org/teiid/core/types/basic/ClobTo=
StringTransform.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common-core/src/main/java/org/teiid/core/types/basic/ClobToString=
Transform.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/java/org/teiid/core/types/basic/ClobToString=
Transform.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -61,9 +61,9 @@
}
return contents.toString(); =
} catch (SQLException e) {
- throw new TransformationException(CorePlugin.Event.TEIID1006=
4, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10064, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
+ throw new TransformationException(CorePlugin.Event.TEIID1008=
0, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10080, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
} catch(IOException e) {
- throw new TransformationException(CorePlugin.Event.TEIID1006=
5, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10065, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
+ throw new TransformationException(CorePlugin.Event.TEIID1008=
0, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10080, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
} finally {
if (reader !=3D null) {
try {
Modified: trunk/common-core/src/main/java/org/teiid/core/types/basic/Object=
ToAnyTransform.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common-core/src/main/java/org/teiid/core/types/basic/ObjectToAnyT=
ransform.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/java/org/teiid/core/types/basic/ObjectToAnyT=
ransform.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -56,7 +56,7 @@
=
if (transform =3D=3D null || transform instanceof ObjectToAnyTrans=
form) {
Object[] params =3D new Object[] { getSourceType(), targetClas=
s, value};
- throw new TransformationException(CorePlugin.Event.TEIID1007=
5, CorePlugin.Util.gs(CorePlugin.Event.TEIID10075, params));
+ throw new TransformationException(CorePlugin.Event.TEIID1007=
6, CorePlugin.Util.gs(CorePlugin.Event.TEIID10076, params));
}
=
try {
Modified: trunk/common-core/src/main/java/org/teiid/core/types/basic/SQLXML=
ToStringTransform.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common-core/src/main/java/org/teiid/core/types/basic/SQLXMLToStri=
ngTransform.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/java/org/teiid/core/types/basic/SQLXMLToStri=
ngTransform.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -56,9 +56,9 @@
int read =3D reader.read(result);
return new String(result, 0, read);
} catch (SQLException e) {
- throw new TransformationException(CorePlugin.Event.TEIID1006=
6, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10066, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
+ throw new TransformationException(CorePlugin.Event.TEIID1008=
0, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10080, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
} catch (IOException e) {
- throw new TransformationException(CorePlugin.Event.TEIID1006=
7, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10067, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
+ throw new TransformationException(CorePlugin.Event.TEIID1008=
0, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10080, new Object[] {getSour=
ceType().getName(), getTargetType().getName()}));
} finally {
try {
if (reader !=3D null) {
Modified: trunk/common-core/src/main/java/org/teiid/core/types/basic/String=
ToDateTransform.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common-core/src/main/java/org/teiid/core/types/basic/StringToDate=
Transform.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/java/org/teiid/core/types/basic/StringToDate=
Transform.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -58,12 +58,12 @@
result =3D Date.valueOf( (String) value );
} catch(Exception e) {
if (!validate && pattern.matcher((String)value).matches()) {
- throw new TransformationException(CorePlugin.Event.TEIID10062, Co=
rePlugin.Util.gs(CorePlugin.Event.TEIID10062, value, getTargetType().getSim=
pleName()));
+ throw new TransformationException(CorePlugin.Event.TEIID10060, Co=
rePlugin.Util.gs(CorePlugin.Event.TEIID10060, value, getTargetType().getSim=
pleName()));
}
throw new TransformationException(CorePlugin.Event.TEIID10061, e, Cor=
ePlugin.Util.gs(CorePlugin.Event.TEIID10061, value));
}
if (validate && !result.toString().equals(value)) {
- throw new TransformationException(CorePlugin.Event.TEIID10062, CorePl=
ugin.Util.gs(CorePlugin.Event.TEIID10062, value, getTargetType().getSimpleN=
ame()));
+ throw new TransformationException(CorePlugin.Event.TEIID10060, CorePl=
ugin.Util.gs(CorePlugin.Event.TEIID10060, value, getTargetType().getSimpleN=
ame()));
}
return result;
}
Property changes on: trunk/common-core/src/main/java/org/teiid/core/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/main/java/org/teiid/core/util:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/util:3673-3711,375=
4-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/util:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/util:4002-4046
/trunk/common-core/src/main/java/org/teiid/core/util:3507-3666
+ /branches/7.4.x/common-core/src/main/java/org/teiid/core/util:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/util:3673-3711,375=
4-3769
/branches/7.7.x/common-core/src/main/java/org/teiid/core/util:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/common-core/src/main/java/org/teiid/core/util:4002-4046,404=
8-4051
/trunk/common-core/src/main/java/org/teiid/core/util:3507-3666
Modified: trunk/common-core/src/main/java/org/teiid/core/util/FileUtils.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common-core/src/main/java/org/teiid/core/util/FileUtils.java 2012=
-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/java/org/teiid/core/util/FileUtils.java 2012=
-05-02 21:36:21 UTC (rev 4055)
@@ -22,17 +22,7 @@
=
package org.teiid.core.util;
=
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
import java.util.ArrayList;
import java.util.List;
=
@@ -74,12 +64,6 @@
public final static char[] SUFFIX_zip =3D ".zip".toCharArray(); //$NON=
-NLS-1$
public final static char[] SUFFIX_ZIP =3D ".ZIP".toCharArray(); //$NON=
-NLS-1$
=
- =
- private static final String TEMP_FILE =3D "delete.me"; //$NON-NLS-1$
- private static final String TEMP_FILE_RENAMED =3D "delete.me.old"; //$=
NON-NLS-1$
- =
- =
- =
static {
String tempDirPath =3D System.getProperty(JAVA_IO_TEMP_DIR); =
TEMP_DIRECTORY =3D (tempDirPath.endsWith(File.separator) ? tempDir=
Path : tempDirPath + File.separator);
@@ -751,63 +735,6 @@
}
=
/**
- * Test whether it's possible to read and write files in the specified=
directory. =
- * @param dirPath Name of the directory to test
- * @throws TeiidException
- * @since 4.3
- */
- public static void testDirectoryPermissions(String dirPath) throws Tei=
idException {
- =
- //try to create a file
- File tmpFile =3D new File(dirPath + File.separatorChar + TEMP_FILE=
);
- boolean success =3D false;
- try {
- success =3D tmpFile.createNewFile();
- } catch (IOException e) {
- }
- if (!success) {
- final String msg =3D CorePlugin.Util.getString("FileUtils.Unab=
le_to_create_file_in", dirPath); //$NON-NLS-1$ =
- throw new TeiidException(CorePlugin.Event.TEIID10025, msg);
- }
- =
-
- //test if file can be written to
- if (!tmpFile.canWrite()) {
- final String msg =3D CorePlugin.Util.getString("FileUtils.Unab=
le_to_write_file_in", dirPath); //$NON-NLS-1$ =
- throw new TeiidException(CorePlugin.Event.TEIID10026, msg);
- }
-
- //test if file can be read
- if (!tmpFile.canRead()) {
- final String msg =3D CorePlugin.Util.getString("FileUtils.Unab=
le_to_read_file_in", dirPath); //$NON-NLS-1$ =
- throw new TeiidException(CorePlugin.Event.TEIID10027, msg);
- }
-
- //test if file can be renamed
- File newFile =3D new File(dirPath + File.separatorChar + TEMP_FILE=
_RENAMED);
- success =3D false;
- try {
- success =3D tmpFile.renameTo(newFile);
- } catch (Exception e) {
- }
- if (!success) {
- final String msg =3D CorePlugin.Util.getString("FileUtils.Unab=
le_to_rename_file_in", dirPath); //$NON-NLS-1$ =
- throw new TeiidException(CorePlugin.Event.TEIID10028, msg);
- }
-
- //test if file can be deleted
- success =3D false;
- try {
- success =3D newFile.delete();
- } catch (Exception e) {
- }
- if (!success) {
- final String msg =3D CorePlugin.Util.getString("FileUtils.Unab=
le_to_delete_file_in", dirPath); //$NON-NLS-1$ =
- throw new TeiidException(CorePlugin.Event.TEIID10029, msg);
- }
- }
-
- /**
* Rename a file. =
* @param oldFilePath
* @param newFilePath
Modified: trunk/common-core/src/main/java/org/teiid/core/util/ReflectionHel=
per.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common-core/src/main/java/org/teiid/core/util/ReflectionHelper.ja=
va 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/java/org/teiid/core/util/ReflectionHelper.ja=
va 2012-05-02 21:36:21 UTC (rev 4055)
@@ -23,7 +23,6 @@
package org.teiid.core.util;
=
import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
Modified: trunk/common-core/src/main/resources/org/teiid/core/i18n.properti=
es
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common-core/src/main/resources/org/teiid/core/i18n.properties 201=
2-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/main/resources/org/teiid/core/i18n.properties 201=
2-05-02 21:36:21 UTC (rev 4055)
@@ -70,11 +70,6 @@
IDGenerator.The_stringified_ID_may_not_be_null=3DThe stringified ID may no=
t be null
FileUtils.The_name_of_the_file_may_not_be_null=3DThe name of the file may =
not be null
FileUtils.The_file_extension_may_not_be_null=3DThe file extension may not =
be null
-FileUtils.Unable_to_create_file_in=3DUnable to create file in \"{0}\"
-FileUtils.Unable_to_write_file_in=3DUnable to create file in \"{0}\"
-FileUtils.Unable_to_read_file_in=3DUnable to create file in \"{0}\"
-FileUtils.Unable_to_rename_file_in=3DUnable to create file in \"{0}\"
-FileUtils.Unable_to_delete_file_in=3DUnable to create file in \"{0}\"
FileUtils.File_already_exists=3DFile "\{0}\" already exists =
=
=
Property changes on: trunk/common-core/src/test/java/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org:3535-3555*
/branches/7.6.x/common-core/src/test/java/org:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/test/java/org:3816-3868*,3876-3915*,3920-39=
83*
/branches/8.0.x/common-core/src/test/java/org:4002-4046*
/trunk/common-core/src/test/java/org:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org:3535-3555*
/branches/7.6.x/common-core/src/test/java/org:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/test/java/org:3816-3868*,3876-3915*,3920-39=
83*
/branches/8.0.x/common-core/src/test/java/org:4002-4046*,4048-4051*
/trunk/common-core/src/test/java/org:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/common-core/src/test/java/org/teiid:4002-4046*
/trunk/common-core/src/test/java/org/teiid:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid:3673-3711*,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/common-core/src/test/java/org/teiid:4002-4046*,4048-4051*
/trunk/common-core/src/test/java/org/teiid:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid/core:3673-3711*,3754-37=
69
/branches/7.7.x/common-core/src/test/java/org/teiid/core:3816-3868*,3876-39=
15*,3920-3983*
/branches/8.0.x/common-core/src/test/java/org/teiid/core:4002-4046*
/trunk/common-core/src/test/java/org/teiid/core:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid/core:3673-3711*,3754-37=
69
/branches/7.7.x/common-core/src/test/java/org/teiid/core:3816-3868*,3876-39=
15*,3920-3983*
/branches/8.0.x/common-core/src/test/java/org/teiid/core:4002-4046*,4048-40=
51*
/trunk/common-core/src/test/java/org/teiid/core:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/TestMet=
aMatrixException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatri=
xException.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixExce=
ption.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixExce=
ption.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixExce=
ption.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.jav=
a:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatri=
xException.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixExce=
ption.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixExce=
ption.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixExce=
ption.java:4002-4046,4048-4051
/trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.jav=
a:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/TestMet=
aMatrixRuntimeException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatri=
xRuntimeException.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRunt=
imeException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRunt=
imeException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRunt=
imeException.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeExcept=
ion.java:3188-3450,3452-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatri=
xRuntimeException.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRunt=
imeException.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRunt=
imeException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRunt=
imeException.java:4002-4046,4048-4051
/trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeExcept=
ion.java:3188-3450,3452-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/crypto
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/crypto:3535-3=
555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/crypto:3673-3711,3=
754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/crypto:3816-3868,3=
876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/crypto:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/crypto:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/crypto:3535-3=
555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/crypto:3673-3711,3=
754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/crypto:3816-3868,3=
876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/crypto:4002-4046,4=
048-4051
/trunk/common-core/src/test/java/org/teiid/core/crypto:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types:3535-35=
55*
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types:3673-3711*,3=
754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types:4002-4046*
/trunk/common-core/src/test/java/org/teiid/core/types:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types:3535-35=
55*
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types:3673-3711*,3=
754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types:4002-4046*,4=
048-4051*
/trunk/common-core/src/test/java/org/teiid/core/types:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/T=
estBlobValue.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestBlo=
bValue.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestBlobValu=
e.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestBlobValu=
e.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestBlobValu=
e.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:35=
07-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestBlo=
bValue.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestBlobValu=
e.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestBlobValu=
e.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestBlobValu=
e.java:4002-4046,4048-4051
/trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:35=
07-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/T=
estClobValue.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestClo=
bValue.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestClobValu=
e.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestClobValu=
e.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestClobValu=
e.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:35=
07-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestClo=
bValue.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestClobValu=
e.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestClobValu=
e.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestClobValu=
e.java:4002-4046,4048-4051
/trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:35=
07-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/T=
estDataTypeManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestDat=
aTypeManager.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestDataType=
Manager.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestDataType=
Manager.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestDataType=
Manager.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.j=
ava:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestDat=
aTypeManager.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestDataType=
Manager.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestDataType=
Manager.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestDataType=
Manager.java:4002-4046,4048-4051
/trunk/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.j=
ava:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/T=
estSQLXMLImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestSQL=
XMLImpl.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLIm=
pl.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLIm=
pl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLIm=
pl.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3=
507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestSQL=
XMLImpl.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLIm=
pl.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLIm=
pl.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLIm=
pl.java:4002-4046,4048-4051
/trunk/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3=
507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/T=
estXMLStreamSourceTranslator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXML=
StreamSourceTranslator.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestXMLStrea=
mSourceTranslator.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestXMLStrea=
mSourceTranslator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestXMLStrea=
mSourceTranslator.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTr=
anslator.java:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXML=
StreamSourceTranslator.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestXMLStrea=
mSourceTranslator.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestXMLStrea=
mSourceTranslator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestXMLStrea=
mSourceTranslator.java:4002-4046,4048-4051
/trunk/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTr=
anslator.java:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/T=
estXMLValue.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXML=
Value.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue=
.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue=
.java:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:350=
7-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXML=
Value.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue=
.java:3673-3711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue=
.java:4002-4046,4048-4051
/trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:350=
7-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/b=
asic
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/basic:3=
535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/basic:3673-3=
711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/basic:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/basic:4002-4=
046
/trunk/common-core/src/test/java/org/teiid/core/types/basic:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/basic:3=
535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/basic:3673-3=
711,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/types/basic:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/types/basic:4002-4=
046,4048-4051
/trunk/common-core/src/test/java/org/teiid/core/types/basic:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/core/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/core/util:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/util:3673-3711,375=
4-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/util:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/util:4002-4046
/trunk/common-core/src/test/java/org/teiid/core/util:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/core/util:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/util:3673-3711,375=
4-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/core/util:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/core/util:4002-4046,404=
8-4051
/trunk/common-core/src/test/java/org/teiid/core/util:3507-3666
Modified: trunk/common-core/src/test/java/org/teiid/core/util/TestFileUtils=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common-core/src/test/java/org/teiid/core/util/TestFileUtils.java =
2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/common-core/src/test/java/org/teiid/core/util/TestFileUtils.java =
2012-05-02 21:36:21 UTC (rev 4055)
@@ -28,6 +28,7 @@
=
import junit.framework.TestCase;
=
+import org.teiid.core.CorePlugin;
import org.teiid.core.TeiidException;
=
=
@@ -42,6 +43,8 @@
=
private final static String TEMP_DIR_NAME =3D "tempdir"; //$NON-NLS-1$
File tempDir;
+ public static final String TEMP_FILE =3D "delete.me"; //$NON-NLS-1$
+ public static final String TEMP_FILE_RENAMED =3D "delete.me.old"; //$NON-=
NLS-1$
private final static String TEMP_FILE_NAME =3D "tempfile.txt"; //$NON-=
NLS-1$
private final static String TEMP_FILE_NAME2 =3D "tempfile2.txt"; //$NO=
N-NLS-1$
=
@@ -135,11 +138,11 @@
=
=
//positive case
- FileUtils.testDirectoryPermissions(TEMP_DIR_NAME);
+ TestFileUtils.testDirectoryPermissions(TEMP_DIR_NAME);
=
//negative case: dir doesn't exist
try {
- FileUtils.testDirectoryPermissions("fakeDir"); //$NON-NLS-1$
+ TestFileUtils.testDirectoryPermissions("fakeDir"); //$NON-NLS-=
1$
fail("Expected a MetaMatrixCoreException"); //$NON-NLS-1$
} catch (TeiidException e) {
}
@@ -250,5 +253,57 @@
fileSource.delete();
}
}
+
+ /**
+ * Test whether it's possible to read and write files in the specified di=
rectory. =
+ * @param dirPath Name of the directory to test
+ * @throws TeiidException
+ * @since 4.3
+ */
+ public static void testDirectoryPermissions(String dirPath) throws TeiidE=
xception {
+ =
+ //try to create a file
+ File tmpFile =3D new File(dirPath + File.separatorChar + TestFileUtil=
s.TEMP_FILE);
+ boolean success =3D false;
+ try {
+ success =3D tmpFile.createNewFile();
+ } catch (IOException e) {
+ }
+ if (!success) {
+ throw new TeiidException("cannot create file in " + dirPath); /=
/$NON-NLS-1$ =
+ }
+ =
+ //test if file can be written to
+ if (!tmpFile.canWrite()) {
+ throw new TeiidException("cannot write " +dirPath); //$NON-NLS-=
1$
+ }
+ =
+ //test if file can be read
+ if (!tmpFile.canRead()) {
+ throw new TeiidException("cannot read " + dirPath); //$NON-NLS-=
1$
+ }
+ =
+ //test if file can be renamed
+ File newFile =3D new File(dirPath + File.separatorChar + TestFileUtil=
s.TEMP_FILE_RENAMED);
+ success =3D false;
+ try {
+ success =3D tmpFile.renameTo(newFile);
+ } catch (Exception e) {
+ }
+ if (!success) {
+ throw new TeiidException("failed to rename " + dirPath); //$NON=
-NLS-1$
+ }
+ =
+ //test if file can be deleted
+ success =3D false;
+ try {
+ success =3D newFile.delete();
+ } catch (Exception e) {
+ }
+ if (!success) {
+ final String msg =3D CorePlugin.Util.getString("FileUtils.Unable_=
to_delete_file_in", dirPath); //$NON-NLS-1$ =
+ throw new TeiidException(msg);
+ }
+ }
=
}
Property changes on: trunk/common-core/src/test/java/org/teiid/query
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/query:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid/query:3673-3711*,3754-3=
769
/branches/7.7.x/common-core/src/test/java/org/teiid/query:3816-3868*,3876-3=
915*,3920-3983*
/branches/8.0.x/common-core/src/test/java/org/teiid/query:4002-4046*
/trunk/common-core/src/test/java/org/teiid/query:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/query:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid/query:3673-3711*,3754-3=
769
/branches/7.7.x/common-core/src/test/java/org/teiid/query:3816-3868*,3876-3=
915*,3920-3983*
/branches/8.0.x/common-core/src/test/java/org/teiid/query:4002-4046*,4048-4=
051*
/trunk/common-core/src/test/java/org/teiid/query:3507-3666
Property changes on: trunk/common-core/src/test/java/org/teiid/query/unitte=
st
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/common-core/src/test/java/org/teiid/query/unittest:353=
5-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/query/unittest:3673-371=
1,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/query/unittest:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/query/unittest:4002-4046
/trunk/common-core/src/test/java/org/teiid/query/unittest:3507-3666
+ /branches/7.4.x/common-core/src/test/java/org/teiid/query/unittest:353=
5-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/query/unittest:3673-371=
1,3754-3769
/branches/7.7.x/common-core/src/test/java/org/teiid/query/unittest:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/common-core/src/test/java/org/teiid/query/unittest:4002-404=
6,4048-4051
/trunk/common-core/src/test/java/org/teiid/query/unittest:3507-3666
Property changes on: trunk/connectors/connector-file/src/main/java/org/teii=
d/resource/adapter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/reso=
urce/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter:4002-4046*
/trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3=
507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/reso=
urce/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter:4002-4046*,4048-4051*
/trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3=
507-3666
Property changes on: trunk/connectors/connector-file/src/main/java/org/teii=
d/resource/adapter/file
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/reso=
urce/adapter/file:3535-3555
/branches/7.6.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter/file:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter/file:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter/file:4002-4046
/trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/f=
ile:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/reso=
urce/adapter/file:3535-3555
/branches/7.6.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter/file:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter/file:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-file/src/main/java/org/teiid/resource/=
adapter/file:4002-4046,4048-4051
/trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/f=
ile:3507-3666
Property changes on: trunk/connectors/connector-file/src/main/resources/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/resources/org:3535-=
3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org:3673-3711*=
,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org:3816-3868*=
,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org:4002-4046*
/trunk/connectors/connector-file/src/main/resources/org:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/resources/org:3535-=
3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org:3673-3711*=
,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org:3816-3868*=
,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org:4002-4046*=
,4048-4051*
/trunk/connectors/connector-file/src/main/resources/org:3507-3666
Property changes on: trunk/connectors/connector-file/src/main/resources/org=
/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid=
:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid:3673=
-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid:3816=
-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid:4002=
-4046*
/trunk/connectors/connector-file/src/main/resources/org/teiid:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid=
:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid:3673=
-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid:3816=
-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid:4002=
-4046*,4048-4051*
/trunk/connectors/connector-file/src/main/resources/org/teiid:3507-3666
Property changes on: trunk/connectors/connector-file/src/main/resources/org=
/teiid/resource
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid=
/resource:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce:4002-4046*
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource:3507=
-3666
+ /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid=
/resource:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce:4002-4046*,4048-4051*
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource:3507=
-3666
Property changes on: trunk/connectors/connector-file/src/main/resources/org=
/teiid/resource/adapter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid=
/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter:4002-4046*
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adap=
ter:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid=
/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter:4002-4046*,4048-4051*
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adap=
ter:3507-3666
Property changes on: trunk/connectors/connector-file/src/main/resources/org=
/teiid/resource/adapter/file
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid=
/resource/adapter/file:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file:4002-4046*
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adap=
ter/file:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid=
/resource/adapter/file:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file:4002-4046*,4048-4051*
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adap=
ter/file:3507-3666
Property changes on: trunk/connectors/connector-file/src/main/resources/org=
/teiid/resource/adapter/file/i18n.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid=
/resource/adapter/file/i18n.properties:3535-3555
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file/i18n.properties:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file/i18n.properties:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file/i18n.properties:4002-4046
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adap=
ter/file/i18n.properties:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid=
/resource/adapter/file/i18n.properties:3535-3555
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file/i18n.properties:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file/i18n.properties:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/reso=
urce/adapter/file/i18n.properties:4002-4046,4048-4051
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adap=
ter/file/i18n.properties:3507-3666
Property changes on: trunk/connectors/connector-file/src/test/java/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/test/java/org:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org:3673-3711*,3754=
-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org:3816-3868*,3876=
-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org:4002-4046*
/trunk/connectors/connector-file/src/test/java/org:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/test/java/org:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org:3673-3711*,3754=
-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org:3816-3868*,3876=
-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org:4002-4046*,4048=
-4051*
/trunk/connectors/connector-file/src/test/java/org:3507-3666
Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid:3535=
-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid:3673-3711=
*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid:3816-3868=
*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid:4002-4046*
/trunk/connectors/connector-file/src/test/java/org/teiid:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid:3535=
-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid:3673-3711=
*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid:3816-3868=
*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid:4002-4046=
*,4048-4051*
/trunk/connectors/connector-file/src/test/java/org/teiid:3507-3666
Property changes on: trunk/connectors/connector-file/src/test/java/org/teii=
d/resource
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/reso=
urce:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource:=
3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource:=
3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource:=
4002-4046*
/trunk/connectors/connector-file/src/test/java/org/teiid/resource:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/reso=
urce:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource:=
3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource:=
3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource:=
4002-4046*,4048-4051*
/trunk/connectors/connector-file/src/test/java/org/teiid/resource:3507-3666
Property changes on: trunk/connectors/connector-file/src/test/java/org/teii=
d/resource/adapter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/reso=
urce/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter:4002-4046*
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3=
507-3666
+ /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/reso=
urce/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter:4002-4046*,4048-4051*
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3=
507-3666
Property changes on: trunk/connectors/connector-file/src/test/java/org/teii=
d/resource/adapter/file
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/reso=
urce/adapter/file:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file:4002-4046*
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/f=
ile:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/reso=
urce/adapter/file:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file:4002-4046*,4048-4051*
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/f=
ile:3507-3666
Property changes on: trunk/connectors/connector-file/src/test/java/org/teii=
d/resource/adapter/file/TestFileConnection.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/reso=
urce/adapter/file/TestFileConnection.java:3535-3555
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file/TestFileConnection.java:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file/TestFileConnection.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file/TestFileConnection.java:4002-4046
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/f=
ile/TestFileConnection.java:3507-3666
+ /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/reso=
urce/adapter/file/TestFileConnection.java:3535-3555
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file/TestFileConnection.java:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file/TestFileConnection.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource/=
adapter/file/TestFileConnection.java:4002-4046,4048-4051
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/f=
ile/TestFileConnection.java:3507-3666
Property changes on: trunk/connectors/connector-ldap/src/main/java/org/teii=
d/resource/adapter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/reso=
urce/adapter:3535-3555*
/branches/7.6.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter:4002-4046*
/trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3=
507-3666
+ /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/reso=
urce/adapter:3535-3555*
/branches/7.6.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter:4002-4046*,4048-4051*
/trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3=
507-3666
Property changes on: trunk/connectors/connector-ldap/src/main/java/org/teii=
d/resource/adapter/ldap
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/reso=
urce/adapter/ldap:3535-3555
/branches/7.6.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter/ldap:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter/ldap:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter/ldap:4002-4046
/trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/l=
dap:3507-3666
+ /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/reso=
urce/adapter/ldap:3535-3555
/branches/7.6.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter/ldap:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter/ldap:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-ldap/src/main/java/org/teiid/resource/=
adapter/ldap:4002-4046,4048-4051
/trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/l=
dap:3507-3666
Property changes on: trunk/connectors/connector-ws/src/main/resources/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ws/src/main/resources/org:3535-35=
55*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org:3673-3711*,3=
754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org:4002-4046*
/trunk/connectors/connector-ws/src/main/resources/org:3507-3666
+ /branches/7.4.x/connectors/connector-ws/src/main/resources/org:3535-35=
55*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org:3673-3711*,3=
754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org:4002-4046*,4=
048-4051*
/trunk/connectors/connector-ws/src/main/resources/org:3507-3666
Property changes on: trunk/connectors/connector-ws/src/main/resources/org/t=
eiid
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid:3=
535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid:3673-3=
711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid:3816-3=
868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid:4002-4=
046*
/trunk/connectors/connector-ws/src/main/resources/org/teiid:3507-3666
+ /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid:3=
535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid:3673-3=
711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid:3816-3=
868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid:4002-4=
046*,4048-4051*
/trunk/connectors/connector-ws/src/main/resources/org/teiid:3507-3666
Property changes on: trunk/connectors/connector-ws/src/main/resources/org/t=
eiid/resource
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/r=
esource:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce:4002-4046*
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource:3507-3=
666
+ /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/r=
esource:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce:4002-4046*,4048-4051*
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource:3507-3=
666
Property changes on: trunk/connectors/connector-ws/src/main/resources/org/t=
eiid/resource/adapter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/r=
esource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter:4002-4046*
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapte=
r:3507-3666
+ /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/r=
esource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter:4002-4046*,4048-4051*
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapte=
r:3507-3666
Property changes on: trunk/connectors/connector-ws/src/main/resources/org/t=
eiid/resource/adapter/ws
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/r=
esource/adapter/ws:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws:4002-4046*
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapte=
r/ws:3507-3666
+ /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/r=
esource/adapter/ws:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws:3673-3711*,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws:4002-4046*,4048-4051*
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapte=
r/ws:3507-3666
Property changes on: trunk/connectors/connector-ws/src/main/resources/org/t=
eiid/resource/adapter/ws/i18n.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/r=
esource/adapter/ws/i18n.properties:3535-3555
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws/i18n.properties:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws/i18n.properties:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws/i18n.properties:4002-4046
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapte=
r/ws/i18n.properties:3507-3666
+ /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/r=
esource/adapter/ws/i18n.properties:3535-3555
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws/i18n.properties:3673-3711,3754-3769
/branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws/i18n.properties:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resour=
ce/adapter/ws/i18n.properties:4002-4046,4048-4051
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapte=
r/ws/i18n.properties:3507-3666
Property changes on: trunk/connectors/translator-jdbc/src/main/java/org/tei=
id/translator/jdbc/FunctionModifier.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/tra=
nslator/jdbc/FunctionModifier.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/FunctionModifier.java:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/FunctionModifier.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/FunctionModifier.java:4002-4046
/trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/F=
unctionModifier.java:3598-3666
+ /branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/tra=
nslator/jdbc/FunctionModifier.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/FunctionModifier.java:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/FunctionModifier.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/FunctionModifier.java:4002-4046,4048-4051
/trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/F=
unctionModifier.java:3598-3666
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translat=
or/jdbc/JDBCPlugin.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/JDBCPlugin.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdb=
c/JDBCPlugin.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -38,7 +38,6 @@
=
=
public static enum Event implements BundleUtil.Event{
- TEIID11001, // connection details
TEIID11002, // connection creation failed
TEIID11003, // invalid hint
TEIID11004,
Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/tei=
id/translator/jdbc/ingres
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/tra=
nslator/jdbc/ingres:3535-3555*
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres:3673-3711*,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres:4002-4046*
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/i=
ngres:3507-3666
+ /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/tra=
nslator/jdbc/ingres:3535-3555*
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres:3673-3711*,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres:4002-4046*,4048-4051*
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/i=
ngres:3507-3666
Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/tei=
id/translator/jdbc/ingres/TestIngresConvertModifier.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/tra=
nslator/jdbc/ingres/TestIngresConvertModifier.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresConvertModifier.java:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresConvertModifier.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresConvertModifier.java:4002-4046
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/i=
ngres/TestIngresConvertModifier.java:3507-3666
+ /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/tra=
nslator/jdbc/ingres/TestIngresConvertModifier.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresConvertModifier.java:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresConvertModifier.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresConvertModifier.java:4002-4046,4048-4051
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/i=
ngres/TestIngresConvertModifier.java:3507-3666
Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/tei=
id/translator/jdbc/ingres/TestIngresExecutionFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/tra=
nslator/jdbc/ingres/TestIngresExecutionFactory.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresExecutionFactory.java:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresExecutionFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresExecutionFactory.java:4002-4046
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/i=
ngres/TestIngresExecutionFactory.java:3507-3666
+ /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/tra=
nslator/jdbc/ingres/TestIngresExecutionFactory.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresExecutionFactory.java:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresExecutionFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/translator-jdbc/src/test/java/org/teiid/translat=
or/jdbc/ingres/TestIngresExecutionFactory.java:4002-4046,4048-4051
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/i=
ngres/TestIngresExecutionFactory.java:3507-3666
Property changes on: trunk/connectors/translator-ldap/src/main/java/org/tei=
id/translator
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/tra=
nslator:3535-3555*
/branches/7.6.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or:3673-3711*,3754-3769
/branches/7.7.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or:4002-4046*
/trunk/connectors/translator-ldap/src/main/java/org/teiid/translator:3507-3=
666
+ /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/tra=
nslator:3535-3555*
/branches/7.6.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or:3673-3711*,3754-3769
/branches/7.7.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or:4002-4046*,4048-4051*
/trunk/connectors/translator-ldap/src/main/java/org/teiid/translator:3507-3=
666
Property changes on: trunk/connectors/translator-ldap/src/main/java/org/tei=
id/translator/ldap
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/tra=
nslator/ldap:3535-3555
/branches/7.6.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or/ldap:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or/ldap:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or/ldap:4002-4046
/trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3=
507-3666
+ /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/tra=
nslator/ldap:3535-3555
/branches/7.6.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or/ldap:3673-3711,3754-3769
/branches/7.7.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or/ldap:3816-3868,3876-3915,3920-3983
/branches/8.0.x/connectors/translator-ldap/src/main/java/org/teiid/translat=
or/ldap:4002-4046,4048-4051
/trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3=
507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api:3816-3868*,3876-3915*,39=
20-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/api:4002-4046*
/trunk/engine/src/main/java/org/teiid/api:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api:3816-3868*,3876-3915*,39=
20-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/api:4002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/api:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception:3673-3711*,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception:3816-3868*,387=
6-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception:4002-4046*
/trunk/engine/src/main/java/org/teiid/api/exception:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception:3673-3711*,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception:3816-3868*,387=
6-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception:4002-4046*,404=
8-4051*
/trunk/engine/src/main/java/org/teiid/api/exception:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query:353=
5-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query:3673-371=
1*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query:3816-386=
8*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query:4002-404=
6*
/trunk/engine/src/main/java/org/teiid/api/exception/query:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query:353=
5-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query:3673-371=
1*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query:3816-386=
8*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query:4002-404=
6*,4048-4051*
/trunk/engine/src/main/java/org/teiid/api/exception/query:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/ExpressionEvaluationException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Exp=
ressionEvaluationException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/Expressi=
onEvaluationException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/Expressi=
onEvaluationException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/Expressi=
onEvaluationException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluat=
ionException.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Exp=
ressionEvaluationException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/Expressi=
onEvaluationException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/Expressi=
onEvaluationException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/Expressi=
onEvaluationException.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluat=
ionException.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/FunctionExecutionException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Fun=
ctionExecutionException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/Function=
ExecutionException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/Function=
ExecutionException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/Function=
ExecutionException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecution=
Exception.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Fun=
ctionExecutionException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/Function=
ExecutionException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/Function=
ExecutionException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/Function=
ExecutionException.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecution=
Exception.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/FunctionMetadataException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Fun=
ctionMetadataException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/Function=
MetadataException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/Function=
MetadataException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/Function=
MetadataException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataE=
xception.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Fun=
ctionMetadataException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/Function=
MetadataException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/Function=
MetadataException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/Function=
MetadataException.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataE=
xception.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/InvalidFunctionException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Inv=
alidFunctionException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/InvalidF=
unctionException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/InvalidF=
unctionException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/InvalidF=
unctionException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionEx=
ception.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Inv=
alidFunctionException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/InvalidF=
unctionException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/InvalidF=
unctionException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/InvalidF=
unctionException.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionEx=
ception.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/QueryMetadataException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryMetadataException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryMet=
adataException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryMet=
adataException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryMet=
adataException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataExce=
ption.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryMetadataException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryMet=
adataException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryMet=
adataException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryMet=
adataException.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataExce=
ption.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/QueryParserException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryParserException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryPar=
serException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryPar=
serException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryPar=
serException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryParserExcept=
ion.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryParserException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryPar=
serException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryPar=
serException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryPar=
serException.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryParserExcept=
ion.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/QueryPlannerException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryPlannerException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryPla=
nnerException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryPla=
nnerException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryPla=
nnerException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerExcep=
tion.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryPlannerException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryPla=
nnerException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryPla=
nnerException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryPla=
nnerException.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerExcep=
tion.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/QueryProcessingException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryProcessingException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryPro=
cessingException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryPro=
cessingException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryPro=
cessingException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingEx=
ception.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryProcessingException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryPro=
cessingException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryPro=
cessingException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryPro=
cessingException.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingEx=
ception.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/QueryResolverException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryResolverException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryRes=
olverException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryRes=
olverException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryRes=
olverException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverExce=
ption.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryResolverException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryRes=
olverException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryRes=
olverException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryRes=
olverException.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverExce=
ption.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/QueryValidatorException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryValidatorException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryVal=
idatorException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryVal=
idatorException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryVal=
idatorException.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorExc=
eption.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Que=
ryValidatorException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryVal=
idatorException.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryVal=
idatorException.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryVal=
idatorException.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorExc=
eption.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/que=
ry/UnresolvedSymbolDescription.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Unr=
esolvedSymbolDescription.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/Unresolv=
edSymbolDescription.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/Unresolv=
edSymbolDescription.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/Unresolv=
edSymbolDescription.java:4002-4046
/trunk/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolD=
escription.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/Unr=
esolvedSymbolDescription.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/Unresolv=
edSymbolDescription.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/Unresolv=
edSymbolDescription.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/Unresolv=
edSymbolDescription.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolD=
escription.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/common:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common:3816-3868*,3876-3915*=
,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/common:4002-4046*
/trunk/engine/src/main/java/org/teiid/common:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/common:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common:3816-3868*,3876-3915*=
,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/common:4002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/common:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer:3673-3711*,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer:3816-3868*,387=
6-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer:4002-4046*
/trunk/engine/src/main/java/org/teiid/common/buffer:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer:3673-3711*,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer:3816-3868*,387=
6-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer:4002-4046*,404=
8-4051*
/trunk/engine/src/main/java/org/teiid/common/buffer:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Abs=
tractTupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AbstractT=
upleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleS=
ource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleS=
ource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleS=
ource.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.jav=
a:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AbstractT=
upleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleS=
ource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleS=
ource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleS=
ource.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.jav=
a:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Aut=
oCleanupUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AutoClean=
upUtil.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUti=
l.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUti=
l.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUti=
l.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:35=
07-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AutoClean=
upUtil.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUti=
l.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUti=
l.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUti=
l.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:35=
07-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Bas=
eCacheEntry.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BaseCache=
Entry.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry=
.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry=
.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:350=
7-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BaseCache=
Entry.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry=
.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry=
.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:350=
7-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Bat=
chManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BatchMana=
ger.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.j=
ava:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.j=
ava:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3507-=
3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BatchMana=
ger.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.j=
ava:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.j=
ava:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3507-=
3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Blo=
ckedException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BlockedEx=
ception.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BlockedExcepti=
on.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BlockedExcepti=
on.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BlockedExcepti=
on.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3=
188-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BlockedEx=
ception.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BlockedExcepti=
on.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BlockedExcepti=
on.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BlockedExcepti=
on.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3=
188-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Buf=
ferManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BufferMan=
ager.java:3220-3275,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.=
java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.=
java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3188=
-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BufferMan=
ager.java:3220-3275,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.=
java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.=
java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3188=
-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Cac=
he.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Cache.jav=
a:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:400=
2-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/Cache.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Cache.jav=
a:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:400=
2-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/Cache.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Cac=
heEntry.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheEntr=
y.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.jav=
a:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3507-36=
66
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheEntr=
y.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.jav=
a:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3507-36=
66
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Cac=
heKey.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.=
java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:=
3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:=
4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.=
java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:=
3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:=
4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Ext=
ensibleBufferedInputStream.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Extensibl=
eBufferedInputStream.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBuff=
eredInputStream.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBuff=
eredInputStream.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInput=
Stream.java:3507-3666
+ /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Extensibl=
eBufferedInputStream.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBuff=
eredInputStream.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBuff=
eredInputStream.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInput=
Stream.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Fil=
eStore.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStore=
.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java=
:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java=
:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStore=
.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java=
:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java=
:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Fil=
eStoreInputStreamFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStore=
InputStreamFactory.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInput=
StreamFactory.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInput=
StreamFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInput=
StreamFactory.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFac=
tory.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStore=
InputStreamFactory.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInput=
StreamFactory.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInput=
StreamFactory.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInput=
StreamFactory.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFac=
tory.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Ind=
exedTupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/IndexedTu=
pleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSo=
urce.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSo=
urce.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSo=
urce.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java=
:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/IndexedTu=
pleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSo=
urce.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSo=
urce.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSo=
urce.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java=
:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Lig=
htWeightCopyOnWriteList.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LightWeig=
htCopyOnWriteList.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCop=
yOnWriteList.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCop=
yOnWriteList.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCop=
yOnWriteList.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteL=
ist.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LightWeig=
htCopyOnWriteList.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCop=
yOnWriteList.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCop=
yOnWriteList.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCop=
yOnWriteList.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteL=
ist.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Lob=
Manager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LobManage=
r.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/LobManager.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/LobManager.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/LobManager.jav=
a:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3507-36=
66
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LobManage=
r.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/LobManager.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/LobManager.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/LobManager.jav=
a:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3507-36=
66
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/SPa=
ge.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/SPage.jav=
a:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:400=
2-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/SPage.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/SPage.jav=
a:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:400=
2-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/SPage.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/STr=
ee.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/STree.jav=
a:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/STree.java:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/STree.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/STree.java:400=
2-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/STree.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/STree.jav=
a:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/STree.java:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/STree.java:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/STree.java:400=
2-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/STree.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Ser=
ializer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Serialize=
r.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Serializer.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/Serializer.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/Serializer.jav=
a:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3507-36=
66
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Serialize=
r.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Serializer.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/Serializer.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/Serializer.jav=
a:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3507-36=
66
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Sto=
rageManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/StorageMa=
nager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/StorageManager=
.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/StorageManager=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/StorageManager=
.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:350=
7-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/StorageMa=
nager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/StorageManager=
.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/StorageManager=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/StorageManager=
.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:350=
7-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Tup=
leBatch.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBatc=
h.java:3220-3275,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.jav=
a:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3188-34=
50,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBatc=
h.java:3220-3275,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.jav=
a:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3188-34=
50,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Tup=
leBrowser.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBrow=
ser.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.j=
ava:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.j=
ava:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3507-=
3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBrow=
ser.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.j=
ava:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.j=
ava:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3507-=
3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Tup=
leBuffer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBuff=
er.java:3149-3217,3220-3275,3340-3349,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.ja=
va:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.ja=
va:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3188-3=
450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBuff=
er.java:3149-3217,3220-3275,3340-3349,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.ja=
va:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.ja=
va:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3188-3=
450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Tup=
leBufferCache.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBuff=
erCache.java:3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBufferCac=
he.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBufferCac=
he.java:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java:3=
507-3666
+ /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBuff=
erCache.java:3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBufferCac=
he.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBufferCac=
he.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java:3=
507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Tup=
leSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleSour=
ce.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.ja=
va:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.ja=
va:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3507-3=
666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleSour=
ce.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.ja=
va:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.ja=
va:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3507-3=
666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/impl
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/impl:3535=
-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/impl:3673-3711=
,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/impl:3816-3868=
,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/impl:4002-4046
/trunk/engine/src/main/java/org/teiid/common/buffer/impl:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/impl:3535=
-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/impl:3673-3711=
,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/impl:3816-3868=
,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/impl:4002-4046=
,4048-4051
/trunk/engine/src/main/java/org/teiid/common/buffer/impl:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferFro=
ntedFileStoreCache.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFi=
leStoreCache.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFi=
leStoreCache.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -727,7 +727,7 @@
CacheEntry ce =3D new CacheEntry(new CacheKey(oid, 1, 1), sizeEstimate,=
serializer.deserialize(dis), ref, true);
return ce;
} catch(IOException e) {
- throw new TeiidComponentException(QueryPlugin.Event.TEIID30047, =
e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30047, oid));
+ throw new TeiidComponentException(QueryPlugin.Event.TEIID30048, =
e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30048, oid));
} catch (ClassNotFoundException e) {
throw new TeiidComponentException(QueryPlugin.Event.TEIID30048, =
e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30048, oid));
} catch (InterruptedException e) {
Property changes on: trunk/engine/src/main/java/org/teiid/core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/core:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/core:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/core:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/core:4002-4046*
/trunk/engine/src/main/java/org/teiid/core:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/core:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/core:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/core:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/core:4002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/core:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/core/id
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/core/id:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/core/id:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/core/id:3816-3868,3876-3915,=
3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/core/id:4002-4046
/trunk/engine/src/main/java/org/teiid/core/id:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/core/id:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/core/id:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/core/id:3816-3868,3876-3915,=
3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/core/id:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/core/id:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/Transac=
tionServerImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/TransactionSe=
rverImpl.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/TransactionSe=
rverImpl.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -232,7 +232,7 @@
checkXAState(threadId, xid, false, false);
tc =3D transactions.getOrCreateTransactionContext(threadId);
if (tc.getTransactionType() !=3D TransactionContext.Scope.NONE) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30511, X=
AException.XAER_PROTO, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30511));
+ throw new XATransactionException(QueryPlugin.Event.TEIID30517, X=
AException.XAER_PROTO, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30517));
}
tc.setTransactionTimeout(timeout);
tc.setXid(xid);
@@ -258,13 +258,13 @@
} catch (NotSupportedException e) {
throw new XATransactionException(QueryPlugin.Event.TEIID30512, XAExc=
eption.XAER_INVAL, e);
} catch (WorkException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30513, XAExc=
eption.XAER_INVAL, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30512, XAExc=
eption.XAER_INVAL, e);
} catch (InterruptedException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30514, XAExc=
eption.XAER_INVAL, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30512, XAExc=
eption.XAER_INVAL, e);
} catch (ExecutionException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30515, XAExc=
eption.XAER_INVAL, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30512, XAExc=
eption.XAER_INVAL, e);
} catch (SystemException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30516, XAExc=
eption.XAER_INVAL, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30512, XAExc=
eption.XAER_INVAL, e);
}
break;
}
@@ -380,7 +380,7 @@
} catch (javax.transaction.NotSupportedException err) {
throw new XATransactionException(QueryPlugin.Event.TEIID30528=
, err);
} catch (SystemException err) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30529=
, err);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30528=
, err);
}
}
=
@@ -391,13 +391,13 @@
} catch (SecurityException e) {
throw new XATransactionException(QueryPlugin.Event.TEIID30530, e);
} catch (RollbackException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30531, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30530, e);
} catch (HeuristicMixedException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30532, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30530, e);
} catch (HeuristicRollbackException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30533, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30530, e);
} catch (SystemException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30534, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30530, e);
} finally {
transactions.removeTransactionContext(context);
}
@@ -410,7 +410,7 @@
} catch (SecurityException e) {
throw new XATransactionException(QueryPlugin.Event.TEIID30535, e);
} catch (SystemException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30536, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30535, e);
} finally {
transactions.removeTransactionContext(tc);
}
@@ -430,7 +430,7 @@
} catch (InvalidTransactionException e) {
throw new XATransactionException(QueryPlugin.Event.TEIID30538, e);
} catch (SystemException e) {
- throw new XATransactionException(QueryPlugin.Event.TEIID30539, e);
+ throw new XATransactionException(QueryPlugin.Event.TEIID30538, e);
}
}
=
Property changes on: trunk/engine/src/main/java/org/teiid/query
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query:3816-3868*,3876-3915*,=
3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query:4002-4046*
/trunk/engine/src/main/java/org/teiid/query:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query:3816-3868*,3876-3915*,=
3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query:4002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/query:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/ObjectRepli=
cator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/ObjectReplicator.=
java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:=
3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:=
4002-4046
/trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/ObjectReplicator.=
java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:=
3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:=
4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java 2012-05-02 =
19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java 2012-05-02 =
21:36:21 UTC (rev 4055)
@@ -50,10 +50,8 @@
TEIID30004, // zero size batch
TEIID30005, // rollback failed
TEIID30006, // invalid max active plans
- TEIID30007, // general process worker error
TEIID30008, // request not deterministic
TEIID30009, // max threads exceeded
- TEIID30010, // duplicate function
TEIID30011, // dependent criteria over max
TEIID30012, // mat row refresh
TEIID30013, // mat table loading
@@ -90,7 +88,6 @@
TEIID30044,
TEIID30045,
TEIID30046,
- TEIID30047,
TEIID30048,
TEIID30049,
TEIID30050,
@@ -116,15 +113,12 @@
TEIID30070,
TEIID30071,
TEIID30072,
- TEIID30073,
TEIID30074,
TEIID30075,
TEIID30076,
TEIID30077,
TEIID30078,
TEIID30079,
- TEIID30080,
- TEIID30081,
TEIID30082,
TEIID30083,
TEIID30084,
@@ -147,25 +141,13 @@
TEIID30101,
TEIID30102,
TEIID30103,
- TEIID30104,
- TEIID30105,
- TEIID30106,
- TEIID30107,
- TEIID30108,
- TEIID30109,
- TEIID30110,
- TEIID30111,
TEIID30112,
- TEIID30113,
TEIID30114,
TEIID30115,
TEIID30116,
TEIID30117,
TEIID30118,
- TEIID30119,
- TEIID30120,
TEIID30121,
- TEIID30122,
TEIID30123,
TEIID30124,
TEIID30125,
@@ -175,7 +157,6 @@
TEIID30129,
TEIID30130,
TEIID30131,
- TEIID30132,
TEIID30133,
TEIID30134,
TEIID30135,
@@ -192,15 +173,12 @@
TEIID30146,
TEIID30147,
TEIID30148,
- TEIID30149,
- TEIID30150,
TEIID30151,
TEIID30152,
TEIID30153,
TEIID30154,
TEIID30155,
TEIID30156,
- TEIID30157,
TEIID30158,
TEIID30159,
TEIID30160,
@@ -216,7 +194,6 @@
TEIID30170,
TEIID30171,
TEIID30172,
- TEIID30173,
TEIID30174,
TEIID30175,
TEIID30176,
@@ -257,8 +234,6 @@
TEIID30211,
TEIID30212,
TEIID30213,
- TEIID30214,
- TEIID30215,
TEIID30216,
TEIID30217,
TEIID30218,
@@ -271,7 +246,6 @@
TEIID30225,
TEIID30226,
TEIID30227,
- TEIID30228,
TEIID30229,
TEIID30230,
TEIID30231,
@@ -298,14 +272,9 @@
TEIID30252,
TEIID30253,
TEIID30254,
- TEIID30255,
- TEIID30256,
TEIID30257,
TEIID30258,
TEIID30259,
- TEIID30260,
- TEIID30261,
- TEIID30262,
TEIID30263,
TEIID30264,
TEIID30265,
@@ -319,11 +288,7 @@
TEIID30273,
TEIID30274,
TEIID30275,
- TEIID30276,
- TEIID30277,
TEIID30278,
- TEIID30279,
- TEIID30280,
TEIID30281,
TEIID30282,
TEIID30283,
@@ -332,17 +297,10 @@
TEIID30286,
TEIID30287,
TEIID30288,
- TEIID30289,
- TEIID30290,
- TEIID30291,
- TEIID30292,
- TEIID30293,
TEIID30294,
TEIID30295,
TEIID30296,
TEIID30297,
- TEIID30298,
- TEIID30299,
TEIID30300,
TEIID30301,
TEIID30302,
@@ -353,19 +311,12 @@
TEIID30307,
TEIID30308,
TEIID30309,
- TEIID30310,
TEIID30311,
TEIID30312,
- TEIID30313,
TEIID30314,
- TEIID30315,
TEIID30316,
- TEIID30317,
- TEIID30318,
TEIID30319,
TEIID30320,
- TEIID30321,
- TEIID30322,
TEIID30323,
TEIID30324,
TEIID30325,
@@ -375,7 +326,6 @@
TEIID30329,
TEIID30330,
TEIID30331,
- TEIID30332,
TEIID30333,
TEIID30334,
TEIID30335,
@@ -383,7 +333,6 @@
TEIID30337,
TEIID30338,
TEIID30339,
- TEIID30340,
TEIID30341,
TEIID30342,
TEIID30343,
@@ -411,7 +360,6 @@
TEIID30365,
TEIID30366,
TEIID30367,
- TEIID30368,
TEIID30369,
TEIID30370,
TEIID30371,
@@ -422,11 +370,9 @@
TEIID30376,
TEIID30377,
TEIID30378,
- TEIID30379,
TEIID30380,
TEIID30381,
TEIID30382,
- TEIID30383,
TEIID30384,
TEIID30385,
TEIID30386,
@@ -436,11 +382,7 @@
TEIID30390,
TEIID30391,
TEIID30392,
- TEIID30393,
- TEIID30394,
- TEIID30395,
TEIID30396,
- TEIID30397,
TEIID30398,
TEIID30399,
TEIID30400,
@@ -451,16 +393,13 @@
TEIID30405,
TEIID30406,
TEIID30407,
- TEIID30408,
TEIID30409,
TEIID30410,
TEIID30411,
TEIID30412,
TEIID30413,
- TEIID30414,
TEIID30415,
TEIID30416,
- TEIID30417,
TEIID30418,
TEIID30419,
TEIID30420,
@@ -491,19 +430,9 @@
TEIID30447,
TEIID30448,
TEIID30449,
- TEIID30450,
TEIID30451,
TEIID30452,
- TEIID30453,
- TEIID30454,
- TEIID30455,
- TEIID30456,
TEIID30457,
- TEIID30458,
- TEIID30459,
- TEIID30460,
- TEIID30461,
- TEIID30462,
TEIID30463,
TEIID30464,
TEIID30465,
@@ -551,12 +480,7 @@
TEIID30508,
TEIID30509,
TEIID30510,
- TEIID30511,
TEIID30512,
- TEIID30513,
- TEIID30514,
- TEIID30515,
- TEIID30516,
TEIID30517,
TEIID30518,
TEIID30519,
@@ -569,17 +493,10 @@
TEIID30526,
TEIID30527,
TEIID30528,
- TEIID30529,
TEIID30530,
- TEIID30531,
- TEIID30532,
- TEIID30533,
- TEIID30534,
TEIID30535,
- TEIID30536,
TEIID30537,
TEIID30538,
- TEIID30539,
TEIID30540,
TEIID30541,
TEIID30542,
@@ -587,7 +504,6 @@
TEIID30544,
TEIID30545,
TEIID30546,
- TEIID30547,
TEIID30548,
TEIID30549,
TEIID30550,
@@ -606,13 +522,13 @@
TEIID30563,
TEIID30564,
TEIID30565,
- TEIID30574, =
TEIID30580,
TEIID30581,
TEIID30590,
TEIID30591,
- TEIID30600, TEIID30601, TEIID30602, //User defined aggregate errors
- =
+ TEIID30600, =
+ TEIID30601, =
+ TEIID30602, //User defined aggregate errors
TEIID31069,
TEIID31070,
TEIID31071,
Property changes on: trunk/engine/src/main/java/org/teiid/query/QueryPlugin=
.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:=
3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3673-=
3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3816-=
3868,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:4002-=
4046
/trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:=
3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3673-=
3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3816-=
3868,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:4002-=
4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/ReplicatedO=
bject.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/ReplicatedObject.=
java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:=
3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:=
4002-4046
/trunk/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/ReplicatedObject.=
java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:=
3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:=
4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/analysis
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/analysis:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/analysis:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/analysis:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/analysis:4002-4046
/trunk/engine/src/main/java/org/teiid/query/analysis:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/analysis:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/analysis:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/analysis:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/analysis:4002-4046,404=
8-4051
/trunk/engine/src/main/java/org/teiid/query/analysis:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/eval
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/eval:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/eval:3673-3711,3754-37=
69
/branches/7.7.x/engine/src/main/java/org/teiid/query/eval:3816-3868,3876-39=
15,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/eval:4002-4046
/trunk/engine/src/main/java/org/teiid/query/eval:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/eval:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/eval:3673-3711,3754-37=
69
/branches/7.7.x/engine/src/main/java/org/teiid/query/eval:3816-3868,3876-39=
15,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/eval:4002-4046,4048-40=
51
/trunk/engine/src/main/java/org/teiid/query/eval:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java 2012-05-=
02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java 2012-05-=
02 21:36:21 UTC (rev 4055)
@@ -101,7 +101,7 @@
try {
QueryResult.serialize(row, result, SaxonXQueryExpression.DEFAULT_OUTPU=
T_PROPERTIES);
} catch (XPathException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30310, e);
+ throw new TeiidRuntimeException(e);
}
}
}
@@ -284,7 +284,7 @@
try {
rightValue =3D evaluate(criteria.getRightExpression(), tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30313, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30313, "right", crit=
eria)); //$NON-NLS-1$
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30312, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30312, "right", crit=
eria)); //$NON-NLS-1$
}
=
// Shortcut if null
@@ -305,7 +305,7 @@
try {
value =3D evaluate(criteria.getLeftExpression(), tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30315, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30315, "left", crite=
ria)); //$NON-NLS-1$
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30312, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30312, "left", crite=
ria)); //$NON-NLS-1$
}
=
// Shortcut if null
@@ -330,7 +330,7 @@
try {
rightValue =3D (String) evaluate(criteria.getRightExpression(), tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30317, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30317, "right", crit=
eria)); //$NON-NLS-1$
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30312, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30312, "right", crit=
eria)); //$NON-NLS-1$
}
=
// Shortcut if null
@@ -373,7 +373,7 @@
try {
leftValue =3D evaluate(criteria.getExpression(), tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30318, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30318, criteria));
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30323, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30323, criteria));
}
=
// Shortcut if null
@@ -429,7 +429,7 @@
try {
value =3D evaluate((Expression) possibleValue, tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.E=
vent.TEIID30321, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30321, possi=
bleValue));
+ throw new ExpressionEvaluationException(QueryPlugin.E=
vent.TEIID30323, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30323, possi=
bleValue));
}
} else {
value =3D possibleValue;
@@ -459,7 +459,7 @@
try {
value =3D evaluate(criteria.getExpression(), tuple);
} catch(ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30322, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30322, criteria));
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TEI=
ID30323, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30323, criteria));
}
=
return (value =3D=3D null ^ criteria.isNegated());
@@ -765,7 +765,7 @@
}
return xmlQuery.getXQueryExpression().createXMLType(result.iter, this.c=
ontext.getBufferManager(), emptyOnEmpty);
} catch (TeiidProcessingException e) {
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30332, e, =
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30332, e.getMessage()));
+ throw new FunctionExecutionException(QueryPlugin.Event.TEIID30333, e, =
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30333, e.getMessage()));
} catch (XPathException e) {
throw new FunctionExecutionException(QueryPlugin.Event.TEIID30333, e, =
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30333, e.getMessage()));
} finally {
@@ -935,7 +935,7 @@
return internalEvaluate(expr.getThenExpression(i), tuple);
}
} catch (ExpressionEvaluationException e) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TE=
IID30340, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30340, "CASE", expr=
.getWhenCriteria(i))); //$NON-NLS-1$
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TE=
IID30346, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30346, "CASE", expr=
.getWhenCriteria(i))); //$NON-NLS-1$
}
}
if (expr.getElseExpression() !=3D null) {
Property changes on: trunk/engine/src/main/java/org/teiid/query/function
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function:3535-355=
5*
/branches/7.6.x/engine/src/main/java/org/teiid/query/function:3673-3711*,37=
54-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function:3816-3868*,38=
76-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/function:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/function:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function:3535-355=
5*
/branches/7.6.x/engine/src/main/java/org/teiid/query/function:3673-3711*,37=
54-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function:3816-3868*,38=
76-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/function:4002-4046*,40=
48-4051*
/trunk/engine/src/main/java/org/teiid/query/function:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/Ch=
arsetUtils.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/CharsetU=
tils.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.=
java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.=
java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3507=
-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/CharsetU=
tils.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.=
java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.=
java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3507=
-3666
Modified: trunk/engine/src/main/java/org/teiid/query/function/FunctionDescr=
iptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.=
java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.=
java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -242,7 +242,7 @@
}
return importValue(result, getReturnType());
} catch(ArithmeticException e) {
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30383, =
e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30383, getName()));
+ throw new FunctionExecutionException(QueryPlugin.Event.TEIID30384, =
e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30384, getName()));
} catch(InvocationTargetException e) {
throw new FunctionExecutionException(QueryPlugin.Event.TEIID3=
0384, e.getTargetException(), QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30=
384, getName()));
} catch(IllegalAccessException e) {
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/Fu=
nctionDescriptor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
Descriptor.java:3149-3171,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionDescr=
iptor.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionDescr=
iptor.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionDescr=
iptor.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.jav=
a:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
Descriptor.java:3149-3171,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionDescr=
iptor.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionDescr=
iptor.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionDescr=
iptor.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.jav=
a:3188-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/Fu=
nctionForm.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
Form.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionForm.=
java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionForm.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionForm.=
java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3507=
-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
Form.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionForm.=
java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionForm.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionForm.=
java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3507=
-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/Fu=
nctionLibrary.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
Library.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionLibra=
ry.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionLibra=
ry.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionLibra=
ry.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3=
507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
Library.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionLibra=
ry.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionLibra=
ry.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionLibra=
ry.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3=
507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/Fu=
nctionMetadataSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
MetadataSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionMetad=
ataSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionMetad=
ataSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionMetad=
ataSource.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource=
.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
MetadataSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionMetad=
ataSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionMetad=
ataSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionMetad=
ataSource.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource=
.java:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/function/FunctionMetho=
ds.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.jav=
a 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.jav=
a 2012-05-02 21:36:21 UTC (rev 4055)
@@ -237,22 +237,15 @@
=
// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Function =3D=
rand=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=
- public static Object rand(CommandContext context, Object seed) throws =
FunctionExecutionException { =
- if(context !=3D null) {
- if(seed =3D=3D null) {
- return new Double(context.getNextRand());
- } else if(seed instanceof Integer) {
- return new Double(context.getNextRand(((Integer)seed).long=
Value()));
- }
- }
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30393=
, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30393, "rand", seed)); //$NON-=
NLS-1$
+ public static Object rand(CommandContext context, Integer seed) { =
=
+ if(seed =3D=3D null) {
+ return new Double(context.getNextRand());
+ } =
+ return new Double(context.getNextRand(seed.longValue()));
}
=
- public static Object rand(CommandContext context) throws FunctionExecu=
tionException {
- if(context !=3D null) {
- return new Double(context.getNextRand());
- }
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30394=
, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30394, "rand"));//$NON-NLS-1$
+ public static Object rand(CommandContext context) {
+ return new Double(context.getNextRand());
}
=
// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Function =3D mo=
d =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
@@ -462,12 +455,11 @@
=
// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Function =3D qu=
arter =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=
- public static Object quarter(Date date)
- throws FunctionExecutionException {
+ public static Object quarter(Date date) {
int month =3D getField(date, Calendar.MONTH);
=
if (month > 11) {
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30395, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30395, "quarter", date.getClass().g=
etName())); //$NON-NLS-1$
+ throw new AssertionError("Invalid month for " + date); //$NON-NLS-1$
}
return Integer.valueOf(month/3 + 1);
}
@@ -667,7 +659,7 @@
throws FunctionExecutionException {
int countValue =3D count.intValue();
if(countValue < 0) {
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID3=
0397, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30397, countValue));
+ throw new FunctionExecutionException(QueryPlugin.Event.TEIID3=
0396, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30396, countValue));
} else if(string.length() < countValue) {
return string;
} else {
@@ -1032,7 +1024,7 @@
public static Object rowlimitexception(Object expression)
throws FunctionExecutionException {
=
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30408=
, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30408));
+ throw new FunctionExecutionException(QueryPlugin.Event.TEIID30407=
, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30407));
} =
=
// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Function =3D=
lookup =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
@@ -1432,7 +1424,7 @@
if (array instanceof java.sql.Array) {
return Array.getLength(((java.sql.Array)array).getArray());
}
- throw new FunctionExecutionException(QueryPlugin.Event.TEIID30417, Quer=
yPlugin.Util.gs(QueryPlugin.Event.TEIID30417, array.getClass()));
+ throw new FunctionExecutionException(QueryPlugin.Event.TEIID30416, Quer=
yPlugin.Util.gs(QueryPlugin.Event.TEIID30416, array.getClass()));
}
=
}
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/Fu=
nctionMethods.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
Methods.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionMetho=
ds.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionMetho=
ds.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionMetho=
ds.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3=
507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
Methods.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionMetho=
ds.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionMetho=
ds.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionMetho=
ds.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3=
507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/Fu=
nctionTree.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
Tree.java:3149-3171,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionTree.=
java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionTree.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionTree.=
java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3188=
-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/Function=
Tree.java:3149-3171,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionTree.=
java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionTree.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionTree.=
java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3188=
-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/Sy=
stemFunctionManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/SystemFu=
nctionManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/SystemFunctio=
nManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/SystemFunctio=
nManager.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/SystemFunctio=
nManager.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.=
java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/SystemFu=
nctionManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/SystemFunctio=
nManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/SystemFunctio=
nManager.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/SystemFunctio=
nManager.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.=
java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/UD=
FSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/UDFSourc=
e.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/UDFSource.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/UDFSource.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/UDFSource.jav=
a:4002-4046
/trunk/engine/src/main/java/org/teiid/query/function/UDFSource.java:3507-36=
66
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/UDFSourc=
e.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/UDFSource.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/UDFSource.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/UDFSource.jav=
a:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/UDFSource.java:3507-36=
66
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/ag=
gregate
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/aggregat=
e:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/aggregate:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/aggregate:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/aggregate:400=
2-4046
/trunk/engine/src/main/java/org/teiid/query/function/aggregate:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/aggregat=
e:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/aggregate:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/aggregate:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/aggregate:400=
2-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/aggregate:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/me=
tadata
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/metadata=
:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/metadata:3673=
-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/metadata:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/metadata:4002=
-4046
/trunk/engine/src/main/java/org/teiid/query/function/metadata:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/metadata=
:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/metadata:3673=
-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/metadata:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/metadata:4002=
-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/metadata:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/function/so=
urce
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/function/source:3=
535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/source:3673-3=
711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/source:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/source:4002-4=
046
/trunk/engine/src/main/java/org/teiid/query/function/source:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/function/source:3=
535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/source:3673-3=
711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/function/source:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/function/source:4002-4=
046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/function/source:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/mapping
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping:3673-3711*,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/mapping:3816-3868*,387=
6-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/mapping:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/mapping:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping:3673-3711*,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/mapping:3816-3868*,387=
6-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/mapping:4002-4046*,404=
8-4051*
/trunk/engine/src/main/java/org/teiid/query/mapping:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/mapping/rel=
ational
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/relationa=
l:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping/relational:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/mapping/relational:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/relational:400=
2-4046
/trunk/engine/src/main/java/org/teiid/query/mapping/relational:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/relationa=
l:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping/relational:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/mapping/relational:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/relational:400=
2-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/mapping/relational:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/mapping/xml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/xml:3535-=
3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping/xml:3673-3711,=
3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/mapping/xml:3816-3868,=
3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/xml:4002-4046
/trunk/engine/src/main/java/org/teiid/query/mapping/xml:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/xml:3535-=
3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping/xml:3673-3711,=
3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/mapping/xml:3816-3868,=
3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/xml:4002-4046,=
4048-4051
/trunk/engine/src/main/java/org/teiid/query/mapping/xml:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingCho=
iceNode.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingChoiceNod=
e.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingChoiceNod=
e.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -90,18 +90,18 @@
}
=
public MappingChoiceNode addChoiceNode(MappingChoiceNode elem) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30453, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30453));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30452, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30452));
}
=
public MappingSequenceNode addSequenceNode(MappingSequenceNode elem) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30454, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30454));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30452, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30452));
}
=
public MappingElement addChildElement(MappingElement elem) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30455, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30455));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30452, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30452));
} =
=
public MappingSourceNode addSourceNode(MappingSourceNode elem) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30456, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30456));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30452, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30452));
} =
}
Modified: trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingDoc=
ument.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingDocument.=
java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingDocument.=
java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -23,6 +23,7 @@
package org.teiid.query.mapping.xml;
=
import org.teiid.core.TeiidRuntimeException;
+import org.teiid.core.util.Assertion;
import org.teiid.query.QueryPlugin;
=
=
@@ -120,30 +121,26 @@
} =
=
public MappingAllNode addAllNode(MappingAllNode elem) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30458, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30458));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30452, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30452));
}
=
public MappingChoiceNode addChoiceNode(MappingChoiceNode elem) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30459, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30459));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30452, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30452));
}
=
public MappingSequenceNode addSequenceNode(MappingSequenceNode elem) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30460, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30460));
+ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30452, Que=
ryPlugin.Util.gs(QueryPlugin.Event.TEIID30452));
}
=
public MappingElement addChildElement(MappingElement elem) {
- if (elem =3D=3D null) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30461,=
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30461));
- } =
+ Assertion.isNotNull(elem);
fixCardinality(elem);
setRoot(elem);
return elem;
} =
=
public MappingSourceNode addSourceNode(MappingSourceNode elem) {
- if (elem =3D=3D null) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30462,=
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30462));
- }
+ Assertion.isNotNull(elem);
setRoot(elem);
return elem;
}
Property changes on: trunk/engine/src/main/java/org/teiid/query/metadata
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/metadata:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/metadata:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/metadata:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/metadata:4002-4046
/trunk/engine/src/main/java/org/teiid/query/metadata:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/metadata:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/metadata:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/metadata:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/metadata:4002-4046,404=
8-4051
/trunk/engine/src/main/java/org/teiid/query/metadata:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer:3535-35=
55*
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer:3673-3711*,3=
754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/optimizer:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer:3535-35=
55*
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer:3673-3711*,3=
754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer:4002-4046*,4=
048-4051*
/trunk/engine/src/main/java/org/teiid/query/optimizer:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/B=
atchedUpdatePlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/Batched=
UpdatePlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdat=
ePlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdat=
ePlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdat=
ePlanner.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.=
java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/Batched=
UpdatePlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdat=
ePlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdat=
ePlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdat=
ePlanner.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.=
java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/C=
ommandPlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/Command=
Planner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlann=
er.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlann=
er.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlann=
er.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3=
507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/Command=
Planner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlann=
er.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlann=
er.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlann=
er.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3=
507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/D=
dlPlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlan=
ner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.j=
ava:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.j=
ava:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3507-=
3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlan=
ner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.j=
ava:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.j=
ava:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.j=
ava:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3507-=
3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/P=
rocedurePlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/Procedu=
rePlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePla=
nner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePla=
nner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePla=
nner.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java=
:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/Procedu=
rePlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePla=
nner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePla=
nner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePla=
nner.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java=
:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/Q=
ueryOptimizer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/QueryOp=
timizer.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimiz=
er.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimiz=
er.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimiz=
er.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3=
507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/QueryOp=
timizer.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimiz=
er.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimiz=
er.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimiz=
er.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3=
507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/T=
riggerActionPlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/Trigger=
ActionPlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActio=
nPlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActio=
nPlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActio=
nPlanner.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.=
java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/Trigger=
ActionPlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActio=
nPlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActio=
nPlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActio=
nPlanner.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.=
java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/c=
apabilities
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/capabil=
ities:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/capabilities=
:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/capabilities=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/capabilities=
:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/capabil=
ities:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/capabilities=
:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/capabilities=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/capabilities=
:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/r=
elational
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational:3=
673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational:3=
816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational:4=
002-4046*
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational:3=
673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational:3=
816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational:4=
002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/r=
elational/AliasGenerator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/AliasGenerator.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/A=
liasGenerator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/A=
liasGenerator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/A=
liasGenerator.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGener=
ator.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/AliasGenerator.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/A=
liasGenerator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/A=
liasGenerator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/A=
liasGenerator.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGener=
ator.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/r=
elational/OptimizerRule.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/OptimizerRule.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/O=
ptimizerRule.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/O=
ptimizerRule.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/O=
ptimizerRule.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerR=
ule.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/OptimizerRule.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/O=
ptimizerRule.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/O=
ptimizerRule.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/O=
ptimizerRule.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerR=
ule.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/r=
elational/PartitionAnalyzer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/PartitionAnalyzer.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
artitionAnalyzer.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
artitionAnalyzer.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
artitionAnalyzer.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionA=
nalyzer.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/PartitionAnalyzer.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
artitionAnalyzer.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
artitionAnalyzer.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
artitionAnalyzer.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionA=
nalyzer.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/r=
elational/PlanHints.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/PlanHints.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanHints.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanHints.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanHints.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.=
java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/PlanHints.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanHints.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanHints.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanHints.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.=
java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/r=
elational/PlanToProcessConverter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/PlanToProcessConverter.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanToProcessConverter.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanToProcessConverter.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanToProcessConverter.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProc=
essConverter.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/PlanToProcessConverter.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanToProcessConverter.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanToProcessConverter.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/P=
lanToProcessConverter.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProc=
essConverter.java:3188-3450,3452-3666
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/R=
elationalPlanner.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/Relatio=
nalPlanner.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/Relatio=
nalPlanner.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -649,10 +649,10 @@
} else if (subqueryContainer instanceof ExistsCriteria) {
((ExistsCriteria) subqueryContainer).setShouldEvaluate(true);
} else {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30255, Query=
Plugin.Util.gs(QueryPlugin.Event.TEIID30255, container));
+ throw new QueryPlannerException(QueryPlugin.Event.TEIID30253, Query=
Plugin.Util.gs(QueryPlugin.Event.TEIID30253, container));
}
} else {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30256, QueryP=
lugin.Util.gs(QueryPlugin.Event.TEIID30256, container));
+ throw new QueryPlannerException(QueryPlugin.Event.TEIID30253, QueryP=
lugin.Util.gs(QueryPlugin.Event.TEIID30253, container));
}
}
ProcessorPlan plan =3D QueryOptimizer.optimizePlan(subqueryContainer.ge=
tCommand(), metadata, null, capFinder, analysisRecord, context);
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/r=
elational/RelationalPlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/RelationalPlanner.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
elationalPlanner.java:3673-3711,3754-3769,3776-3813
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
elationalPlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
elationalPlanner.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/Relational=
Planner.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/RelationalPlanner.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
elationalPlanner.java:3673-3711,3754-3769,3776-3813
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
elationalPlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
elationalPlanner.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/Relational=
Planner.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/r=
elational/RuleStack.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/RuleStack.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
uleStack.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
uleStack.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
uleStack.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.=
java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/RuleStack.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
uleStack.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
uleStack.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/R=
uleStack.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.=
java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/r=
elational/plantree
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/plantree:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/p=
lantree:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/p=
lantree:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/p=
lantree:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3=
507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/plantree:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/p=
lantree:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/p=
lantree:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/p=
lantree:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3=
507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/r=
elational/rules
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/rules:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/r=
ules:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/r=
ules:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/r=
ules:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3507=
-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relatio=
nal/rules:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/r=
ules:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/r=
ules:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/r=
ules:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3507=
-3666
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/r=
ules/FrameUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/F=
rameUtil.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/F=
rameUtil.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -298,9 +298,9 @@
}
}
} catch(TeiidProcessingException e) {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30260, e, Qu=
eryPlugin.Util.gs(QueryPlugin.Event.TEIID30260, ses));
+ throw new QueryPlannerException(QueryPlugin.Event.TEIID30263, e, Qu=
eryPlugin.Util.gs(QueryPlugin.Event.TEIID30263, ses));
} catch (TeiidComponentException e) {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30261, e, Query=
Plugin.Util.gs(QueryPlugin.Event.TEIID30261, ses));
+ throw new QueryPlannerException(QueryPlugin.Event.TEIID30263, e, Query=
Plugin.Util.gs(QueryPlugin.Event.TEIID30263, ses));
}
}
=
@@ -337,7 +337,7 @@
try {
return QueryRewriter.rewriteCriteria(criteria, null, metadata);
} catch(TeiidProcessingException e) {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30262,=
e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30262, criteria));
+ throw new QueryPlannerException(QueryPlugin.Event.TEIID30263,=
e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30263, criteria));
} catch (TeiidComponentException e) {
throw new QueryPlannerException(QueryPlugin.Event.TEIID30263, e,=
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30263, criteria));
}
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/r=
ules/RulePlanJoins.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/R=
ulePlanJoins.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/R=
ulePlanJoins.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -22,16 +22,7 @@
=
package org.teiid.query.optimizer.relational.rules;
=
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
=
import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.api.exception.query.QueryPlannerException;
@@ -376,7 +367,7 @@
private void planForDependencies(JoinRegion joinRegion) throws QueryPl=
annerException {
=
if (joinRegion.getJoinSourceNodes().isEmpty()) {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30276,=
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30276, joinRegion.getUnsatisfie=
dAccessPatterns()));
+ throw new QueryPlannerException(QueryPlugin.Event.TEIID30275,=
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30275, joinRegion.getUnsatisfie=
dAccessPatterns()));
}
=
HashSet currentGroups =3D new HashSet();
@@ -435,7 +426,7 @@
}
=
if (!dependentNodes.isEmpty()) {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30277,=
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30277, joinRegion.getUnsatisfie=
dAccessPatterns()));
+ throw new QueryPlannerException(QueryPlugin.Event.TEIID30275,=
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30275, joinRegion.getUnsatisfie=
dAccessPatterns()));
}
=
}
Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/x=
ml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/xml:353=
5-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/xml:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/xml:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml:4002-4046
/trunk/engine/src/main/java/org/teiid/query/optimizer/xml:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/xml:353=
5-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/xml:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/xml:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml:4002-404=
6,4048-4051
/trunk/engine/src/main/java/org/teiid/query/optimizer/xml:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/xml/NameInSo=
urceResolverVisitor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/optimizer/xml/NameInSourceRe=
solverVisitor.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/xml/NameInSourceRe=
solverVisitor.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -31,7 +31,6 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.types.DataTypeManager;
-import org.teiid.query.QueryPlugin;
import org.teiid.query.mapping.xml.MappingAttribute;
import org.teiid.query.mapping.xml.MappingDocument;
import org.teiid.query.mapping.xml.MappingElement;
@@ -118,9 +117,9 @@
symbol.setType(DataTypeManager.getDataTypeClass(metadata.getEl=
ementType(symbol.getMetadataID())));
return symbol;
} catch (QueryMetadataException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30279,=
e);
+ throw new TeiidRuntimeException(e);
} catch (TeiidComponentException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30280,=
e);
+ throw new TeiidRuntimeException(e);
}
}
=
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/xml/SourceNo=
dePlannerVisitor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/optimizer/xml/SourceNodePlan=
nerVisitor.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/xml/SourceNodePlan=
nerVisitor.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -33,7 +33,6 @@
import org.teiid.api.exception.query.QueryPlannerException;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidRuntimeException;
-import org.teiid.query.QueryPlugin;
import org.teiid.query.mapping.relational.QueryNode;
import org.teiid.query.mapping.xml.MappingDocument;
import org.teiid.query.mapping.xml.MappingNode;
@@ -184,7 +183,7 @@
baseQuery.setCriteria(inputSetCriteria);
rsInfo.setCriteriaRaised(true);
} catch (Exception e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30289,=
e);
+ throw new TeiidRuntimeException(e);
} =
}
=
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/xml/Validate=
MappedCriteriaVisitor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/optimizer/xml/ValidateMapped=
CriteriaVisitor.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/xml/ValidateMapped=
CriteriaVisitor.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -28,7 +28,6 @@
import org.teiid.api.exception.query.QueryPlannerException;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidRuntimeException;
-import org.teiid.query.QueryPlugin;
import org.teiid.query.mapping.xml.MappingCriteriaNode;
import org.teiid.query.mapping.xml.MappingDocument;
import org.teiid.query.mapping.xml.MappingRecursiveElement;
@@ -76,7 +75,7 @@
ResolverVisitor.resolveLanguageObject(crit, null, planEnv.=
getGlobalMetadata());
return crit;
} catch (Exception e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30=
290, e);
+ throw new TeiidRuntimeException(e);
}
}
return null;
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPlann=
er.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPlanner.jav=
a 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPlanner.jav=
a 2012-05-02 21:36:21 UTC (rev 4055)
@@ -293,7 +293,7 @@
// in the orderby. static nodes do not qualify for ordering.
if (elementNode.getNameInSource() =3D=3D null){
Object[] params =3D new Object[] {elementNode, orderBy};
- String msg =3D QueryPlugin.Util.getString("XMLPlanner.The_=
XML_document_element_{0}_is_not_mapped_to_data_and_cannot_be_used_in_the_OR=
DER_BY_clause__{1}_1", params); //$NON-NLS-1$
+ String msg =3D QueryPlugin.Util.gs(QueryPlugin.Event.TEIID=
30288, params);
throw new QueryPlannerException(QueryPlugin.Event.TEIID30=
288, msg);
}
=
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLProje=
ctionMinimizer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLProjectionM=
inimizer.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLProjectionM=
inimizer.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -31,7 +31,6 @@
=
import org.teiid.core.TeiidException;
import org.teiid.core.TeiidRuntimeException;
-import org.teiid.query.QueryPlugin;
import org.teiid.query.mapping.relational.QueryNode;
import org.teiid.query.mapping.xml.MappingAttribute;
import org.teiid.query.mapping.xml.MappingCriteriaNode;
@@ -104,7 +103,7 @@
MappingSourceNode parent =3D element.getParentSourceNode(=
);
collectElementSymbols(element, bindings, parent);
} catch (TeiidException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30298, e);
+ throw new TeiidRuntimeException(e);
}
}
=
@@ -176,7 +175,7 @@
}
}
} catch (TeiidException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30299, e);
+ throw new TeiidRuntimeException(e);
}
}
=
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLQuery=
Planner.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLQueryPlanne=
r.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLQueryPlanne=
r.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -106,7 +106,7 @@
}
=
} catch (Exception e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEI=
ID30292, e);
+ throw new TeiidRuntimeException(e);
} =
} =
=
@@ -132,7 +132,7 @@
ProcessorPlan queryPlan =3D optimizePlan(cmd, planEnv);
rsInfo.setPlan(queryPlan); =
} catch (Exception e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEI=
ID30293, e);
+ throw new TeiidRuntimeException(e);
}
}
};
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLStaga=
ingQueryPlanner.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLStagaingQue=
ryPlanner.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLStagaingQue=
ryPlanner.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -38,7 +38,6 @@
import org.teiid.core.TeiidRuntimeException;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.query.QueryPlugin;
import org.teiid.query.mapping.relational.QueryNode;
import org.teiid.query.mapping.xml.MappingBaseNode;
import org.teiid.query.mapping.xml.MappingDocument;
@@ -53,17 +52,7 @@
import org.teiid.query.resolver.QueryResolver;
import org.teiid.query.resolver.util.ResolverUtil;
import org.teiid.query.resolver.util.ResolverVisitor;
-import org.teiid.query.sql.lang.Command;
-import org.teiid.query.sql.lang.CompareCriteria;
-import org.teiid.query.sql.lang.Criteria;
-import org.teiid.query.sql.lang.ExistsCriteria;
-import org.teiid.query.sql.lang.From;
-import org.teiid.query.sql.lang.GroupBy;
-import org.teiid.query.sql.lang.Insert;
-import org.teiid.query.sql.lang.Option;
-import org.teiid.query.sql.lang.Query;
-import org.teiid.query.sql.lang.Select;
-import org.teiid.query.sql.lang.UnaryFromClause;
+import org.teiid.query.sql.lang.*;
import org.teiid.query.sql.symbol.Constant;
import org.teiid.query.sql.symbol.ElementSymbol;
import org.teiid.query.sql.symbol.Expression;
@@ -87,7 +76,7 @@
try {
stagePlannedQuery(sourceNode, planEnv);
} catch (Exception e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEI=
ID30291, e);
+ throw new TeiidRuntimeException(e);
}
}
};
Property changes on: trunk/engine/src/main/java/org/teiid/query/parser
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/parser:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/parser:3673-3711,3754-=
3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/parser:3816-3868,3876-=
3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/parser:4002-4046
/trunk/engine/src/main/java/org/teiid/query/parser:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/parser:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/parser:3673-3711,3754-=
3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/parser:3816-3868,3876-=
3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/parser:4002-4046,4048-=
4051
/trunk/engine/src/main/java/org/teiid/query/parser:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java 2012=
-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java 2012=
-05-02 21:36:21 UTC (rev 4055)
@@ -148,7 +148,7 @@
throw convertParserException(pe);
} catch(TokenMgrError tme) {
if(sql.startsWith(XML_OPEN_BRACKET) || sql.startsWith(XQUERY_DECL=
ARE)) {
- throw new QueryParserException(QueryPlugin.Event.TEIID30379,=
tme, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30379, sql));
+ throw new QueryParserException(QueryPlugin.Event.TEIID30378,=
tme, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30378, sql));
}
throw handleTokenMgrError(tme);
}
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor:3535-35=
55*
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor:3673-3711*,3=
754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/processor:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor:3535-35=
55*
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor:3673-3711*,3=
754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor:4002-4046*,4=
048-4051*
/trunk/engine/src/main/java/org/teiid/query/processor:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/B=
atchCollector.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchCo=
llector.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchCollect=
or.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchCollect=
or.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/BatchCollect=
or.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3=
507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchCo=
llector.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchCollect=
or.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchCollect=
or.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/BatchCollect=
or.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3=
507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/B=
atchIterator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchIt=
erator.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchIterato=
r.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchIterato=
r.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/BatchIterato=
r.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:35=
07-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchIt=
erator.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchIterato=
r.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchIterato=
r.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/BatchIterato=
r.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:35=
07-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/B=
atchedUpdatePlan.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/Batched=
UpdatePlan.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdat=
ePlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdat=
ePlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdat=
ePlan.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.jav=
a:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/Batched=
UpdatePlan.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdat=
ePlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdat=
ePlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdat=
ePlan.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.jav=
a:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/C=
ollectionTupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/Collect=
ionTupleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/CollectionTu=
pleSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/CollectionTu=
pleSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/CollectionTu=
pleSource.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource=
.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/Collect=
ionTupleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/CollectionTu=
pleSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/CollectionTu=
pleSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/CollectionTu=
pleSource.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource=
.java:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java 2012-=
05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java 2012-=
05-02 21:36:21 UTC (rev 4055)
@@ -99,14 +99,14 @@
if (obj.getEnabled() =3D=3D null) {
if (obj.isCreate()) {
if (getPlanForEvent(t, event) !=3D null) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30156,=
new TeiidProcessingException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30=
156, t.getName(), obj.getEvent())));
+ throw new TeiidRuntimeException(new TeiidProcessingException(=
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30156, t.getName(), obj.getEvent=
())));
}
} else if (getPlanForEvent(t, event) =3D=3D null) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30157, new=
TeiidProcessingException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30157,=
t.getName(), obj.getEvent())));
+ throw new TeiidRuntimeException(new TeiidProcessingException(Quer=
yPlugin.Util.gs(QueryPlugin.Event.TEIID30158, t.getName(), obj.getEvent()))=
);
}
sql =3D obj.getDefinition().toString();
} else if (getPlanForEvent(t, event) =3D=3D null) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30158, new Tei=
idProcessingException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30158, t.g=
etName(), obj.getEvent())));
+ throw new TeiidRuntimeException(new TeiidProcessingException(QueryPlu=
gin.Util.gs(QueryPlugin.Event.TEIID30158, t.getName(), obj.getEvent())));
}
if (getMetadataRepository(vdb, t.getParent().getName()) !=3D null) {
if (sql !=3D null) {
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/D=
dlPlan.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/DdlPlan=
.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java=
:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java=
:3816-3868,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java=
:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/DdlPlan=
.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java=
:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java=
:3816-3868,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java=
:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/P=
rocessorDataManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/Process=
orDataManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/ProcessorDat=
aManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/ProcessorDat=
aManager.java:3816-3868,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/ProcessorDat=
aManager.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.=
java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/Process=
orDataManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/ProcessorDat=
aManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/ProcessorDat=
aManager.java:3816-3868,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/ProcessorDat=
aManager.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.=
java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/P=
rocessorPlan.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/Process=
orPlan.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/ProcessorPla=
n.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/ProcessorPla=
n.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/ProcessorPla=
n.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:35=
07-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/Process=
orPlan.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/ProcessorPla=
n.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/ProcessorPla=
n.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/ProcessorPla=
n.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:35=
07-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/Q=
ueryProcessor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/QueryPr=
ocessor.java:3220-3275,3340-3349,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/QueryProcess=
or.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/QueryProcess=
or.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/QueryProcess=
or.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3=
188-3450,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/QueryPr=
ocessor.java:3220-3275,3340-3349,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/QueryProcess=
or.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/QueryProcess=
or.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/QueryProcess=
or.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3=
188-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/p=
roc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/proc:35=
35-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/proc:3673-37=
11,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/proc:3816-38=
68,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/proc:4002-40=
46
/trunk/engine/src/main/java/org/teiid/query/processor/proc:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/proc:35=
35-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/proc:3673-37=
11,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/proc:3816-38=
68,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/proc:4002-40=
46,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/proc:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/processor/proc/ErrorIn=
struction.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/processor/proc/ErrorInstruct=
ion.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/processor/proc/ErrorInstruct=
ion.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -22,7 +22,7 @@
=
package org.teiid.query.processor.proc;
=
-import static org.teiid.query.analysis.AnalysisRecord.PROP_EXPRESSION;
+import static org.teiid.query.analysis.AnalysisRecord.*;
=
import org.teiid.client.ProcedureErrorInstructionException;
import org.teiid.client.plan.PlanNode;
@@ -77,7 +77,7 @@
TeiidProcessingException {
Object value =3D env.evaluateExpression(expression);
LogManager.logTrace(org.teiid.logging.LogConstants.CTX_DQP, ne=
w Object[] {"Processing RaiseErrorInstruction with the value :", value}); /=
/$NON-NLS-1$ =
- throw new ProcedureErrorInstructionException(QueryPlugin.Event.TE=
IID30167, ERROR_PREFIX + (value !=3D null ? value.toString() : ""));
+ throw new ProcedureErrorInstructionException(QueryPlugin.Event.TE=
IID30167, ERROR_PREFIX + (value !=3D null ? value.toString() : "")); //$NON=
-NLS-1$ =
}
=
}
\ No newline at end of file
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/r=
elational
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relatio=
nal:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/relational:3=
673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/relational:4=
002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/relational:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relatio=
nal:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/relational:3=
673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/relational:4=
002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/relational:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/X=
MLTableNode.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/processor/relational/XMLTabl=
eNode.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/processor/relational/XMLTabl=
eNode.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -332,7 +332,7 @@
this.notifyAll();
}
} catch (TeiidException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30173, e);
+ throw new TeiidRuntimeException(e);
}
}
=
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/x=
ml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/xml:353=
5-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/xml:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/xml:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/xml:4002-4046
/trunk/engine/src/main/java/org/teiid/query/processor/xml:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/xml:353=
5-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/xml:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/xml:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/processor/xml:4002-404=
6,4048-4051
/trunk/engine/src/main/java/org/teiid/query/processor/xml:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/processor/xml/NodeDesc=
riptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor=
.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor=
.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -287,7 +287,7 @@
} else if(namespacePrefix.equals(MappingNodeConstants.INSTANCE=
S_NAMESPACE_PREFIX)) {
uri =3D MappingNodeConstants.INSTANCES_NAMESPACE;
}else {
- String msg =3D QueryPlugin.Util.getString("XMLPlanner.no_u=
ri", new Object[] {namespacePrefix, name}); //$NON-NLS-1$
+ String msg =3D QueryPlugin.Util.gs(QueryPlugin.Event.TEIID=
30213, new Object[] {namespacePrefix, name}); //$NON-NLS-1$
throw new TeiidComponentException(QueryPlugin.Event.TEIID=
30213, msg);
}
}
Modified: trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLConte=
xt.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLContext.jav=
a 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLContext.jav=
a 2012-05-02 21:36:21 UTC (rev 4055)
@@ -77,13 +77,7 @@
* @return
*/
public List getCurrentRow(String aliasResultName) throws TeiidCompo=
nentException, TeiidProcessingException {
- PlanExecutor executor =3D this.resultsMap.get(aliasResultName);
- if (executor =3D=3D null) {
- if (this.parentContext !=3D null) {
- return this.parentContext.getCurrentRow(aliasResultName);
- }
- throw new TeiidComponentException(QueryPlugin.Event.TEIID3021=
4, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30214, aliasResultName));
- }
+ PlanExecutor executor =3D getExecutor(aliasResultName);
return executor.currentRow();
}
=
@@ -94,13 +88,7 @@
* @throws TeiidComponentException
*/
public List getNextRow(String aliasResultName) throws TeiidComponen=
tException, TeiidProcessingException {
- PlanExecutor executor =3D this.resultsMap.get(aliasResultName);
- if (executor =3D=3D null) {
- if (this.parentContext !=3D null) {
- return this.parentContext.getNextRow(aliasResultName);
- }
- throw new TeiidComponentException(QueryPlugin.Event.TEIID3021=
5, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30215, aliasResultName));
- }
+ PlanExecutor executor =3D getExecutor(aliasResultName);
return executor.nextRow();
}
=
@@ -132,15 +120,21 @@
* @throws TeiidComponentException
*/
public List getOutputElements(String resultName) throws TeiidCompon=
entException {
- PlanExecutor executor =3D this.resultsMap.get(resultName);
+ PlanExecutor executor =3D getExecutor(resultName);
+ return executor.getOutputElements(); =
+ }
+
+ private PlanExecutor getExecutor(String resultName)
+ throws TeiidComponentException {
+ PlanExecutor executor =3D this.resultsMap.get(resultName);
if (executor =3D=3D null) {
if (this.parentContext !=3D null) {
- return this.parentContext.getOutputElements(resultName);
+ return this.parentContext.getExecutor(resultName);
}
throw new TeiidComponentException(QueryPlugin.Event.TEIID3021=
6, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30216, resultName));
}
- return executor.getOutputElements(); =
- }
+ return executor;
+ }
=
=
/**
Property changes on: trunk/engine/src/main/java/org/teiid/query/report
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/report:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/report:3673-3711,3754-=
3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/report:3816-3868,3876-=
3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/report:4002-4046
/trunk/engine/src/main/java/org/teiid/query/report:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/report:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/report:3673-3711,3754-=
3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/report:3816-3868,3876-=
3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/report:4002-4046,4048-=
4051
/trunk/engine/src/main/java/org/teiid/query/report:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver:3535-355=
5*
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver:3673-3711*,37=
54-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver:3816-3868*,38=
76-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/resolver:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver:3535-355=
5*
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver:3673-3711*,37=
54-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver:3816-3868*,38=
76-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver:4002-4046*,40=
48-4051*
/trunk/engine/src/main/java/org/teiid/query/resolver:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/Co=
mmandResolver.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/CommandR=
esolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/CommandResolv=
er.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/CommandResolv=
er.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/CommandResolv=
er.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3=
507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/CommandR=
esolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/CommandResolv=
er.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/CommandResolv=
er.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/CommandResolv=
er.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3=
507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/Pr=
ocedureContainerResolver.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/Procedur=
eContainerResolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/ProcedureCont=
ainerResolver.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/ProcedureCont=
ainerResolver.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/ProcedureCont=
ainerResolver.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerReso=
lver.java:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/Procedur=
eContainerResolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/ProcedureCont=
ainerResolver.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/ProcedureCont=
ainerResolver.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/ProcedureCont=
ainerResolver.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerReso=
lver.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/Qu=
eryResolver.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/QueryRes=
olver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver=
.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver=
.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:350=
7-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/QueryRes=
olver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver=
.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver=
.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver=
.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:350=
7-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/Va=
riableResolver.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/Variable=
Resolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/VariableResol=
ver.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/VariableResol=
ver.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/VariableResol=
ver.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:=
3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/Variable=
Resolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/VariableResol=
ver.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/VariableResol=
ver.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/VariableResol=
ver.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:=
3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/co=
mmand
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/command:=
3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/command:3673-=
3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/command:3816-=
3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/command:4002-=
4046
/trunk/engine/src/main/java/org/teiid/query/resolver/command:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/command:=
3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/command:3673-=
3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/command:3816-=
3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/command:4002-=
4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/resolver/command:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/resolver/command/Simpl=
eQueryResolver.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/resolver/command/SimpleQuery=
Resolver.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/resolver/command/SimpleQuery=
Resolver.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -210,7 +210,7 @@
try {
ResolverUtil.resolveGroup(obj, metadata);
} catch (TeiidException err) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30=
104, err);
+ throw new TeiidRuntimeException(err);
}
}
=
@@ -223,7 +223,7 @@
try {
QueryResolver.resolveCommand(command, metadata.getMetadata=
(), false);
} catch (TeiidException err) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30=
105, err);
+ throw new TeiidRuntimeException(err);
}
}
=
@@ -240,7 +240,7 @@
}
obj.setElementSymbols(elementSymbols);
} catch (TeiidException err) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30=
106, err);
+ throw new TeiidRuntimeException(err);
} =
}
=
@@ -288,7 +288,7 @@
try {
obj.setFile(ResolverUtil.convertExpression(obj.getFile(), DataTypeMana=
ger.DefaultDataTypes.CLOB, metadata));
} catch (QueryResolverException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30107, e);
+ throw new TeiidRuntimeException(e);
}
postTableFunctionReference(obj, saved);
//set to fixed width if any column has width specified
@@ -324,7 +324,7 @@
column.setDefaultExpression(ex);
}
} catch (TeiidException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30108, e);
+ throw new TeiidRuntimeException(e);
}
}
=
@@ -357,7 +357,7 @@
try {
ResolverUtil.addTempGroup(metadata, obj.getGroupSymbol(), =
obj.getProjectedSymbols(), false);
} catch (QueryResolverException err) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30=
109, err);
+ throw new TeiidRuntimeException(err);
}
obj.getGroupSymbol().setMetadataID(metadata.getMetadataStore()=
.getTempGroupID(obj.getGroupSymbol().getName()));
//now resolve the projected symbols
@@ -367,7 +367,7 @@
try {
ResolverVisitor.resolveLanguageObject(symbol, groups, null, metadata);
} catch (TeiidException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30110, e);
+ throw new TeiidRuntimeException(e);
} =
}
}
@@ -383,7 +383,7 @@
try {
ResolverUtil.addTempGroup(metadata, obj.getGroupSymbol(), =
obj.getCommand().getProjectedSymbols(), false);
} catch (QueryResolverException err) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30=
111, err);
+ throw new TeiidRuntimeException(err);
}
obj.getGroupSymbol().setMetadataID(metadata.getMetadataStore()=
.getTempGroupID(obj.getGroupSymbol().getName())); =
}
@@ -400,7 +400,7 @@
createProcRelational(obj);
}
} catch(TeiidException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30=
113, e);
+ throw new TeiidRuntimeException(e);
}
}
=
@@ -524,9 +524,9 @@
for (GroupSymbol group : discoveredGroups) {
if (!this.currentGroups.add(group)) {
String msg =3D QueryPlugin.Util.getString("ERR.015.008.00=
46", group.getName()); //$NON-NLS-1$
- QueryResolverException qre =3D new QueryResolverException=
(msg);
+ QueryResolverException qre =3D new QueryResolverException=
(QueryPlugin.Event.TEIID30115, msg);
qre.addUnresolvedSymbol(new UnresolvedSymbolDescription(g=
roup.toString(), msg));
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID3=
0115, qre);
+ throw new TeiidRuntimeException(qre);
}
}
discoveredGroups.clear();
Modified: trunk/engine/src/main/java/org/teiid/query/resolver/command/TempT=
ableResolver.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/resolver/command/TempTableRe=
solver.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/resolver/command/TempTableRe=
solver.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -73,13 +73,13 @@
throw new QueryResolverException(QueryPlugin.Event.TEIID3=
0118, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30118, group.getName()));
}
if (metadata.getMetadata().hasProcedure(group.getName())) {
- throw new QueryResolverException(QueryPlugin.Event.TEIID30119, =
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30119, group.getName()));
+ throw new QueryResolverException(QueryPlugin.Event.TEIID30118, =
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30118, group.getName()));
}
=
//now we will be more specific for temp groups
TempMetadataID id =3D metadata.getMetadataStore().getTempGroup=
ID(group.getName());
if (id !=3D null && !metadata.isTemporaryTable(id)) {
- throw new QueryResolverException(QueryPlugin.Event.TEIID3=
0120, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30120, group.getName()));
+ throw new QueryResolverException(QueryPlugin.Event.TEIID3=
0118, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30118, group.getName()));
}
//if we get here then either the group does not exist or has a=
lready been defined as a temp table
//if it has been defined as a temp table, that's ok we'll use =
this as the new definition and throw an
Modified: trunk/engine/src/main/java/org/teiid/query/resolver/command/Updat=
eProcedureResolver.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/resolver/command/UpdateProce=
dureResolver.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/resolver/command/UpdateProce=
dureResolver.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -203,7 +203,7 @@
AssignmentStatement assStmt =3D (AssignmentStatement)stat=
ement;
ResolverVisitor.resolveLanguageObject(assStmt.getVaria=
ble(), null, externalGroups, metadata);
if (!metadata.elementSupports(assStmt.getVariable().ge=
tMetadataID(), SupportConstants.Element.UPDATE)) {
- throw new QueryResolverException(QueryPlugin.Even=
t.TEIID30122, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30122, assStmt.get=
Variable()));
+ throw new QueryResolverException(QueryPlugin.Even=
t.TEIID30121, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30121, assStmt.get=
Variable()));
}
//don't allow variable assignments to be external
assStmt.getVariable().setIsExternalReference(false);
Modified: trunk/engine/src/main/java/org/teiid/query/resolver/command/XMLQu=
eryResolver.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/resolver/command/XMLQueryRes=
olver.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/resolver/command/XMLQueryRes=
olver.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -295,7 +295,7 @@
try {
ResolverUtil.addTempGroup(metadata, new GroupSymbol(baseNode.getFull=
yQualifiedName()), Collections.EMPTY_LIST, false).setMetadataType(Type.XML);
} catch (QueryResolverException e) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30132, e);
+ throw new TeiidRuntimeException(e);
}
}
}
Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/ut=
il
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/util:353=
5-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/util:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/util:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/util:4002-4046
/trunk/engine/src/main/java/org/teiid/query/resolver/util:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/util:353=
5-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/util:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/util:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/util:4002-404=
6,4048-4051
/trunk/engine/src/main/java/org/teiid/query/resolver/util:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/resolver/util/Resolver=
Visitor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisito=
r.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisito=
r.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -672,7 +672,7 @@
=
if (commonType =3D=3D null) {
// Neither are aggs, but types can't be reconciled
- throw new QueryResolverException(QueryPlugin.Event.TEIID30073, Q=
ueryPlugin.Util.gs(QueryPlugin.Event.TEIID30073, new Object[] { leftTypeNam=
e, rightTypeName, ccrit }));
+ throw new QueryResolverException(QueryPlugin.Event.TEIID30072, Q=
ueryPlugin.Util.gs(QueryPlugin.Event.TEIID30072, new Object[] { leftTypeNam=
e, rightTypeName, ccrit }));
}
ccrit.setLeftExpression(ResolverUtil.convertExpression(leftExpression, l=
eftTypeName, commonType, metadata) );
ccrit.setRightExpression(ResolverUtil.convertExpression(rightExpression,=
rightTypeName, commonType, metadata) );
@@ -855,7 +855,7 @@
}
String thenTypeName =3D ResolverUtil.getCommonType((String[])thenType=
Names.toArray(new String[thenTypeNames.size()]));
if (thenTypeName =3D=3D null) {
- throw new QueryResolverException(QueryPlugin.Event.TEIID30080, Q=
ueryPlugin.Util.gs(QueryPlugin.Event.TEIID30080, "THEN/ELSE", obj));//$NON-=
NLS-1$
+ throw new QueryResolverException(QueryPlugin.Event.TEIID30079, Q=
ueryPlugin.Util.gs(QueryPlugin.Event.TEIID30079, "THEN/ELSE", obj));//$NON-=
NLS-1$
}
obj.setExpression(ResolverUtil.convertExpression(obj.getExpression(),=
whenTypeName, metadata));
ArrayList whens =3D new ArrayList(whenCount);
@@ -941,7 +941,7 @@
// 3. Perform implicit type conversions
String thenTypeName =3D ResolverUtil.getCommonType(thenTypeNames.toAr=
ray(new String[thenTypeNames.size()]));
if (thenTypeName =3D=3D null) {
- throw new QueryResolverException(QueryPlugin.Event.TEIID30081, Q=
ueryPlugin.Util.gs(QueryPlugin.Event.TEIID30081, "THEN/ELSE", obj)); //$NON=
-NLS-1$
+ throw new QueryResolverException(QueryPlugin.Event.TEIID30079, Q=
ueryPlugin.Util.gs(QueryPlugin.Event.TEIID30079, "THEN/ELSE", obj)); //$NON=
-NLS-1$
}
ArrayList thens =3D new ArrayList(whenCount);
for (int i =3D 0; i < whenCount; i++) {
Property changes on: trunk/engine/src/main/java/org/teiid/query/rewriter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/rewriter:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/rewriter:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/rewriter:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/rewriter:4002-4046
/trunk/engine/src/main/java/org/teiid/query/rewriter:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/rewriter:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/rewriter:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/rewriter:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/rewriter:4002-4046,404=
8-4051
/trunk/engine/src/main/java/org/teiid/query/rewriter:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java =
2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java =
2012-05-02 21:36:21 UTC (rev 4055)
@@ -541,7 +541,7 @@
try {
return rewriteExpressionDirect(element);
} catch (TeiidException err) {
- throw new TeiidRuntimeException(QueryPlugin.Event.TEI=
ID30368, err);
+ throw new TeiidRuntimeException(err);
}
}
};
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql:3673-3711*,3754-37=
69
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql:3816-3868*,3876-39=
15*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/sql:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql:3673-3711*,3754-37=
69
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql:3816-3868*,3876-39=
15*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql:4002-4046*,4048-40=
51*
/trunk/engine/src/main/java/org/teiid/query/sql:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/Languag=
eObject.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageObjec=
t.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.jav=
a:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3188-34=
50,3452-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageObjec=
t.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.jav=
a:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.jav=
a:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.jav=
a:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3188-34=
50,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/Languag=
eVisitor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageVisit=
or.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.ja=
va:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.ja=
va:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3507-3=
666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageVisit=
or.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.ja=
va:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.ja=
va:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3507-3=
666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/Procedu=
reReservedWords.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/ProcedureRese=
rvedWords.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedW=
ords.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedW=
ords.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedW=
ords.java:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java=
:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/ProcedureRese=
rvedWords.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedW=
ords.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedW=
ords.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedW=
ords.java:4002-4046,4048-4051
/trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java=
:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/lang
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/lang:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/lang:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/lang:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/lang:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/lang:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/lang:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/lang:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/lang:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/lang:4002-4046,404=
8-4051
/trunk/engine/src/main/java/org/teiid/query/sql/lang:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/sql/lang/MatchCriteria=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/sql/lang/MatchCriteria.java =
2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/sql/lang/MatchCriteria.java =
2012-05-02 21:36:21 UTC (rev 4055)
@@ -340,7 +340,7 @@
}
=
if (escaped) {
- throw new ExpressionEvaluationException(QueryPlugin.Event.TE=
IID30450, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30450, new Object[] {p=
attern, new Character(escape)}));
+ throw new ExpressionEvaluationException(QueryPlugin.Event.TE=
IID30449, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30449, new Object[] {p=
attern, new Character(escape)}));
}
=
if (!endsWithMatchAny) {
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/navigat=
or
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/navigator:353=
5-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/navigator:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/navigator:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/navigator:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/navigator:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/navigator:353=
5-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/navigator:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/navigator:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/navigator:4002-404=
6,4048-4051
/trunk/engine/src/main/java/org/teiid/query/sql/navigator:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/proc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/proc:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/proc:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/proc:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/proc:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/proc:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/proc:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/proc:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/proc:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/proc:4002-4046,404=
8-4051
/trunk/engine/src/main/java/org/teiid/query/sql/proc:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/symbol
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/symbol:3535-3=
555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/symbol:3673-3711,3=
754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/symbol:3816-3868,3=
876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/symbol:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/symbol:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/symbol:3535-3=
555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/symbol:3673-3711,3=
754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/symbol:3816-3868,3=
876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/symbol:4002-4046,4=
048-4051
/trunk/engine/src/main/java/org/teiid/query/sql/symbol:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/util:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/util:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/util:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/util:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/util:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/util:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/util:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/util:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/util:4002-4046,404=
8-4051
/trunk/engine/src/main/java/org/teiid/query/sql/util:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/visitor
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/visitor:3535-=
3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/visitor:3673-3711,=
3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/visitor:3816-3868,=
3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/visitor:4002-4046
/trunk/engine/src/main/java/org/teiid/query/sql/visitor:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/visitor:3535-=
3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/visitor:3673-3711,=
3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/sql/visitor:3816-3868,=
3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/sql/visitor:4002-4046,=
4048-4051
/trunk/engine/src/main/java/org/teiid/query/sql/visitor:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/tempdata
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/tempdata:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/tempdata:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/tempdata:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/tempdata:4002-4046
/trunk/engine/src/main/java/org/teiid/query/tempdata:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/tempdata:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/tempdata:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/tempdata:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/tempdata:4002-4046,404=
8-4051
/trunk/engine/src/main/java/org/teiid/query/tempdata:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableStor=
e.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableStore.java=
2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableStore.java=
2012-05-02 21:36:21 UTC (rev 4055)
@@ -336,7 +336,7 @@
return tempTable;
}
} else if (tempTable.getActive().get() !=3D 0) {
- throw new TeiidProcessingException(QueryPlugin.Event.TEIID302=
28, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30228, tempTableID));
+ throw new TeiidProcessingException(QueryPlugin.Event.TEIID302=
27, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30227, tempTableID));
}
}
} else if (transactionMode =3D=3D TransactionMode.ISOLATE_READS) {
Property changes on: trunk/engine/src/main/java/org/teiid/query/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/util:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/util:3673-3711,3754-37=
69
/branches/7.7.x/engine/src/main/java/org/teiid/query/util:3816-3868,3876-39=
15,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/util:4002-4046
/trunk/engine/src/main/java/org/teiid/query/util:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/util:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/util:3673-3711,3754-37=
69
/branches/7.7.x/engine/src/main/java/org/teiid/query/util:3816-3868,3876-39=
15,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/util:4002-4046,4048-40=
51
/trunk/engine/src/main/java/org/teiid/query/util:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/validator
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/validator:3535-35=
55
/branches/7.6.x/engine/src/main/java/org/teiid/query/validator:3673-3711,37=
54-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/validator:3816-3868,38=
76-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/validator:4002-4046
/trunk/engine/src/main/java/org/teiid/query/validator:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/validator:3535-35=
55
/branches/7.6.x/engine/src/main/java/org/teiid/query/validator:3673-3711,37=
54-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/validator:3816-3868,38=
76-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/validator:4002-4046,40=
48-4051
/trunk/engine/src/main/java/org/teiid/query/validator:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/xquery
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/xquery:3673-3711*,3754=
-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/xquery:3816-3868*,3876=
-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/xquery:4002-4046*
/trunk/engine/src/main/java/org/teiid/query/xquery:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/xquery:3673-3711*,3754=
-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/xquery:3816-3868*,3876=
-3915*,3920-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/query/xquery:4002-4046*,4048=
-4051*
/trunk/engine/src/main/java/org/teiid/query/xquery:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/xquery/saxon
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery/saxon:3535=
-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/xquery/saxon:3673-3711=
,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/xquery/saxon:3816-3868=
,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/xquery/saxon:4002-4046
/trunk/engine/src/main/java/org/teiid/query/xquery/saxon:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery/saxon:3535=
-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/xquery/saxon:3673-3711=
,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/xquery/saxon:3816-3868=
,3876-3915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/query/xquery/saxon:4002-4046=
,4048-4051
/trunk/engine/src/main/java/org/teiid/query/xquery/saxon:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/xquery/saxon/XQueryEva=
luator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/query/xquery/saxon/XQueryEvaluator=
.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/java/org/teiid/query/xquery/saxon/XQueryEvaluator=
.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -127,9 +127,9 @@
if (e.getCause() instanceof TeiidRuntimeException) {
RelationalNode.unwrapException((TeiidRuntimeException)e.get=
Cause());
}
- throw new TeiidProcessingException(QueryPlugin.Event.TEIID30149, e=
, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30149));
+ throw new TeiidProcessingException(QueryPlugin.Event.TEIID30151, e=
, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30151));
} catch (IOException e) {
- throw new TeiidProcessingException(QueryPlugin.Event.TEIID30150, e=
, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30150));
+ throw new TeiidProcessingException(QueryPlugin.Event.TEIID30151, e=
, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30151));
} finally {
if (!isNonBlocking) {
commandContext.setNonBlocking(false);
Property changes on: trunk/engine/src/main/java/org/teiid/vdb
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/vdb:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/vdb:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/vdb:3816-3868*,3876-3915*,39=
20-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/vdb:4002-4046*
/trunk/engine/src/main/java/org/teiid/vdb:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/vdb:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/vdb:3673-3711*,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/vdb:3816-3868*,3876-3915*,39=
20-3983*
/branches/8.0.x/engine/src/main/java/org/teiid/vdb:4002-4046*,4048-4051*
/trunk/engine/src/main/java/org/teiid/vdb:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/vdb/runtime
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/vdb/runtime:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/vdb/runtime:3673-3711,3754-3=
769
/branches/7.7.x/engine/src/main/java/org/teiid/vdb/runtime:3816-3868,3876-3=
915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/vdb/runtime:4002-4046
/trunk/engine/src/main/java/org/teiid/vdb/runtime:3507-3666
+ /branches/7.4.x/engine/src/main/java/org/teiid/vdb/runtime:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/vdb/runtime:3673-3711,3754-3=
769
/branches/7.7.x/engine/src/main/java/org/teiid/vdb/runtime:3816-3868,3876-3=
915,3920-3983
/branches/8.0.x/engine/src/main/java/org/teiid/vdb/runtime:4002-4046,4048-4=
051
/trunk/engine/src/main/java/org/teiid/vdb/runtime:3507-3666
Modified: trunk/engine/src/main/resources/org/teiid/query/i18n.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2012-05=
-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2012-05=
-02 21:36:21 UTC (rev 4055)
@@ -29,15 +29,13 @@
TEIID30384=3DError while evaluating function {0}
TEIID30385=3DUnable to access function implementation for [{0}]
ERR.015.001.0005=3DERROR loading system functions: {0}
-TEIID30397=3DLeft count is invalid: {0}
TEIID30402=3DPad length must be > 0.
TEIID30403=3DPad string for lpad/rpad must have length greater than 0.
TEIID30404=3DSource and destination character lists must be the same lengt=
h.
TEIID30405=3DError converting [{0}] of type {1} to type {2}
TEIID30406=3DThe context function may only be used in XML queries.
-TEIID30408=3DThe rowlimit and rowlimitexception functions may only be used=
in XML queries.
TEIID30411=3DIllegal argument for formating: {0}
-TEIID30412=3DParse Exception occurs for executing: {0} {1}
+TEIID30412=3DCould not parse number using format: {0} {1}
ERR.015.001.0044=3DFunction metadata source is of invalid type: {0}
TEIID30011=3DThe function "{0}" will not be added because a function with =
the same name and signature already exists.
TEIID30389=3DUnexpected exception while loading "{1}.{2}" for UDF "{0}"
@@ -74,16 +72,14 @@
QueryParser.lexicalError=3DLexical error: {0}
QueryParser.nullSqlExpr=3DParser cannot parse a null sql expression.
TEIID30378=3DDirect usage of XQuery is no longer supported, use XMLQUERY i=
nstead.
-TEIID30379=3DDirect usage of XQuery is no longer supported, use XMLQUERY i=
nstead.
=
# processor (006)
TEIID30311=3DUnknown criteria type: {0}
-ERR.015.006.0011=3DUnable to evaluate {0} expression of {1}
+TEIID30312=3DUnable to evaluate {0} expression of {1}
TEIID30325=3DUnknown compare criteria operator: {0}
TEIID30448=3DFailed to create regular expression from match pattern: {0}. =
{1}
TEIID30323=3DUnable to evaluate expression of {0}
TEIID30329=3DUnknown expression type: {0}
-ERR.015.006.0033=3DUnable to evaluate {0}: {1}
TEIID30342=3DUnable to evaluate LOOKUP function.
TEIID30326=3DUnknown subquery comparison predicate quantifier: {0}
TEIID30345=3DThe command of this scalar subquery returned more than one va=
lue: {0}
@@ -101,7 +97,6 @@
ERR.015.008.0022=3DFailed parsing reference binding: {0}
ERR.015.008.0025=3DBinding reference cannot be a function: {0}
TEIID30083=3DExpression ''{0}'' has a parameter with non-determinable type=
information. The use of an explicit convert may be necessary.
-TEIID30073=3DThe expressions in this criteria are being compared but are o=
f differing types ({0} and {1}) and no implicit conversion is available: {=
2}
TEIID30074=3DThis criteria must have string or CLOB expressions on each si=
de: {0}
TEIID30092=3DType cannot be null for expression: {0}
TEIID30078=3DThis criteria must have values only of the same type as the l=
eft expression: {0}
@@ -111,7 +106,6 @@
TEIID30068=3DThe function ''{0}'' is an unknown form. Check that the func=
tion name and number of arguments is correct.
TEIID30069=3DThe function ''{0}'' has more than one possible signature.
TEIID30071=3DThe conversion from {0} to {1} is not allowed.
-TEIID30068=3DThe function ''{0}'' is an unknown form. Check that the func=
tion name and number of arguments is correct.
TEIID30070=3DThe function ''{0}'' is a valid function form, but the argume=
nts do not match a known type signature and cannot be converted using impli=
cit type conversions.
TEIID30082=3DExpected value of type ''{0}'' but ''{1}'' is of type ''{2}''=
and no implicit conversion is available.
TEIID30084=3DElement ''{0}'' in ORDER BY is ambiguous and may refer to mor=
e than one element of SELECT clause.
@@ -127,12 +121,10 @@
TEIID30358=3DProcedure ''{0}'' is ambiguous, use the fully qualified name =
instead
ERR.015.008.0056=3DGroup does not exist
TEIID30143=3DUnable to resolve stored procedure {0} the datatype for the p=
arameter {1} is not specified.
-TEIID30099=3DUnable to resolve return element referred to by LOOKUP functi=
on: {0}
+TEIID30099=3DUnable to resolve key element referred to by LOOKUP function:=
{0}
TEIID30095=3DThe first three arguments for the LOOKUP function must be spe=
cified as constants.
TEIID30096=3DGroup {0} is not allowed in LOOKUP function.
TEIID30079=3DCould not find a common type to which all {0} expressions can=
be implicitly converted: {1}
-TEIID30080=3DCould not find a common type to which all {0} expressions can=
be implicitly converted: {1}
-TEIID30081=3DCould not find a common type to which all {0} expressions can=
be implicitly converted: {1}
TEIID30135=3DAliased Select Symbols are not valid in XML Queries.
TEIID30134=3DExpressions cannot be selected by XML Queries
TEIID30129=3DAliased subquery contexts are not allowed: {0}
@@ -241,7 +233,7 @@
TEIID30268=3DUnable to create a query plan that sends a criteria to \"{0}\=
". This connection factory requires criteria set to true indicating that a=
query against this model requires criteria.
TEIID30283=3DCould not resolve group symbol {0}
TEIID30306=3DThe criteria {0} has elements from the root staging table and=
the document nodes which is not allowed.
-TEIID30309=3DNo mapping node found named, ''{0}', in use of ''context''
+TEIID30309=3DNo mapping node found named, ''{0}'', in use of ''context''
TEIID30287=3DThe XML document element(s) {0} are not mapped to data and ca=
nnot be used in the criteria \"{1}\".
TEIID30281=3DCould not parse query transformation for {0}: {1}
TEIID30300=3DContext functions within the same conjunct refer to different=
contexts: {0}
@@ -276,7 +268,7 @@
SQLParser.Invalid_char=3D{0} value must be a single character: [{1}].
SQLParser.expected_non_reserved=3DExpected non-reserved word {0}, but was =
{1}.
SQLParser.invalid_window=3DCannot window a non-aggregate expression {0}.
-SQLParser.virtual_proc_def=3DVirtual procedure {0} must define the procedu=
re block after 'AS' keyword
+SQLParser.virtual_proc_def=3DVirtual procedure {0} must define the procedu=
re block after ''AS'' keyword
SQLParser.view_def=3DVirtual view {0} must be defined with a query express=
ion.
SQLParser.pk_exists=3DPrimary Key is already defined on {0}
SQLParser.no_column=3DColumn name {0} not found on table {1}
@@ -720,7 +712,6 @@
TEIID30133=3DIf any symbol in SELECT clause is ''xml'' or group.''xml'' , =
then no other element is allowed.
TEIID30123=3DThe datatype for the expression was not resolvable.
TEIID30117=3DCannot create temporary table "{0}". Local temporary tables m=
ust be created with unqualified names.
-TEIID30120=3DCannot create temporary table "{0}". An object with the same =
name already exists.
ValidationVisitor.drop_of_nontemptable=3DCannot drop a non temporary table=
"{0}". =
ValidationVisitor.orderby_expression_xml=3DXML queries cannot order by an =
expression.
ValidationVisitor.text_table_invalid_width=3DFor a fixed width text table,=
all columns must have width set.
@@ -745,10 +736,8 @@
ValidationVisitor.xmlparse_type=3DXMLPARSE expects a STRING, CLOB, or BLOB=
value.
ValidationVisitor.invalid_encoding=3DEncoding {0} is not valid.
ValidationVisitor.subquery_insert=3DSELECT INTO should not be used in a su=
bquery.
-TEIID30122=3DVariable "{0}" is read only and cannot be assigned a value.
MappingLoader.unknown_node_type=3DUnknown Node Type "{0}" being loaded by =
the XML mapping document.
MappingLoader.invalid_criteria_node=3DInvalid criteria node found; A crite=
ria node must have criteria specified or it must be a default node.
-TEIID30460=3DWrong type of child node is being added.
NoCriteria=3DFailed to add the node, because Criteria nodes must have "cri=
teria" value set on them, or they need to be the default node.
TEIID30462=3DRoot node assigned to a document can be null.
TEIID30457=3DFound recursive node {0} without recursive root node.
@@ -757,7 +746,6 @@
TEIID30155=3DColumn "{0}" has an invalid path expression: {1}
TEIID30151=3DError building Source for context item.
MappingLoader.invalidName=3DNull or blank name found in the Mapping Docume=
nt, Must have valid name. Re-build the VDB
-TEIID30450=3DInvalid escape sequence "{0}" with escape character "{1}"
QueryUtil.wrong_number_of_values=3DThe number of bound values ''{0}'' does=
not match the number of parameters ''{1}'' in the prepared statement.
QueryUtil.Error_executing_conversion_function_to_convert_value=3DError con=
verting parameter number {0} with value "{1}" to expected type {2}.
TEIID30128=3DCannot convert insert query expression projected symbol ''{0}=
'' of type {1} to insert column ''{2}'' of type {3}
@@ -769,8 +757,8 @@
=
TEIID30238=3DDuplicate key
TEIID30236=3DNull value is not allowed for column {0}
-ValidationVisitor.group_in_both_dep=3DTable specified in both dependent an=
d independent queries '{0}'
-XMLQuery.resolvingError=3DFailed to resolve the query '{0}'
+ValidationVisitor.group_in_both_dep=3DTable specified in both dependent an=
d independent queries ''{0}''
+XMLQuery.resolvingError=3DFailed to resolve the query ''{0}''
TEIID30085=3DInvalid order by at {0}
=
TEIID30367=3DInfinite loop detected, procedure will not be executed.
@@ -778,9 +766,9 @@
TEIID30244=3DThe batch contained an unrecognized command: {0}
TEIID30243=3DError while planning update procedure, unknown statement type=
encountered: {0}
TEIID30272=3DError getting modelID
-XMLPlanner.no_uri=3DCannot find namespace URI for namespace {0} of element=
{1}
+TEIID30213=3DCannot find namespace URI for namespace {0} of element {1}
=
-XMLPlanner.The_XML_document_element_{0}_is_not_mapped_to_data_and_cannot_b=
e_used_in_the_ORDER_BY_clause__{1}_1=3DThe XML document element {0} is not =
mapped to data and cannot be used in the ORDER BY clause: {1}
+TEIID30288=3DThe XML document element {0} is not mapped to data and cannot=
be used in the ORDER BY clause: {1}
XMLPlanner.The_rowlimit_parameter_{0}_is_not_in_the_scope_of_any_mapping_c=
lass=3DThe ''rowlimit'' or ''rowlimitexception'' function parameter ''{0}''=
is not an XML node within the scope of any mapping class.
XMLPlanner.Criteria_{0}_contains_conflicting_row_limits=3DThe criteria ''{=
0}'' contains conflicting row limits for an XML mapping class.
TEIID30174=3DFailed to rewrite the command: {0}
@@ -797,10 +785,8 @@
ExecDynamicSqlInstruction.6=3DThe datatype ''{0}'' for element ''{1}'' in =
the dynamic SQL cannot be implicitly converted to ''{2}''.
TEIID30168=3DCouldn''t execute the dynamic SQL command "{0}" with the SQL =
statement "{1}" due to: {2}
=
-TEIID30277=3DJoin region with unsatisfied access patterns cannot be satisf=
ied by the join criteria, Access patterns: {0}
TEIID30229=3DTemporary table "{0}" already exists.
TEIID30226=3DTemporary table "{0}" does not exist.
-TEIID30228=3DTable {0} is locked by pending transaction update.
=
TEIID30295=3DCannot create a query for MappingClass with user criteria {0}
TEIID30296=3DConjunct "{0}" has no relationship with target context {1}.
@@ -841,7 +827,7 @@
TEIID30233=3D{0} does not target an internal materialized view.
TEIID30230=3DMaterialized view {0} cannot have a row refreshed since there=
is no primary key.
TEIID30231=3DMaterialized view {0} cannot have a row refreshed because it =
uses a composite key.
-TEIID30232=3DMaterialized view {0} cannot have a row refreshed because it'=
s cache hint did not specify \"updatable\".
+TEIID30232=3DMaterialized view {0} cannot have a row refreshed because it'=
's cache hint did not specify \"updatable\".
TEIID30012=3DRefreshing row {1} for materialized view {0}.
TEIID30303=3DNo root node found.
=
@@ -849,14 +835,14 @@
=
TEIID30482=3DConnector is not in OPEN state
ConnectorManagerImpl.Initializing_connector=3DInitializing connector {0}
-Cancel_request_failed=3DAtomicRequest {0} failed to cancel.
+TEIID30024=3DAtomicRequest {0} failed to cancel.
=
ConnectorWorker.MaxResultRowsExceed=3DThe number of result rows has exceed=
ed the maximum result rows "{0}"
TEIID30004=3DConnector returned a 0 row non-last batch: {0}.
TEIID30005=3Drollback failed for requestID=3D{0}
ConnectorWorker.process_failed=3DConnector worker process failed for atomi=
c-request=3D{0}
TEIID30479=3DCould not process stored procedure results for {0}. Expected=
{1} result set columns, but was {2}. Please update your models to allow f=
or stored procedure results batching.
-TEIID30554=3DCould not obtain connection factory for model {0} in VDB name
+TEIID30554=3DA single source is not assigned to model {0} in VDB name {1}.=
{2}
TEIID30548=3DProperty value length exceeds max of {0}.
TEIID30549=3DCould not find a metadata record with uuid {0}.
TEIID30489=3DUnable to load metadata for VDB name
@@ -876,9 +862,9 @@
ERR.018.005.0095 =3D User <{0}> is not entitled to action <{1}> for 1 or m=
ore of the groups/elements/procedures.
=
# services (003)
-TEIID30032=3DWrong type of data found or no data found; expecting streamab=
le object from the buffer manager.
-TEIID30033=3DWrong type of data found or no data found; expecting streamab=
le object from the buffer manager.
-TEIID30034=3DWrong type of data found or no data found; expecting streamab=
le object from the buffer manager.
+TEIID30032=3DNo lob manager found.
+TEIID30033=3DNo existing lob reference found.
+TEIID30034=3DExpected lob to have a reference value.
TEIID30035=3DWrong type of data found or no data found; expecting streamab=
le object from the buffer manager.
TEIID30491=3DBind variables (represented as "?") were found but are allowe=
d only in prepared or callable statements.
Request.no_result_set=3DThe query does not return a result set.
@@ -890,7 +876,7 @@
TransactionServer.no_transaction=3DNo transaction found for client {0}.
TEIID30525=3DConcurrent enlistment in global transaction {0} is not suppor=
ted.
TEIID30521=3DExpected an existing global transaction {0} but there was non=
e for client {1}
-TEIID30520=3DUnknown flags
+TEIID30520=3DUnknown END flags
TEIID30521=3DNo global transaction found for {0}.
TEIID30524=3DClient is not currently enlisted in transaction {0}.
TEIID30518=3DCannot resume, transaction {0} was not suspended by client {1=
}.
@@ -927,14 +913,12 @@
TEIID30481=3DFailed to find the Connection Factory with JNDI name {0}. Ple=
ase check the name or deploy the Connection Factory with specified name.
TEIID31097=3DConnection Factory (no data source found) provided is null; C=
an not proceed with metadata load.
=
-TEIID30256=3DSource UPDATE or DELETE command "{0}" contains non-pushdown c=
onstructs and no compensating action can be taken as the table lacks a uniq=
ue key or the source does not support equality predicates.
TEIID30254=3DSource UPDATE or DELETE command "{0}" contains non-pushdown c=
onstructs that cannot be simplified into a compensating action.
=
Translate.error=3DCannot translate criteria "{0}", it is not matched by se=
lector "{1}"
=
TEIID30561=3DThe multisource plan must execute a procedure returning param=
eter values exactly 1: {0}
=
-TEIID30417=3DExpected a java.sql.Array, or java array type, but got: {0}
TEIID30546=3DUnknown log level: {0}, expected one of {1}
TEIID30415=3DArray index out of range: {0}
TEIID30190=3DCould not convert value for column: {0}
@@ -972,54 +956,40 @@
TEIID30269=3DUnexpected Exception
TEIID30153=3DCould not define global variable
=
-TEIID30072=3D The expressions in this criteria are being compared but are =
of differing types ({0} and {1}) and no implicit conversion is available: =
{2}
-TEIID30097=3D Unable to resolve return element referred to by LOOKUP funct=
ion: {0}
+TEIID30072=3D The expressions in this criteria are being compared but are =
of differing types ({0} and {1}) and no implicit conversion is available: {=
2}
+TEIID30097=3D Unable to resolve LOOKUP function group: {0}
TEIID30098=3D Unable to resolve return element referred to by LOOKUP funct=
ion: {0}
TEIID30118=3DCannot create temporary table "{0}". An object with the same =
name already exists.
-TEIID30119=3DCannot create temporary table "{0}". An object with the same =
name already exists.
TEIID30121=3DVariable "{0}" is read only and cannot be assigned a value.
TEIID30140=3D Incorrect number of parameters specified on the stored proce=
dure {2} - expected {0} but got {1}
TEIID30146=3D {1} is not allowed on the view {0}: a procedure must be defi=
ned to handle the {1}.
TEIID30183=3DText parse error: Non-whitespace character found between the =
qualifier and the delimiter in text line {0} in {1}.
TEIID30189=3DExpected a java.sql.Array, or java array type, but got: {0}
TEIID30191=3DArray index out of range: {0}
-TEIID30214=3DResults for the mapping class {0} are not found; =
-TEIID30215=3DResults for the mapping class {0} are not found; =
TEIID30227=3DTable {0} is locked by pending transaction update.
TEIID30240=3DCould not determine INSERT target for a partitioned UNION vie=
w {0} with values {1}.
TEIID30253=3DSource UPDATE or DELETE command "{0}" contains non-pushdown c=
onstructs and no compensating action can be taken as the table lacks a uniq=
ue key or the source does not support equality predicates. =
-TEIID30255=3DSource UPDATE or DELETE command "{0}" contains non-pushdown c=
onstructs and no compensating action can be taken as the table lacks a uniq=
ue key or the source does not support equality predicates. =
TEIID30275=3DJoin region with unsatisfied access patterns cannot be satisf=
ied by the join criteria, Access patterns: {0} =
-TEIID30276=3DJoin region with unsatisfied access patterns cannot be satisf=
ied by the join criteria, Access patterns: {0} =
TEIID30314=3DUnknown compare criteria operator: {0}
TEIID30346=3DUnable to evaluate {0}: {1}
TEIID30348=3DUnable to evaluate {0}: {1}
TEIID30349=3DUnable to evaluate {0}: {1}
-TEIID30375=3DThe specified change set {0} against an inherently updatable =
view does not map to a key preserving group.
+TEIID30375=3DThe specified insert variables {0} against an inherently upda=
table view does not map to a key preserving group.
TEIID30377=3DParser cannot parse an empty sql statement.
TEIID30390=3DUDF "{0}" method "{1}" must not return void.
TEIID30391=3DUDF "{0}" method "{1}" must be public.
TEIID30392=3DUDF "{0}" method "{1}" must be static.
-TEIID30393=3DUnknown type signature for evaluating function of: {0} ({1})
-TEIID30394=3DUnknown type signature for evaluating function of: {0} ({1})
-TEIID30395=3DUnknown type signature for evaluating function of: {0} ({1})
-TEIID30396=3DLeft count is invalid: {0}
+TEIID30396=3DLeft/Right count {0} is invalid. It must be >=3D 0.
TEIID30398=3D{0} value must be a single character: [{1}].
TEIID30407=3DThe rowlimit and rowlimitexception functions may only be used=
in XML queries.
-TEIID30409=3DIllegal argument for formating: {0}
-TEIID30410=3DParse Exception occurs for executing: {0} {1}
+TEIID30409=3DIllegal date format: {0}
+TEIID30410=3DCould not parse date using format: {0} {1}
TEIID30413=3DUnable to evaluate {0}: expected Properties for command paylo=
ad but got object of type {1}
TEIID30416=3DExpected a java.sql.Array, or java array type, but got: {0}
TEIID30431=3D{0} has invalid character: {1}
TEIID30449=3DInvalid escape sequence "{0}" with escape character "{1}"
TEIID30451=3DUnable to evaluate {0}: {1}
TEIID30452=3DWrong type of child node is being added.
-TEIID30453=3DWrong type of child node is being added.
-TEIID30454=3DWrong type of child node is being added.
-TEIID30455=3DWrong type of child node is being added.
-TEIID30456=3DWrong type of child node is being added.
-TEIID30458=3DWrong type of child node is being added.
-TEIID30459=3DWrong type of child node is being added.
TEIID30461=3DRoot node assigned to a document can be null.
TEIID30477=3DFailed to unwrap the source connection.
TEIID30563=3DThe request {0} has been cancelled.=3D=3D=3D=3D=3D=3D=3D
@@ -1027,7 +997,7 @@
TEIID30565=3DUsing collator for locale {0}
TEIID30499=3DNo sources were given for the model {0} =
TEIID30523=3DClient thread already involved in a transaction. Transaction =
nesting is not supported. The current transaction must be completed first.
-TEIID30519=3DUnknown flags
+TEIID30519=3DUnknown START flags
TransactionServer.existing_transaction=3DClient thread already involved in=
a transaction. Transaction nesting is not supported. The current transacti=
on must be completed first.
TEIID30517=3DClient thread already involved in a transaction. Transaction =
nesting is not supported. The current transaction must be completed first.
=
Property changes on: trunk/engine/src/test/java/org/teiid/cache
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/cache:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/cache:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/cache:3816-3868*,3876-3915*,=
3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/cache:4002-4046*
/trunk/engine/src/test/java/org/teiid/cache:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/cache:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/cache:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/cache:3816-3868*,3876-3915*,=
3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/cache:4002-4046*,4048-4051*
/trunk/engine/src/test/java/org/teiid/cache:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/cache/TestDefault=
Cache.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.=
java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:=
3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:=
4002-4046
/trunk/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.=
java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:=
3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:=
3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:=
4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/common
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/common:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/common:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/common:3816-3868*,3876-3915*=
,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/common:4002-4046*
/trunk/engine/src/test/java/org/teiid/common:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/common:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/common:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/common:3816-3868*,3876-3915*=
,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/common:4002-4046*,4048-4051*
/trunk/engine/src/test/java/org/teiid/common:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/common/buffer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/common/buffer:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/common/buffer:3673-3711,3754=
-3769
/branches/7.7.x/engine/src/test/java/org/teiid/common/buffer:3816-3868,3876=
-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/common/buffer:4002-4046
/trunk/engine/src/test/java/org/teiid/common/buffer:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/common/buffer:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/common/buffer:3673-3711,3754=
-3769
/branches/7.7.x/engine/src/test/java/org/teiid/common/buffer:3816-3868,3876=
-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/common/buffer:4002-4046,4048=
-4051
/trunk/engine/src/test/java/org/teiid/common/buffer:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/common/queue
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/common/queue:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/common/queue:3673-3711,3754-=
3769
/branches/7.7.x/engine/src/test/java/org/teiid/common/queue:3816-3868,3876-=
3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/common/queue:4002-4046
/trunk/engine/src/test/java/org/teiid/common/queue:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/common/queue:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/common/queue:3673-3711,3754-=
3769
/branches/7.7.x/engine/src/test/java/org/teiid/common/queue:3816-3868,3876-=
3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/common/queue:4002-4046,4048-=
4051
/trunk/engine/src/test/java/org/teiid/common/queue:3507-3666
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestTra=
nsactionServer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestTransacti=
onServer.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestTransacti=
onServer.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -35,7 +35,6 @@
import org.teiid.client.xa.XATransactionException;
import org.teiid.client.xa.XidImpl;
import org.teiid.common.queue.FakeWorkManager;
-import org.teiid.dqp.internal.process.TransactionServerImpl;
import org.teiid.dqp.service.TransactionContext;
=
public class TestTransactionServer {
@@ -234,7 +233,7 @@
server.start(THREAD1, XID1, Integer.MAX_VALUE, 100,false);
fail("exception expected"); //$NON-NLS-1$
} catch (XATransactionException ex) {
- assertEquals("Error Code:TEIID30519 Message:TEIID30519 Unknown=
flags", ex.getMessage()); //$NON-NLS-1$
+ assertEquals("Error Code:TEIID30519 Message:TEIID30519 Unknown=
START flags", ex.getMessage()); //$NON-NLS-1$
}
}
=
Property changes on: trunk/engine/src/test/java/org/teiid/query
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query:3816-3868*,3876-3915*,=
3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query:4002-4046*
/trunk/engine/src/test/java/org/teiid/query:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query:3816-3868*,3876-3915*,=
3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query:4002-4046*,4048-4051*
/trunk/engine/src/test/java/org/teiid/query:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/analysis
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/analysis:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/analysis:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/analysis:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/analysis:4002-4046
/trunk/engine/src/test/java/org/teiid/query/analysis:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/analysis:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/analysis:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/analysis:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/analysis:4002-4046,404=
8-4051
/trunk/engine/src/test/java/org/teiid/query/analysis:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function:3535-355=
5*
/branches/7.6.x/engine/src/test/java/org/teiid/query/function:3673-3711*,37=
54-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function:3816-3868*,38=
76-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/function:4002-4046*
/trunk/engine/src/test/java/org/teiid/query/function:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function:3535-355=
5*
/branches/7.6.x/engine/src/test/java/org/teiid/query/function:3673-3711*,37=
54-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function:3816-3868*,38=
76-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/function:4002-4046*,40=
48-4051*
/trunk/engine/src/test/java/org/teiid/query/function:3507-3666
Modified: trunk/engine/src/test/java/org/teiid/query/function/TestFunction.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java 2=
012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java 2=
012-05-02 21:36:21 UTC (rev 4055)
@@ -1108,12 +1108,6 @@
Double d =3D (Double)FunctionMethods.rand(new CommandContext(), ne=
w Integer(100));
assertEquals(new Double(0.7220096548596434), d);
=
- try {
- FunctionMethods.rand(new CommandContext(), new Double(34.5));
- fail("should have failed to take a double"); //$NON-NLS-1$
- } catch (FunctionExecutionException e) { =
- } =
-
FunctionMethods.rand(new CommandContext()); =
}
=
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/Te=
stFunction.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunc=
tion.java:3281-3325,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunction.=
java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunction.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunction.=
java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java:3188=
-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunc=
tion.java:3281-3325,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunction.=
java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunction.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunction.=
java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java:3188=
-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/Te=
stFunctionLibrary.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunc=
tionLibrary.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionL=
ibrary.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionL=
ibrary.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionL=
ibrary.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.ja=
va:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunc=
tionLibrary.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionL=
ibrary.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionL=
ibrary.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionL=
ibrary.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.ja=
va:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/Te=
stFunctionMetadataReader.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunc=
tionMetadataReader.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
etadataReader.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
etadataReader.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
etadataReader.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataRe=
ader.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunc=
tionMetadataReader.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
etadataReader.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
etadataReader.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
etadataReader.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataRe=
ader.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/Te=
stFunctionMethods.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunc=
tionMethods.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
ethods.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
ethods.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
ethods.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.ja=
va:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunc=
tionMethods.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
ethods.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
ethods.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionM=
ethods.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.ja=
va:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/Te=
stFunctionTree.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunc=
tionTree.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionT=
ree.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionT=
ree.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionT=
ree.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:=
3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunc=
tionTree.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionT=
ree.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionT=
ree.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionT=
ree.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:=
3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/Te=
stResolvedFunctions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestReso=
lvedFunctions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestResolvedF=
unctions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestResolvedF=
unctions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestResolvedF=
unctions.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.=
java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestReso=
lvedFunctions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestResolvedF=
unctions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestResolvedF=
unctions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestResolvedF=
unctions.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.=
java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/me=
tadata
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/metadata=
:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/metadata:3673=
-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/metadata:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/metadata:4002=
-4046
/trunk/engine/src/test/java/org/teiid/query/function/metadata:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/metadata=
:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/metadata:3673=
-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/metadata:3816=
-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/metadata:4002=
-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/function/metadata:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/function/so=
urce
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/function/source:3=
535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/source:3673-3=
711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/source:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/source:4002-4=
046
/trunk/engine/src/test/java/org/teiid/query/function/source:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/function/source:3=
535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/source:3673-3=
711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/function/source:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/function/source:4002-4=
046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/function/source:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/mapping
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/mapping:3673-3711*,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/mapping:3816-3868*,387=
6-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/mapping:4002-4046*
/trunk/engine/src/test/java/org/teiid/query/mapping:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/mapping:3673-3711*,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/mapping:3816-3868*,387=
6-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/mapping:4002-4046*,404=
8-4051*
/trunk/engine/src/test/java/org/teiid/query/mapping:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/mapping/xml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping/xml:3535-=
3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/mapping/xml:3673-3711,=
3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/mapping/xml:3816-3868,=
3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/mapping/xml:4002-4046
/trunk/engine/src/test/java/org/teiid/query/mapping/xml:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping/xml:3535-=
3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/mapping/xml:3673-3711,=
3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/mapping/xml:3816-3868,=
3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/mapping/xml:4002-4046,=
4048-4051
/trunk/engine/src/test/java/org/teiid/query/mapping/xml:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/metadata
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/metadata:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/metadata:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/metadata:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/metadata:4002-4046
/trunk/engine/src/test/java/org/teiid/query/metadata:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/metadata:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/metadata:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/metadata:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/metadata:4002-4046,404=
8-4051
/trunk/engine/src/test/java/org/teiid/query/metadata:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer:3535-35=
55*
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer:3673-3711*,3=
754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer:4002-4046*
/trunk/engine/src/test/java/org/teiid/query/optimizer:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer:3535-35=
55*
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer:3673-3711*,3=
754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer:4002-4046*,4=
048-4051*
/trunk/engine/src/test/java/org/teiid/query/optimizer:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/F=
akeFunctionMetadataSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/FakeFun=
ctionMetadataSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunction=
MetadataSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunction=
MetadataSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunction=
MetadataSource.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataS=
ource.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/FakeFun=
ctionMetadataSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunction=
MetadataSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunction=
MetadataSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunction=
MetadataSource.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataS=
ource.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/I=
nlineViewCase.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/InlineV=
iewCase.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCa=
se.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCa=
se.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCa=
se.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3=
507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/InlineV=
iewCase.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCa=
se.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCa=
se.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCa=
se.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3=
507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estAccessPatterns.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAcc=
essPatterns.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPa=
tterns.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPa=
tterns.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPa=
tterns.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.ja=
va:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAcc=
essPatterns.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPa=
tterns.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPa=
tterns.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPa=
tterns.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.ja=
va:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estAggregatePushdown.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAgg=
regatePushdown.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregat=
ePushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregat=
ePushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregat=
ePushdown.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown=
.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAgg=
regatePushdown.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregat=
ePushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregat=
ePushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregat=
ePushdown.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown=
.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estAnsiJoinPushdown.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAns=
iJoinPushdown.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoin=
Pushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoin=
Pushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoin=
Pushdown.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.=
java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAns=
iJoinPushdown.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoin=
Pushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoin=
Pushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoin=
Pushdown.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.=
java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estBatchedUpdatePlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestBat=
chedUpdatePlanner.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedU=
pdatePlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedU=
pdatePlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedU=
pdatePlanner.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlan=
ner.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestBat=
chedUpdatePlanner.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedU=
pdatePlanner.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedU=
pdatePlanner.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedU=
pdatePlanner.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlan=
ner.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estComparableMetadataPushdown.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestCom=
parableMetadataPushdown.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestComparab=
leMetadataPushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestComparab=
leMetadataPushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestComparab=
leMetadataPushdown.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadat=
aPushdown.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestCom=
parableMetadataPushdown.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestComparab=
leMetadataPushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestComparab=
leMetadataPushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestComparab=
leMetadataPushdown.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadat=
aPushdown.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estDependentJoins.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestDep=
endentJoins.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestDependen=
tJoins.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestDependen=
tJoins.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestDependen=
tJoins.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.ja=
va:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestDep=
endentJoins.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestDependen=
tJoins.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestDependen=
tJoins.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestDependen=
tJoins.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.ja=
va:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estExpressionsInGroupBy.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestExp=
ressionsInGroupBy.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressi=
onsInGroupBy.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressi=
onsInGroupBy.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressi=
onsInGroupBy.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGrou=
pBy.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestExp=
ressionsInGroupBy.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressi=
onsInGroupBy.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressi=
onsInGroupBy.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressi=
onsInGroupBy.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGrou=
pBy.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estInlineView.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestInl=
ineView.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineVi=
ew.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineVi=
ew.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineVi=
ew.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3=
188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestInl=
ineView.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineVi=
ew.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineVi=
ew.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineVi=
ew.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3=
188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estJoinOptimization.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoi=
nOptimization.java:3149-3217,3535-3555,3558-3585
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOpti=
mization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOpti=
mization.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOpti=
mization.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.=
java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoi=
nOptimization.java:3149-3217,3535-3555,3558-3585
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOpti=
mization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOpti=
mization.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOpti=
mization.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.=
java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estJoinPushdownRestrictions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoi=
nPushdownRestrictions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPush=
downRestrictions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPush=
downRestrictions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPush=
downRestrictions.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestr=
ictions.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoi=
nPushdownRestrictions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPush=
downRestrictions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPush=
downRestrictions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPush=
downRestrictions.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestr=
ictions.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estJoinWithFunction.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoi=
nWithFunction.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWith=
Function.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWith=
Function.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWith=
Function.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.=
java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoi=
nWithFunction.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWith=
Function.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWith=
Function.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWith=
Function.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.=
java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estLimit.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestLim=
it.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.ja=
va:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.ja=
va:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3188-3=
450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestLim=
it.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.ja=
va:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.ja=
va:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.ja=
va:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3188-3=
450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estOptimizer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOpt=
imizer.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimize=
r.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimize=
r.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimize=
r.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:31=
88-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOpt=
imizer.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimize=
r.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimize=
r.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimize=
r.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:31=
88-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estOptionalJoins.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOpt=
ionalJoins.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestOptional=
Joins.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestOptional=
Joins.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestOptional=
Joins.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.jav=
a:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOpt=
ionalJoins.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestOptional=
Joins.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestOptional=
Joins.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestOptional=
Joins.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.jav=
a:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estPartitionedJoinPlanning.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestPar=
titionedJoinPlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitio=
nedJoinPlanning.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitio=
nedJoinPlanning.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitio=
nedJoinPlanning.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPl=
anning.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestPar=
titionedJoinPlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitio=
nedJoinPlanning.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitio=
nedJoinPlanning.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitio=
nedJoinPlanning.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPl=
anning.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estRuleMergeVirtual.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRul=
eMergeVirtual.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMerg=
eVirtual.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMerg=
eVirtual.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMerg=
eVirtual.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.=
java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRul=
eMergeVirtual.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMerg=
eVirtual.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMerg=
eVirtual.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMerg=
eVirtual.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.=
java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estRuleRaiseNull.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRul=
eRaiseNull.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRais=
eNull.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRais=
eNull.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRais=
eNull.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.jav=
a:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRul=
eRaiseNull.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRais=
eNull.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRais=
eNull.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRais=
eNull.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.jav=
a:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estRuleRemoveSorts.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRul=
eRemoveSorts.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemo=
veSorts.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemo=
veSorts.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemo=
veSorts.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.j=
ava:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRul=
eRemoveSorts.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemo=
veSorts.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemo=
veSorts.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemo=
veSorts.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.j=
ava:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estSortOptimization.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSor=
tOptimization.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOpti=
mization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOpti=
mization.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOpti=
mization.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.=
java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSor=
tOptimization.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOpti=
mization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOpti=
mization.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOpti=
mization.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.=
java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estStoredProcedurePlanning.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSto=
redProcedurePlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredPr=
ocedurePlanning.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredPr=
ocedurePlanning.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredPr=
ocedurePlanning.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePl=
anning.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSto=
redProcedurePlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredPr=
ocedurePlanning.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredPr=
ocedurePlanning.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredPr=
ocedurePlanning.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePl=
anning.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estSubqueryPushdown.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSub=
queryPushdown.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestSubquery=
Pushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestSubquery=
Pushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestSubquery=
Pushdown.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.=
java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSub=
queryPushdown.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestSubquery=
Pushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestSubquery=
Pushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestSubquery=
Pushdown.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.=
java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/T=
estUnionPlanning.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestUni=
onPlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPla=
nning.java:3673-3711,3754-3769,3776-3813
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPla=
nning.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPla=
nning.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.jav=
a:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestUni=
onPlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPla=
nning.java:3673-3711,3754-3769,3776-3813
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPla=
nning.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPla=
nning.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.jav=
a:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/c=
apabilities
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/capabil=
ities:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/capabilities=
:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/capabilities=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/capabilities=
:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/capabilities:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/capabil=
ities:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/capabilities=
:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/capabilities=
:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/capabilities=
:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/capabilities:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/p=
roc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/proc:35=
35-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/proc:3673-37=
11,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/proc:3816-38=
68,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/proc:4002-40=
46
/trunk/engine/src/test/java/org/teiid/query/optimizer/proc:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/proc:35=
35-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/proc:3673-37=
11,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/proc:3816-38=
68,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/proc:4002-40=
46,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/proc:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/r=
elational
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational:3=
673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational:3=
816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational:4=
002-4046*
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational:3=
673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational:3=
816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational:4=
002-4046*,4048-4051*
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/r=
elational/TestAliasGenerator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal/TestAliasGenerator.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estAliasGenerator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estAliasGenerator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estAliasGenerator.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasG=
enerator.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal/TestAliasGenerator.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estAliasGenerator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estAliasGenerator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estAliasGenerator.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasG=
enerator.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/r=
elational/TestMaterialization.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal/TestMaterialization.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estMaterialization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estMaterialization.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estMaterialization.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMateri=
alization.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal/TestMaterialization.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estMaterialization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estMaterialization.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estMaterialization.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMateri=
alization.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/r=
elational/TestRuleStack.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal/TestRuleStack.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estRuleStack.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estRuleStack.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estRuleStack.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleSt=
ack.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal/TestRuleStack.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estRuleStack.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estRuleStack.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/T=
estRuleStack.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleSt=
ack.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/r=
elational/plantree
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal/plantree:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/p=
lantree:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/p=
lantree:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/p=
lantree:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3=
507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal/plantree:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/p=
lantree:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/p=
lantree:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/p=
lantree:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3=
507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/r=
elational/rules
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal/rules:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/r=
ules:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/r=
ules:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/r=
ules:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3507=
-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relatio=
nal/rules:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/r=
ules:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/r=
ules:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/r=
ules:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3507=
-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/x=
ml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/xml:353=
5-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/xml:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/xml:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/xml:4002-4046
/trunk/engine/src/test/java/org/teiid/query/optimizer/xml:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/xml:353=
5-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/xml:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/xml:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/xml:4002-404=
6,4048-4051
/trunk/engine/src/test/java/org/teiid/query/optimizer/xml:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/parser
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/parser:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/parser:3673-3711,3754-=
3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/parser:3816-3868,3876-=
3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/parser:4002-4046
/trunk/engine/src/test/java/org/teiid/query/parser:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/parser:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/parser:3673-3711,3754-=
3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/parser:3816-3868,3876-=
3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/parser:4002-4046,4048-=
4051
/trunk/engine/src/test/java/org/teiid/query/parser:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor:3535-35=
55*
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor:3673-3711*,3=
754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor:4002-4046*
/trunk/engine/src/test/java/org/teiid/query/processor:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor:3535-35=
55*
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor:3673-3711*,3=
754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor:4002-4046*,4=
048-4051*
/trunk/engine/src/test/java/org/teiid/query/processor:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/F=
akeDataManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDat=
aManager.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeDataMana=
ger.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeDataMana=
ger.java:3816-3868,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeDataMana=
ger.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:=
3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDat=
aManager.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeDataMana=
ger.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeDataMana=
ger.java:3816-3868,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeDataMana=
ger.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:=
3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/F=
akeDataStore.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDat=
aStore.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeDataStor=
e.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeDataStor=
e.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeDataStor=
e.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:31=
88-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDat=
aStore.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeDataStor=
e.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeDataStor=
e.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeDataStor=
e.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:31=
88-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/F=
akeProcessorPlan.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakePro=
cessorPlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeProcesso=
rPlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeProcesso=
rPlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeProcesso=
rPlan.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.jav=
a:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakePro=
cessorPlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeProcesso=
rPlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeProcesso=
rPlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeProcesso=
rPlan.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.jav=
a:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/F=
akeTupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeTup=
leSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSou=
rce.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSou=
rce.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSou=
rce.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:=
3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeTup=
leSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSou=
rce.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSou=
rce.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSou=
rce.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:=
3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/H=
ardcodedDataManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/Hardcod=
edDataManager.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/HardcodedDat=
aManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/HardcodedDat=
aManager.java:3816-3868,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/HardcodedDat=
aManager.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.=
java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/Hardcod=
edDataManager.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/HardcodedDat=
aManager.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/HardcodedDat=
aManager.java:3816-3868,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/HardcodedDat=
aManager.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.=
java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estAggregateProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestAgg=
regateProcessing.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestAggregat=
eProcessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestAggregat=
eProcessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestAggregat=
eProcessing.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessi=
ng.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestAgg=
regateProcessing.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestAggregat=
eProcessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestAggregat=
eProcessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestAggregat=
eProcessing.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessi=
ng.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estArrayTable.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestArr=
ayTable.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestArrayTab=
le.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestArrayTab=
le.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestArrayTab=
le.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3=
507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestArr=
ayTable.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestArrayTab=
le.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestArrayTab=
le.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestArrayTab=
le.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3=
507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estBaseProcessorPlan.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBas=
eProcessorPlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBaseProc=
essorPlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBaseProc=
essorPlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestBaseProc=
essorPlan.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan=
.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBas=
eProcessorPlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBaseProc=
essorPlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBaseProc=
essorPlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestBaseProc=
essorPlan.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan=
.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estBatchIterator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBat=
chIterator.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBatchIte=
rator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBatchIte=
rator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestBatchIte=
rator.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.jav=
a:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBat=
chIterator.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBatchIte=
rator.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBatchIte=
rator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestBatchIte=
rator.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.jav=
a:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estBatchedUpdatePlan.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBat=
chedUpdatePlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBatchedU=
pdatePlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBatchedU=
pdatePlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestBatchedU=
pdatePlan.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan=
.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBat=
chedUpdatePlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBatchedU=
pdatePlan.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBatchedU=
pdatePlan.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestBatchedU=
pdatePlan.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan=
.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estCollectionTupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestCol=
lectionTupleSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestCollecti=
onTupleSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestCollecti=
onTupleSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestCollecti=
onTupleSource.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSo=
urce.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestCol=
lectionTupleSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestCollecti=
onTupleSource.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestCollecti=
onTupleSource.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestCollecti=
onTupleSource.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSo=
urce.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estDependentJoins.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestDep=
endentJoins.java:3149-3217,3535-3555,3558-3585
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestDependen=
tJoins.java:3673-3711,3754-3769,3776-3813
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestDependen=
tJoins.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestDependen=
tJoins.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.ja=
va:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestDep=
endentJoins.java:3149-3217,3535-3555,3558-3585
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestDependen=
tJoins.java:3673-3711,3754-3769,3776-3813
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestDependen=
tJoins.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestDependen=
tJoins.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.ja=
va:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estFunctionPushdown.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestFun=
ctionPushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestFunction=
Pushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestFunction=
Pushdown.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.=
java:3507-3666
+ /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestFun=
ctionPushdown.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestFunction=
Pushdown.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestFunction=
Pushdown.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.=
java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estInherintlyUpdatableViews.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestInh=
erintlyUpdatableViews.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestInherint=
lyUpdatableViews.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestInherint=
lyUpdatableViews.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestInherint=
lyUpdatableViews.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatab=
leViews.java:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestInh=
erintlyUpdatableViews.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestInherint=
lyUpdatableViews.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestInherint=
lyUpdatableViews.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestInherint=
lyUpdatableViews.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatab=
leViews.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estInsertProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestIns=
ertProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestInsertPr=
ocessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestInsertPr=
ocessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestInsertPr=
ocessing.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.=
java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestIns=
ertProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestInsertPr=
ocessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestInsertPr=
ocessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestInsertPr=
ocessing.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.=
java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estJoinWithFunction.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestJoi=
nWithFunction.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestJoinWith=
Function.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestJoinWith=
Function.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestJoinWith=
Function.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.=
java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestJoi=
nWithFunction.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestJoinWith=
Function.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestJoinWith=
Function.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestJoinWith=
Function.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.=
java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estMaterialization.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestMat=
erialization.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestMaterial=
ization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestMaterial=
ization.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestMaterial=
ization.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.j=
ava:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestMat=
erialization.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestMaterial=
ization.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestMaterial=
ization.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestMaterial=
ization.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.j=
ava:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estOptionalJoins.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOpt=
ionalJoins.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestOptional=
Joins.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestOptional=
Joins.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestOptional=
Joins.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.jav=
a:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOpt=
ionalJoins.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestOptional=
Joins.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestOptional=
Joins.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestOptional=
Joins.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.jav=
a:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estOrderByProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOrd=
erByProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestOrderByP=
rocessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestOrderByP=
rocessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestOrderByP=
rocessing.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing=
.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOrd=
erByProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestOrderByP=
rocessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestOrderByP=
rocessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestOrderByP=
rocessing.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing=
.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estProcedureRelational.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestPro=
cedureRelational.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcedur=
eRelational.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestProcedur=
eRelational.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestProcedur=
eRelational.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelation=
al.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestPro=
cedureRelational.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcedur=
eRelational.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestProcedur=
eRelational.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestProcedur=
eRelational.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelation=
al.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estProcessor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestPro=
cessor.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcesso=
r.java:3673-3711,3714-3752,3754-3769,3776-3813
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestProcesso=
r.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestProcesso=
r.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:31=
88-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestPro=
cessor.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcesso=
r.java:3673-3711,3714-3752,3754-3769,3776-3813
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestProcesso=
r.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestProcesso=
r.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:31=
88-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estQueryProcessor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestQue=
ryProcessor.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestQueryPro=
cessor.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestQueryPro=
cessor.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestQueryPro=
cessor.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.ja=
va:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestQue=
ryProcessor.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestQueryPro=
cessor.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestQueryPro=
cessor.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestQueryPro=
cessor.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.ja=
va:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estSQLXMLProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSQL=
XMLProcessing.java:3149-3217,3220-3275,3281-3325,3340-3349,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLPr=
ocessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLPr=
ocessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLPr=
ocessing.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.=
java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSQL=
XMLProcessing.java:3149-3217,3220-3275,3281-3325,3340-3349,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLPr=
ocessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLPr=
ocessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLPr=
ocessing.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.=
java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estSecurityFunctions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSec=
urityFunctions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSecurity=
Functions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSecurity=
Functions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSecurity=
Functions.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions=
.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSec=
urityFunctions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSecurity=
Functions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSecurity=
Functions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSecurity=
Functions.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions=
.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estSetProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSet=
Processing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSetProce=
ssing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSetProce=
ssing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSetProce=
ssing.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.jav=
a:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSet=
Processing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSetProce=
ssing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSetProce=
ssing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSetProce=
ssing.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.jav=
a:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estSourceHints.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSou=
rceHints.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSourceHi=
nts.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSourceHi=
nts.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:=
3598-3666
+ /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSou=
rceHints.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSourceHi=
nts.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSourceHi=
nts.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:=
3598-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estTempTables.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTem=
pTables.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTempTabl=
es.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTempTabl=
es.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestTempTabl=
es.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3=
188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTem=
pTables.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTempTabl=
es.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTempTabl=
es.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestTempTabl=
es.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3=
188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estTextTable.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTex=
tTable.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTextTabl=
e.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTextTabl=
e.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestTextTabl=
e.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:31=
88-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTex=
tTable.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTextTabl=
e.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTextTabl=
e.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestTextTabl=
e.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:31=
88-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estTriggerActions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTri=
ggerActions.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTriggerA=
ctions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTriggerA=
ctions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestTriggerA=
ctions.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.ja=
va:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTri=
ggerActions.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTriggerA=
ctions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTriggerA=
ctions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestTriggerA=
ctions.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.ja=
va:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estVirtualDepJoin.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestVir=
tualDepJoin.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestVirtualD=
epJoin.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestVirtualD=
epJoin.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestVirtualD=
epJoin.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.ja=
va:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestVir=
tualDepJoin.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestVirtualD=
epJoin.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestVirtualD=
epJoin.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestVirtualD=
epJoin.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.ja=
va:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estWindowFunctions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWin=
dowFunctions.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestWindowFu=
nctions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestWindowFu=
nctions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestWindowFu=
nctions.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.j=
ava:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWin=
dowFunctions.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestWindowFu=
nctions.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestWindowFu=
nctions.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestWindowFu=
nctions.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.j=
ava:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/T=
estWithClauseProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWit=
hClauseProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestWithClau=
seProcessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestWithClau=
seProcessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestWithClau=
seProcessing.java:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcess=
ing.java:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWit=
hClauseProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestWithClau=
seProcessing.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestWithClau=
seProcessing.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestWithClau=
seProcessing.java:4002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcess=
ing.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/e=
val
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/eval:35=
35-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/eval:3673-37=
11,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/eval:3816-38=
68,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/eval:4002-40=
46
/trunk/engine/src/test/java/org/teiid/query/processor/eval:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/eval:35=
35-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/eval:3673-37=
11,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/eval:3816-38=
68,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/eval:4002-40=
46,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/eval:3507-3666
Modified: trunk/engine/src/test/java/org/teiid/query/processor/eval/TestCri=
teriaEvaluator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/test/java/org/teiid/query/processor/eval/TestCriteriaE=
valuator.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/test/java/org/teiid/query/processor/eval/TestCriteriaE=
valuator.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -39,16 +39,7 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
import org.teiid.query.eval.Evaluator;
-import org.teiid.query.sql.lang.CollectionValueIterator;
-import org.teiid.query.sql.lang.CompareCriteria;
-import org.teiid.query.sql.lang.Criteria;
-import org.teiid.query.sql.lang.ExistsCriteria;
-import org.teiid.query.sql.lang.IsNullCriteria;
-import org.teiid.query.sql.lang.MatchCriteria;
-import org.teiid.query.sql.lang.Query;
-import org.teiid.query.sql.lang.SetCriteria;
-import org.teiid.query.sql.lang.SubqueryCompareCriteria;
-import org.teiid.query.sql.lang.SubqueryContainer;
+import org.teiid.query.sql.lang.*;
import org.teiid.query.sql.symbol.Constant;
import org.teiid.query.sql.symbol.ElementSymbol;
import org.teiid.query.sql.util.ValueIterator;
@@ -327,7 +318,7 @@
try {
helpTestMatch("abc", "a", 'a', true); //$NON-NLS-1$ //$NON-NLS=
-2$
} catch (ExpressionEvaluationException cee) {
- assertEquals("Error Code:TEIID30450 Message:TEIID30450 Invalid=
escape sequence \"a\" with escape character \"a\"", cee.getMessage()); //$=
NON-NLS-1$
+ assertEquals("Error Code:TEIID30449 Message:TEIID30449 Invalid=
escape sequence \"a\" with escape character \"a\"", cee.getMessage()); //$=
NON-NLS-1$
}
}
=
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/p=
roc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/proc:35=
35-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/proc:3673-37=
11,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/proc:3816-38=
68,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/proc:4002-40=
46
/trunk/engine/src/test/java/org/teiid/query/processor/proc:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/proc:35=
35-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/proc:3673-37=
11,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/proc:3816-38=
68,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/proc:4002-40=
46,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/proc:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/r=
elational
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/relatio=
nal:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/relational:3=
673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/relational:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/relational:4=
002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/relational:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/relatio=
nal:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/relational:3=
673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/relational:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/relational:4=
002-4046,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/relational:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/x=
ml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/xml:353=
5-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/xml:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/xml:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/xml:4002-4046
/trunk/engine/src/test/java/org/teiid/query/processor/xml:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/xml:353=
5-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/xml:3673-371=
1,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/xml:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/processor/xml:4002-404=
6,4048-4051
/trunk/engine/src/test/java/org/teiid/query/processor/xml:3507-3666
Modified: trunk/engine/src/test/java/org/teiid/query/processor/xml/TestXMLP=
rocessor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/test/java/org/teiid/query/processor/xml/TestXMLProcess=
or.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/test/java/org/teiid/query/processor/xml/TestXMLProcess=
or.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -3325,7 +3325,7 @@
"", metadata, dataMgr); //$NON-NLS-1$
fail("Should have failed with QueryPlannerException but didn't=
"); //$NON-NLS-1$
} catch (QueryPlannerException e) {
- String expectedMsg =3D "Error Code:TEIID30288 Message:The XML =
document element [element] name=3D'Suppliers' minOccurs=3D1 maxOccurs=3D1 i=
s not mapped to data and cannot be used in the ORDER BY clause: ORDER BY Su=
ppliers"; //$NON-NLS-1$
+ String expectedMsg =3D "Error Code:TEIID30288 Message:TEIID302=
88 The XML document element [element] name=3D'Suppliers' minOccurs=3D1 maxO=
ccurs=3D1 is not mapped to data and cannot be used in the ORDER BY clause: =
ORDER BY Suppliers"; //$NON-NLS-1$
assertEquals(expectedMsg, e.getMessage());
} =
} =
Property changes on: trunk/engine/src/test/java/org/teiid/query/resolver
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/resolver:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/resolver:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/resolver:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/resolver:4002-4046
/trunk/engine/src/test/java/org/teiid/query/resolver:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/resolver:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/resolver:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/resolver:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/resolver:4002-4046,404=
8-4051
/trunk/engine/src/test/java/org/teiid/query/resolver:3507-3666
Modified: trunk/engine/src/test/java/org/teiid/query/resolver/TestProcedure=
Resolving.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/test/java/org/teiid/query/resolver/TestProcedureResolv=
ing.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/test/java/org/teiid/query/resolver/TestProcedureResolv=
ing.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -855,7 +855,7 @@
=
String userUpdateStr =3D "UPDATE vm1.g1 SET e1=3D'x'"; //$NON-NLS-=
1$
=
- helpFailUpdateProcedure(proc.toString(), userUpdateStr, Table.Trig=
gerEvent.UPDATE, "Error Code:TEIID30120 Message:TEIID30120 Cannot create te=
mporary table \"loopCursor\". An object with the same name already exists."=
); //$NON-NLS-1$
+ helpFailUpdateProcedure(proc.toString(), userUpdateStr, Table.Trig=
gerEvent.UPDATE, "Error Code:TEIID30118 Message:TEIID30118 Cannot create te=
mporary table \"loopCursor\". An object with the same name already exists."=
); //$NON-NLS-1$
}
=
@Test public void testProcedureCreateDrop() {
Modified: trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java 2=
012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java 2=
012-05-02 21:36:21 UTC (rev 4055)
@@ -1405,7 +1405,7 @@
} =
=
@Test public void testFailedConversion_defect9725() throws Exception{
- helpResolveException("select * from pm3.g1 where pm3.g1.e4 > {b 'true=
'}", "Error Code:TEIID30073 Message:TEIID30073 The expressions in this crit=
eria are being compared but are of differing types (timestamp and boolean) =
and no implicit conversion is available: pm3.g1.e4 > TRUE"); //$NON-NLS-1$=
//$NON-NLS-2$
+ helpResolveException("select * from pm3.g1 where pm3.g1.e4 > {b 'true=
'}", "Error Code:TEIID30072 Message:TEIID30072 The expressions in this crit=
eria are being compared but are of differing types (timestamp and boolean) =
and no implicit conversion is available: pm3.g1.e4 > TRUE"); //$NON-NLS-1$ =
//$NON-NLS-2$
} =
=
@Test public void testLookupFunction() { =
Property changes on: trunk/engine/src/test/java/org/teiid/query/rewriter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/rewriter:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/rewriter:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/rewriter:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/rewriter:4002-4046
/trunk/engine/src/test/java/org/teiid/query/rewriter:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/rewriter:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/rewriter:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/rewriter:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/rewriter:4002-4046,404=
8-4051
/trunk/engine/src/test/java/org/teiid/query/rewriter:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/sql:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql:3673-3711*,3754-37=
69
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql:3816-3868*,3876-39=
15*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql:4002-4046*
/trunk/engine/src/test/java/org/teiid/query/sql:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/sql:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql:3673-3711*,3754-37=
69
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql:3816-3868*,3876-39=
15*,3920-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql:4002-4046*,4048-40=
51*
/trunk/engine/src/test/java/org/teiid/query/sql:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/lang
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/lang:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/lang:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/lang:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/lang:4002-4046
/trunk/engine/src/test/java/org/teiid/query/sql/lang:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/lang:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/lang:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/lang:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/lang:4002-4046,404=
8-4051
/trunk/engine/src/test/java/org/teiid/query/sql/lang:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/proc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/proc:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/proc:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/proc:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/proc:4002-4046
/trunk/engine/src/test/java/org/teiid/query/sql/proc:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/proc:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/proc:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/proc:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/proc:4002-4046,404=
8-4051
/trunk/engine/src/test/java/org/teiid/query/sql/proc:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/symbol
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/symbol:3535-3=
555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/symbol:3673-3711,3=
754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/symbol:3816-3868,3=
876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/symbol:4002-4046
/trunk/engine/src/test/java/org/teiid/query/sql/symbol:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/symbol:3535-3=
555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/symbol:3673-3711,3=
754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/symbol:3816-3868,3=
876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/symbol:4002-4046,4=
048-4051
/trunk/engine/src/test/java/org/teiid/query/sql/symbol:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/util:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/util:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/util:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/util:4002-4046
/trunk/engine/src/test/java/org/teiid/query/sql/util:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/util:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/util:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/util:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/util:4002-4046,404=
8-4051
/trunk/engine/src/test/java/org/teiid/query/sql/util:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/visitor
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/visitor:3535-=
3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/visitor:3673-3711,=
3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/visitor:3816-3868,=
3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/visitor:4002-4046
/trunk/engine/src/test/java/org/teiid/query/sql/visitor:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/visitor:3535-=
3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/visitor:3673-3711,=
3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/sql/visitor:3816-3868,=
3876-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/sql/visitor:4002-4046,=
4048-4051
/trunk/engine/src/test/java/org/teiid/query/sql/visitor:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/unittest
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/unittest:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/unittest:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/unittest:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/unittest:4002-4046
/trunk/engine/src/test/java/org/teiid/query/unittest:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/unittest:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/unittest:3673-3711,375=
4-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/unittest:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/unittest:4002-4046,404=
8-4051
/trunk/engine/src/test/java/org/teiid/query/unittest:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/util:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/util:3673-3711,3754-37=
69
/branches/7.7.x/engine/src/test/java/org/teiid/query/util:3816-3868,3876-39=
15,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/util:4002-4046
/trunk/engine/src/test/java/org/teiid/query/util:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/util:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/util:3673-3711,3754-37=
69
/branches/7.7.x/engine/src/test/java/org/teiid/query/util:3816-3868,3876-39=
15,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/util:4002-4046,4048-40=
51
/trunk/engine/src/test/java/org/teiid/query/util:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/validator
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/validator:3535-35=
55
/branches/7.6.x/engine/src/test/java/org/teiid/query/validator:3673-3711,37=
54-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/validator:3816-3868,38=
76-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/validator:4002-4046
/trunk/engine/src/test/java/org/teiid/query/validator:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/query/validator:3535-35=
55
/branches/7.6.x/engine/src/test/java/org/teiid/query/validator:3673-3711,37=
54-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/validator:3816-3868,38=
76-3915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/query/validator:4002-4046,40=
48-4051
/trunk/engine/src/test/java/org/teiid/query/validator:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/vdb
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/vdb:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/vdb:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/vdb:3816-3868*,3876-3915*,39=
20-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/vdb:4002-4046*
/trunk/engine/src/test/java/org/teiid/vdb:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/vdb:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/vdb:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/vdb:3816-3868*,3876-3915*,39=
20-3983*
/branches/8.0.x/engine/src/test/java/org/teiid/vdb:4002-4046*,4048-4051*
/trunk/engine/src/test/java/org/teiid/vdb:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/vdb/runtime
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/vdb/runtime:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/vdb/runtime:3673-3711,3754-3=
769
/branches/7.7.x/engine/src/test/java/org/teiid/vdb/runtime:3816-3868,3876-3=
915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/vdb/runtime:4002-4046
/trunk/engine/src/test/java/org/teiid/vdb/runtime:3507-3666
+ /branches/7.4.x/engine/src/test/java/org/teiid/vdb/runtime:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/vdb/runtime:3673-3711,3754-3=
769
/branches/7.7.x/engine/src/test/java/org/teiid/vdb/runtime:3816-3868,3876-3=
915,3920-3983
/branches/8.0.x/engine/src/test/java/org/teiid/vdb/runtime:4002-4046,4048-4=
051
/trunk/engine/src/test/java/org/teiid/vdb/runtime:3507-3666
Property changes on: trunk/engine/src/test/resources/text
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/resources/text:3535-3555*
/branches/7.6.x/engine/src/test/resources/text:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/resources/text:3816-3868*,3876-3915*,3920-3=
983*
/branches/8.0.x/engine/src/test/resources/text:4002-4046*
/trunk/engine/src/test/resources/text:3507-3666
+ /branches/7.4.x/engine/src/test/resources/text:3535-3555*
/branches/7.6.x/engine/src/test/resources/text:3673-3711*,3754-3769
/branches/7.7.x/engine/src/test/resources/text:3816-3868*,3876-3915*,3920-3=
983*
/branches/8.0.x/engine/src/test/resources/text:4002-4046*,4048-4051*
/trunk/engine/src/test/resources/text:3507-3666
Property changes on: trunk/engine/src/test/resources/text/TextParts_HeaderR=
ow2.csv
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/resources/text/TextParts_HeaderRow2.cs=
v:3535-3555
/branches/7.6.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:400=
2-4046
/trunk/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3507-3666
+ /branches/7.4.x/engine/src/test/resources/text/TextParts_HeaderRow2.cs=
v:3535-3555
/branches/7.6.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:367=
3-3711,3754-3769
/branches/7.7.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:400=
2-4046,4048-4051
/trunk/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3507-3666
Property changes on: trunk/engine/src/test/resources/text/cdm_dos.txt
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/resources/text/cdm_dos.txt:3535-3555
/branches/7.6.x/engine/src/test/resources/text/cdm_dos.txt:3673-3711,3754-3=
769
/branches/7.7.x/engine/src/test/resources/text/cdm_dos.txt:3816-3868,3876-3=
915,3920-3983
/branches/8.0.x/engine/src/test/resources/text/cdm_dos.txt:4002-4046
/trunk/engine/src/test/resources/text/cdm_dos.txt:3507-3666
+ /branches/7.4.x/engine/src/test/resources/text/cdm_dos.txt:3535-3555
/branches/7.6.x/engine/src/test/resources/text/cdm_dos.txt:3673-3711,3754-3=
769
/branches/7.7.x/engine/src/test/resources/text/cdm_dos.txt:3816-3868,3876-3=
915,3920-3983
/branches/8.0.x/engine/src/test/resources/text/cdm_dos.txt:4002-4046,4048-4=
051
/trunk/engine/src/test/resources/text/cdm_dos.txt:3507-3666
Property changes on: trunk/engine/src/test/resources/text/cdm_dos_win.txt
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/resources/text/cdm_dos_win.txt:3149-31=
64,3172-3217,3535-3555
/branches/7.6.x/engine/src/test/resources/text/cdm_dos_win.txt:3673-3711,37=
54-3769
/branches/7.7.x/engine/src/test/resources/text/cdm_dos_win.txt:3816-3868,38=
76-3915,3920-3983
/branches/8.0.x/engine/src/test/resources/text/cdm_dos_win.txt:4002-4046
/trunk/engine/src/test/resources/text/cdm_dos_win.txt:3188-3450,3452-3666
+ /branches/7.4.x/engine/src/test/resources/text/cdm_dos_win.txt:3149-31=
64,3172-3217,3535-3555
/branches/7.6.x/engine/src/test/resources/text/cdm_dos_win.txt:3673-3711,37=
54-3769
/branches/7.7.x/engine/src/test/resources/text/cdm_dos_win.txt:3816-3868,38=
76-3915,3920-3983
/branches/8.0.x/engine/src/test/resources/text/cdm_dos_win.txt:4002-4046,40=
48-4051
/trunk/engine/src/test/resources/text/cdm_dos_win.txt:3188-3450,3452-3666
Property changes on: trunk/engine/src/test/resources/text/test-file.txt.csv
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/resources/text/test-file.txt.csv:3535-=
3555
/branches/7.6.x/engine/src/test/resources/text/test-file.txt.csv:3673-3711,=
3754-3769
/branches/7.7.x/engine/src/test/resources/text/test-file.txt.csv:3816-3868,=
3876-3915,3920-3983
/branches/8.0.x/engine/src/test/resources/text/test-file.txt.csv:4002-4046
/trunk/engine/src/test/resources/text/test-file.txt.csv:3507-3666
+ /branches/7.4.x/engine/src/test/resources/text/test-file.txt.csv:3535-=
3555
/branches/7.6.x/engine/src/test/resources/text/test-file.txt.csv:3673-3711,=
3754-3769
/branches/7.7.x/engine/src/test/resources/text/test-file.txt.csv:3816-3868,=
3876-3915,3920-3983
/branches/8.0.x/engine/src/test/resources/text/test-file.txt.csv:4002-4046,=
4048-4051
/trunk/engine/src/test/resources/text/test-file.txt.csv:3507-3666
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/Integration=
Plugin.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin=
.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin=
.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -53,8 +53,6 @@
TEIID50011,
TEIID50012, // socket enabled
TEIID50013, // Wrong socket protocol
- TEIID50014, // socket disabled
- TEIID50015, // admin max sessions
TEIID50016, // invalid vdb file
TEIID50017, // vdb.xml parse exception
TEIID50018, // failed VDB dependency processing
@@ -66,11 +64,8 @@
TEIID50024, // failed metadata load
TEIID50025, // VDB deployed
TEIID50026, // VDB undeployed
- TEIID50027, // metadata in-process of loading
- TEIID50028, // failed metadata loading
TEIID50029, // dynamic metadata loaded
TEIID50030,
- TEIID50031, // failed to load cached index files
TEIID50032, // duplicate VDB
TEIID50033, // duplicate source name in vdb
TEIID50034, // Source name mismatch
@@ -89,18 +84,11 @@
TEIID50047,
TEIID50048,
TEIID50049,
- TEIID50050,
TEIID50051,
- TEIID50052,
- TEIID50053,
TEIID50054,
TEIID50055,
TEIID50056,
TEIID50057,
- TEIID50058,
- TEIID50059,
- TEIID50060,
- TEIID50061,
TEIID50062,
TEIID50063,
TEIID50064,
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperat=
ionHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHan=
dler.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHan=
dler.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -1039,12 +1039,8 @@
String mappedRole =3D operation.get(OperationsConstants.MAPPED_ROLE).asS=
tring();
=
try {
- DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy =3D VDBService.getPolicy(vdb, policyName);
=
- if (policy =3D=3D null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50050=
, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50050, policyName,=
vdb.getName(), vdb.getVersion()));
- } =
- =
policy.addMappedRoleName(mappedRole);
save(vdb);
} catch (AdminProcessingException e) {
@@ -1087,12 +1083,8 @@
String mappedRole =3D operation.get(OperationsConstants.MAPPED_ROLE).asS=
tring();
=
try {
- DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy =3D VDBService.getPolicy(vdb, policyName); =
=
- if (policy =3D=3D null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50051=
, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50051, policyName,=
vdb.getName(), vdb.getVersion()));
- } =
- =
policy.removeMappedRoleName(mappedRole);
save(vdb);
} catch (AdminProcessingException e) {
@@ -1130,12 +1122,8 @@
String policyName =3D operation.get(OperationsConstants.DATA_ROLE).asStr=
ing();
=
try {
- DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy =3D VDBService.getPolicy(vdb, policyName);
=
- if (policy =3D=3D null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50052=
, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50052, policyName,=
vdb.getName(), vdb.getVersion()));
- } =
- =
policy.setAnyAuthenticated(true);
save(vdb);
} catch (AdminProcessingException e) {
@@ -1170,12 +1158,8 @@
String policyName =3D operation.get(OperationsConstants.DATA_ROLE).asStr=
ing();
=
try {
- DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy =3D VDBService.getPolicy(vdb, policyName);
=
- if (policy =3D=3D null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50053=
, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50053, policyName,=
vdb.getName(), vdb.getVersion()));
- } =
- =
policy.setAnyAuthenticated(false);
save(vdb);
} catch (AdminProcessingException e) {
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2=
012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2=
012-05-02 21:36:21 UTC (rev 4055)
@@ -429,45 +429,29 @@
}
=
public void addDataRole(String policyName, String mappedRole) throws Admi=
nProcessingException{
- DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy =3D getPolicy(vdb, policyName); =
=
- if (policy =3D=3D null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50058,=
IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50058, policyName, =
this.vdb.getName(), this.vdb.getVersion()));
- } =
- =
policy.addMappedRoleName(mappedRole);
save();
}
=
public void remoteDataRole(String policyName, String mappedRole) throws A=
dminProcessingException{
- DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy =3D getPolicy(vdb, policyName);
=
- if (policy =3D=3D null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50059,=
IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50059, policyName, =
this.vdb.getName(), this.vdb.getVersion()));
- } =
- =
policy.removeMappedRoleName(mappedRole);
save();
} =
=
public void addAnyAuthenticated(String policyName) throws AdminProcessing=
Exception{
- DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy =3D getPolicy(vdb, policyName); =
=
- if (policy =3D=3D null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50060,=
IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50060, policyName, =
this.vdb.getName(), this.vdb.getVersion()));
- } =
- =
policy.setAnyAuthenticated(true);
save();
} =
=
public void removeAnyAuthenticated(String policyName) throws AdminProcess=
ingException{
- DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
+ DataPolicyMetadata policy =3D getPolicy(vdb, policyName);
=
- if (policy =3D=3D null) {
- throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50061,=
IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50061, policyName, =
this.vdb.getName(), this.vdb.getVersion()));
- } =
- =
policy.setAnyAuthenticated(false);
save();
} =
@@ -504,6 +488,16 @@
}
}
=
+ static DataPolicyMetadata getPolicy(VDBMetaData vdb, String policyName)
+ throws AdminProcessingException {
+ DataPolicyMetadata policy =3D vdb.getDataPolicy(policyName);
+ =
+ if (policy =3D=3D null) {
+ throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50051,=
IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50051, policyName, =
vdb.getName(), vdb.getVersion()));
+ }
+ return policy;
+ }
+
@SuppressWarnings("serial")
static class TranslatorNotFoundException extends TeiidException {
public TranslatorNotFoundException(String msg) {
Property changes on: trunk/jboss-integration/src/main/java/org/teiid/replic=
ation/jboss/AddressWrapper.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/j=
boss/AddressWrapper.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/AddressWrapper.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/AddressWrapper.java:4002-4046
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWr=
apper.java:3507-3666
+ /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/j=
boss/AddressWrapper.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/AddressWrapper.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/AddressWrapper.java:4002-4046,4048-4051
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWr=
apper.java:3507-3666
Property changes on: trunk/jboss-integration/src/main/java/org/teiid/replic=
ation/jboss/JGroupsInputStream.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/j=
boss/JGroupsInputStream.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/=
JGroupsInputStream.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/JGroupsInputStream.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/JGroupsInputStream.java:4002-4046
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsIn=
putStream.java:3507-3666
+ /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/j=
boss/JGroupsInputStream.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/=
JGroupsInputStream.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/JGroupsInputStream.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/JGroupsInputStream.java:4002-4046,4048-4051
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsIn=
putStream.java:3507-3666
Property changes on: trunk/jboss-integration/src/main/java/org/teiid/replic=
ation/jboss/JGroupsObjectReplicator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/j=
boss/JGroupsObjectReplicator.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/=
JGroupsObjectReplicator.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/JGroupsObjectReplicator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/JGroupsObjectReplicator.java:4002-4046
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOb=
jectReplicator.java:3507-3666
+ /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/j=
boss/JGroupsObjectReplicator.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/=
JGroupsObjectReplicator.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/JGroupsObjectReplicator.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/JGroupsObjectReplicator.java:4002-4046,4048-4051
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOb=
jectReplicator.java:3507-3666
Property changes on: trunk/jboss-integration/src/main/java/org/teiid/replic=
ation/jboss/JGroupsOutputStream.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/j=
boss/JGroupsOutputStream.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/=
JGroupsOutputStream.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/JGroupsOutputStream.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/JGroupsOutputStream.java:4002-4046
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOu=
tputStream.java:3507-3666
+ /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/j=
boss/JGroupsOutputStream.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/=
JGroupsOutputStream.java:3673-3711,3754-3769
/branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/JGroupsOutputStream.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss=
/JGroupsOutputStream.java:4002-4046,4048-4051
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOu=
tputStream.java:3507-3666
Modified: trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.p=
roperties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.propert=
ies 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.propert=
ies 2012-05-02 21:36:21 UTC (rev 4055)
@@ -30,14 +30,12 @@
TEIID50002=3DTeiid Engine stopped {0}
TEIID50062=3DModel name "{0}" not found in the VDB with name "{1}" version=
"{2}"
TEIID50062=3DSource name "{0}" not found for model {1} in the VDB with nam=
e "{2}" version "{3}"
-TEIID50061=3DPolicy name "{0}" not found in the VDB with name "{1}" versio=
n "{2}"
TEIID50063=3DSource with name {0} not found in the Model {1} in VDB {2}.{3}
TEIID50062=3DModel with name {0} not found in the VDB {1}.{2}
event_distributor_bound=3Dorg.teiid.events.EventDistributorFactory is boun=
d to {0} for manual control of Teiid events. =
TEIID50004=3DCould not replicate object {0}
TEIID50019=3DRe-deploying VDB {0}
TEIID50066=3DCache system has been shutdown
-TEIID50050=3DPolicy {0} not found in VDB {1}.{2}
TEIID50051=3DPolicy {0} not found in VDB {1}.{2}
TEIID50054=3DModel {0} not found in VDB {1}.{2}
TEIID50055=3DSource name {0} not found in Model {1} in VDB {1}.{2} =
Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/RuntimeMeta=
dataPlugin.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/metadata/src/main/java/org/teiid/metadata/index/RuntimeMetadataPl=
ugin.java 2012-05-02 19:07:28 UTC (rev 4054)
+++ trunk/metadata/src/main/java/org/teiid/metadata/index/RuntimeMetadataPl=
ugin.java 2012-05-02 21:36:21 UTC (rev 4055)
@@ -44,7 +44,6 @@
=
public static enum Event implements BundleUtil.Event {
TEIID80000,
- TEIID80001,
TEIID80002,
TEIID80003,
TEIID80004
Property changes on: trunk/metadata/src/test/java/org/teiid/cdk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/cdk:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk:3673-3711*,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/cdk:3816-3868*,3876-3915*,=
3920-3983*
/branches/8.0.x/metadata/src/test/java/org/teiid/cdk:4002-4046*
/trunk/metadata/src/test/java/org/teiid/cdk:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/cdk:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk:3673-3711*,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/cdk:3816-3868*,3876-3915*,=
3920-3983*
/branches/8.0.x/metadata/src/test/java/org/teiid/cdk:4002-4046*,4048-4051*
/trunk/metadata/src/test/java/org/teiid/cdk:3507-3666
Property changes on: trunk/metadata/src/test/java/org/teiid/cdk/api
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/api:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk/api:3673-3711,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/cdk/api:3816-3868,3876-391=
5,3920-3983
/branches/8.0.x/metadata/src/test/java/org/teiid/cdk/api:4002-4046
/trunk/metadata/src/test/java/org/teiid/cdk/api:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/api:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk/api:3673-3711,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/cdk/api:3816-3868,3876-391=
5,3920-3983
/branches/8.0.x/metadata/src/test/java/org/teiid/cdk/api:4002-4046,4048-4051
/trunk/metadata/src/test/java/org/teiid/cdk/api:3507-3666
Property changes on: trunk/metadata/src/test/java/org/teiid/cdk/unittest
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/unittest:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk/unittest:3673-3711,375=
4-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/cdk/unittest:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/metadata/src/test/java/org/teiid/cdk/unittest:4002-4046
/trunk/metadata/src/test/java/org/teiid/cdk/unittest:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/unittest:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk/unittest:3673-3711,375=
4-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/cdk/unittest:3816-3868,387=
6-3915,3920-3983
/branches/8.0.x/metadata/src/test/java/org/teiid/cdk/unittest:4002-4046,404=
8-4051
/trunk/metadata/src/test/java/org/teiid/cdk/unittest:3507-3666
Property changes on: trunk/metadata/src/test/java/org/teiid/core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/core:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/core:3673-3711*,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/core:3816-3868*,3876-3915*=
,3920-3983*
/branches/8.0.x/metadata/src/test/java/org/teiid/core:4002-4046*
/trunk/metadata/src/test/java/org/teiid/core:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/core:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/core:3673-3711*,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/core:3816-3868*,3876-3915*=
,3920-3983*
/branches/8.0.x/metadata/src/test/java/org/teiid/core:4002-4046*,4048-4051*
/trunk/metadata/src/test/java/org/teiid/core:3507-3666
Property changes on: trunk/metadata/src/test/java/org/teiid/core/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/core/util:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/core/util:3673-3711,3754-3=
769
/branches/7.7.x/metadata/src/test/java/org/teiid/core/util:3816-3868,3876-3=
915,3920-3983
/branches/8.0.x/metadata/src/test/java/org/teiid/core/util:4002-4046
/trunk/metadata/src/test/java/org/teiid/core/util:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/core/util:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/core/util:3673-3711,3754-3=
769
/branches/7.7.x/metadata/src/test/java/org/teiid/core/util:3816-3868,3876-3=
915,3920-3983
/branches/8.0.x/metadata/src/test/java/org/teiid/core/util:4002-4046,4048-4=
051
/trunk/metadata/src/test/java/org/teiid/core/util:3507-3666
Property changes on: trunk/metadata/src/test/java/org/teiid/internal
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/internal:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/internal:3673-3711*,3754-3=
769
/branches/7.7.x/metadata/src/test/java/org/teiid/internal:3816-3868*,3876-3=
915*,3920-3983*
/branches/8.0.x/metadata/src/test/java/org/teiid/internal:4002-4046*
/trunk/metadata/src/test/java/org/teiid/internal:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/internal:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/internal:3673-3711*,3754-3=
769
/branches/7.7.x/metadata/src/test/java/org/teiid/internal:3816-3868*,3876-3=
915*,3920-3983*
/branches/8.0.x/metadata/src/test/java/org/teiid/internal:4002-4046*,4048-4=
051*
/trunk/metadata/src/test/java/org/teiid/internal:3507-3666
Property changes on: trunk/metadata/src/test/java/org/teiid/internal/core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core:3535-35=
55*
/branches/7.6.x/metadata/src/test/java/org/teiid/internal/core:3673-3711*,3=
754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/internal/core:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/metadata/src/test/java/org/teiid/internal/core:4002-4046*
/trunk/metadata/src/test/java/org/teiid/internal/core:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core:3535-35=
55*
/branches/7.6.x/metadata/src/test/java/org/teiid/internal/core:3673-3711*,3=
754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/internal/core:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/metadata/src/test/java/org/teiid/internal/core:4002-4046*,4=
048-4051*
/trunk/metadata/src/test/java/org/teiid/internal/core:3507-3666
Property changes on: trunk/metadata/src/test/java/org/teiid/internal/core/i=
ndex
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core/index:3=
535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/internal/core/index:3673-3=
711,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/internal/core/index:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/metadata/src/test/java/org/teiid/internal/core/index:4002-4=
046
/trunk/metadata/src/test/java/org/teiid/internal/core/index:3507-3666
+ /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core/index:3=
535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/internal/core/index:3673-3=
711,3754-3769
/branches/7.7.x/metadata/src/test/java/org/teiid/internal/core/index:3816-3=
868,3876-3915,3920-3983
/branches/8.0.x/metadata/src/test/java/org/teiid/internal/core/index:4002-4=
046,4048-4051
/trunk/metadata/src/test/java/org/teiid/internal/core/index:3507-3666
Modified: trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java 2012-0=
5-02 19:07:28 UTC (rev 4054)
+++ trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java 2012-0=
5-02 21:36:21 UTC (rev 4055)
@@ -35,13 +35,11 @@
TEIID40001, // undefined translator properties
TEIID40002, // failed to load ODBC metadata
TEIID40003, // VDB Active
- TEIID40004, // VDB validity errors
TEIID40005, // datasource or translator not found
TEIID40006, // VDB inactive
TEIID40007, // keep alive failed
TEIID40008, // expired session
TEIID40009, // terminate session
- TEIID40010, // odbc error
TEIID40011, // processing error
TEIID40012, // data source not found
TEIID40013, // replication failed
Property changes on: trunk/runtime/src/main/java/org/teiid/transport/SSLCon=
figuration.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/runtime/src/main/java/org/teiid/transport/SSLConfigura=
tion.java:3535-3555
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.=
java:3673-3711,3754-3769
/branches/7.7.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.=
java:4002-4046
/trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3598=
-3666
+ /branches/7.4.x/runtime/src/main/java/org/teiid/transport/SSLConfigura=
tion.java:3535-3555
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.=
java:3673-3711,3754-3769
/branches/7.7.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.=
java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.=
java:4002-4046,4048-4051
/trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3598=
-3666
Property changes on: trunk/runtime/src/main/java/org/teiid/transport/pg
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg:3535-3555*
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/pg:3673-3711*,375=
4-3769
/branches/7.7.x/runtime/src/main/java/org/teiid/transport/pg:3816-3868*,387=
6-3915*,3920-3983*
/branches/8.0.x/runtime/src/main/java/org/teiid/transport/pg:4002-4046*
/trunk/runtime/src/main/java/org/teiid/transport/pg:3507-3666
+ /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg:3535-3555*
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/pg:3673-3711*,375=
4-3769
/branches/7.7.x/runtime/src/main/java/org/teiid/transport/pg:3816-3868*,387=
6-3915*,3920-3983*
/branches/8.0.x/runtime/src/main/java/org/teiid/transport/pg:4002-4046*,404=
8-4051*
/trunk/runtime/src/main/java/org/teiid/transport/pg:3507-3666
Property changes on: trunk/runtime/src/main/java/org/teiid/transport/pg/PGb=
ytea.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.j=
ava:3535-3555
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3=
673-3711,3754-3769
/branches/7.7.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:4=
002-4046
/trunk/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3507-3666
+ /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.j=
ava:3535-3555
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3=
673-3711,3754-3769
/branches/7.7.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3=
816-3868,3876-3915,3920-3983
/branches/8.0.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:4=
002-4046,4048-4051
/trunk/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3507-3666
Modified: trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2012=
-05-02 19:07:28 UTC (rev 4054)
+++ trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2012=
-05-02 21:36:21 UTC (rev 4055)
@@ -46,6 +46,7 @@
TEIID40003=3DVDB {0}.{1} is set to "active"
TEIID40006=3DVDB {0}.{1} is set to "inactive"
TEIID40036=3DSystem.vdb needs to be loaded before any other VDBs.
+TEIID40013=3DReplication failed for {0}
=
TEIID40075=3DUser Defined Function (UDF) model "{0}" not found in the VDB
TEIID40035=3DVDB with given name and version already exists! {0}.{1}
Property changes on: trunk/runtime/src/main/resources/org/teiid/transport
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/runtime/src/main/resources/org/teiid/transport:3535-35=
55*
/branches/7.6.x/runtime/src/main/resources/org/teiid/transport:3673-3711*,3=
754-3769
/branches/7.7.x/runtime/src/main/resources/org/teiid/transport:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/runtime/src/main/resources/org/teiid/transport:4002-4046*
/trunk/runtime/src/main/resources/org/teiid/transport:3507-3666
+ /branches/7.4.x/runtime/src/main/resources/org/teiid/transport:3535-35=
55*
/branches/7.6.x/runtime/src/main/resources/org/teiid/transport:3673-3711*,3=
754-3769
/branches/7.7.x/runtime/src/main/resources/org/teiid/transport:3816-3868*,3=
876-3915*,3920-3983*
/branches/8.0.x/runtime/src/main/resources/org/teiid/transport:4002-4046*,4=
048-4051*
/trunk/runtime/src/main/resources/org/teiid/transport:3507-3666
Property changes on: trunk/runtime/src/test/java/org/teiid/dqp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/runtime/src/test/java/org/teiid/dqp:3535-3555*
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp:3673-3711*,3754-3769
/branches/7.7.x/runtime/src/test/java/org/teiid/dqp:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/runtime/src/test/java/org/teiid/dqp:4002-4046*
/trunk/runtime/src/test/java/org/teiid/dqp:3507-3666
+ /branches/7.4.x/runtime/src/test/java/org/teiid/dqp:3535-3555*
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp:3673-3711*,3754-3769
/branches/7.7.x/runtime/src/test/java/org/teiid/dqp:3816-3868*,3876-3915*,3=
920-3983*
/branches/8.0.x/runtime/src/test/java/org/teiid/dqp:4002-4046*,4048-4051*
/trunk/runtime/src/test/java/org/teiid/dqp:3507-3666
Property changes on: trunk/runtime/src/test/java/org/teiid/dqp/service
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service:3535-3555*
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp/service:3673-3711*,3754=
-3769
/branches/7.7.x/runtime/src/test/java/org/teiid/dqp/service:3816-3868*,3876=
-3915*,3920-3983*
/branches/8.0.x/runtime/src/test/java/org/teiid/dqp/service:4002-4046*
/trunk/runtime/src/test/java/org/teiid/dqp/service:3507-3666
+ /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service:3535-3555*
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp/service:3673-3711*,3754=
-3769
/branches/7.7.x/runtime/src/test/java/org/teiid/dqp/service:3816-3868*,3876=
-3915*,3920-3983*
/branches/8.0.x/runtime/src/test/java/org/teiid/dqp/service:4002-4046*,4048=
-4051*
/trunk/runtime/src/test/java/org/teiid/dqp/service:3507-3666
Property changes on: trunk/runtime/src/test/java/org/teiid/dqp/service/buff=
er
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service/buffer:353=
5-3555
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3673-371=
1,3754-3769
/branches/7.7.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/runtime/src/test/java/org/teiid/dqp/service/buffer:4002-4046
/trunk/runtime/src/test/java/org/teiid/dqp/service/buffer:3507-3666
+ /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service/buffer:353=
5-3555
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3673-371=
1,3754-3769
/branches/7.7.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3816-386=
8,3876-3915,3920-3983
/branches/8.0.x/runtime/src/test/java/org/teiid/dqp/service/buffer:4002-404=
6,4048-4051
/trunk/runtime/src/test/java/org/teiid/dqp/service/buffer:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/=
cdk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk:35=
35-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/cdk:3673-37=
11*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/cdk:3816-38=
68*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/cdk:4002-40=
46*
/trunk/test-integration/common/src/test/java/org/teiid/cdk:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk:35=
35-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/cdk:3673-37=
11*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/cdk:3816-38=
68*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/cdk:4002-40=
46*,4048-4051*
/trunk/test-integration/common/src/test/java/org/teiid/cdk:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/=
cdk/api
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk/ap=
i:3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/cdk/api:367=
3-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/cdk/api:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/cdk/api:400=
2-4046
/trunk/test-integration/common/src/test/java/org/teiid/cdk/api:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk/ap=
i:3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/cdk/api:367=
3-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/cdk/api:381=
6-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/cdk/api:400=
2-4046,4048-4051
/trunk/test-integration/common/src/test/java/org/teiid/cdk/api:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/=
dqp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp:35=
35-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp:3673-37=
11*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp:3816-38=
68*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/dqp:4002-40=
46*
/trunk/test-integration/common/src/test/java/org/teiid/dqp:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp:35=
35-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp:3673-37=
11*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp:3816-38=
68*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/dqp:4002-40=
46*,4048-4051*
/trunk/test-integration/common/src/test/java/org/teiid/dqp:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/=
dqp/internal
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/in=
ternal:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l:4002-4046*
/trunk/test-integration/common/src/test/java/org/teiid/dqp/internal:3507-36=
66
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/in=
ternal:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l:4002-4046*,4048-4051*
/trunk/test-integration/common/src/test/java/org/teiid/dqp/internal:3507-36=
66
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/=
dqp/internal/process
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/in=
ternal/process:3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l/process:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l/process:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l/process:4002-4046
/trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process=
:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/in=
ternal/process:3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l/process:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l/process:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/dqp/interna=
l/process:4002-4046,4048-4051
/trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process=
:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/=
transport
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transp=
ort:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport:3=
673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport:3=
816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/transport:4=
002-4046*
/trunk/test-integration/common/src/test/java/org/teiid/transport:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transp=
ort:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport:3=
673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport:3=
816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/transport:4=
002-4046*,4048-4051*
/trunk/test-integration/common/src/test/java/org/teiid/transport:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/=
transport/TestJDBCSocketTransport.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transp=
ort/TestJDBCSocketTransport.java:3455-3509,3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport/T=
estJDBCSocketTransport.java:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/T=
estJDBCSocketTransport.java:3816-3868,3920-3983
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/transport/T=
estJDBCSocketTransport.java:4002-4046
/trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSo=
cketTransport.java:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transp=
ort/TestJDBCSocketTransport.java:3455-3509,3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport/T=
estJDBCSocketTransport.java:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/T=
estJDBCSocketTransport.java:3816-3868,3920-3983
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/transport/T=
estJDBCSocketTransport.java:4002-4046,4048-4051
/trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSo=
cketTransport.java:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/=
transport/TestODBCSocketTransport.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transp=
ort/TestODBCSocketTransport.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport/T=
estODBCSocketTransport.java:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/T=
estODBCSocketTransport.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/transport/T=
estODBCSocketTransport.java:4002-4046
/trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSo=
cketTransport.java:3188-3450,3452-3666
+ /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transp=
ort/TestODBCSocketTransport.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport/T=
estODBCSocketTransport.java:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/T=
estODBCSocketTransport.java:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/java/org/teiid/transport/T=
estODBCSocketTransport.java:4002-4046,4048-4051
/trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSo=
cketTransport.java:3188-3450,3452-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestJ=
DBCSocketTransport
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSoc=
ketTransport:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport:4002-4046*
/trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport:3=
507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSoc=
ketTransport:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport:4002-4046*,4048-4051*
/trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport:3=
507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestJ=
DBCSocketTransport/testSelect.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSoc=
ketTransport/testSelect.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport/testSelect.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport/testSelect.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport/testSelect.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/t=
estSelect.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSoc=
ketTransport/testSelect.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport/testSelect.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport/testSelect.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport/testSelect.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/t=
estSelect.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestO=
DBCSocketTransport
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSoc=
ketTransport:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport:4002-4046*
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport:3=
507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSoc=
ketTransport:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport:4002-4046*,4048-4051*
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport:3=
507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestO=
DBCSocketTransport/testColumnMetadataWithAlias.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSoc=
ketTransport/testColumnMetadataWithAlias.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testColumnMetadataWithAlias.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testColumnMetadataWithAlias.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testColumnMetadataWithAlias.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/t=
estColumnMetadataWithAlias.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSoc=
ketTransport/testColumnMetadataWithAlias.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testColumnMetadataWithAlias.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testColumnMetadataWithAlias.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testColumnMetadataWithAlias.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/t=
estColumnMetadataWithAlias.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestO=
DBCSocketTransport/testPk.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSoc=
ketTransport/testPk.expected:3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPk.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPk.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPk.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/t=
estPk.expected:3188-3450,3452-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSoc=
ketTransport/testPk.expected:3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPk.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPk.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPk.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/t=
estPk.expected:3188-3450,3452-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestO=
DBCSocketTransport/testPkPrepared.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSoc=
ketTransport/testPkPrepared.expected:3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPkPrepared.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPkPrepared.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPkPrepared.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/t=
estPkPrepared.expected:3188-3450,3452-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSoc=
ketTransport/testPkPrepared.expected:3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPkPrepared.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPkPrepared.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testPkPrepared.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/t=
estPkPrepared.expected:3188-3450,3452-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestO=
DBCSocketTransport/testSelect.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSoc=
ketTransport/testSelect.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testSelect.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testSelect.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testSelect.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/t=
estSelect.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSoc=
ketTransport/testSelect.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testSelect.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testSelect.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTr=
ansport/testSelect.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/t=
estSelect.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel:4002-4046*
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel:35=
07-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel:3816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel:4002-4046*,4048-4051*
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel:35=
07-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testColumns.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testColumns.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testColumns.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testColumns.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stColumns.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testColumns.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testColumns.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testColumns.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stColumns.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testDataTypes.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testDataTypes.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testDataTypes.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testDataTypes.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testDataTypes.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stDataTypes.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testDataTypes.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testDataTypes.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testDataTypes.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testDataTypes.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stDataTypes.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testKeyColumns.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testKeyColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeyColumns.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeyColumns.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeyColumns.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stKeyColumns.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testKeyColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeyColumns.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeyColumns.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeyColumns.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stKeyColumns.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testKeys.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testKeys.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeys.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeys.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeys.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stKeys.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testKeys.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeys.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeys.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testKeys.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stKeys.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testProcedureParams.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testProcedureParams.expected:3220-3275,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedureParams.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedureParams.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedureParams.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stProcedureParams.expected:3188-3450,3452-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testProcedureParams.expected:3220-3275,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedureParams.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedureParams.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedureParams.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stProcedureParams.expected:3188-3450,3452-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testProcedures.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testProcedures.expected:3220-3275,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedures.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedures.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedures.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stProcedures.expected:3188-3450,3452-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testProcedures.expected:3220-3275,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedures.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedures.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testProcedures.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stProcedures.expected:3188-3450,3452-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testReferenceKeyColumns.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testReferenceKeyColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testReferenceKeyColumns.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testReferenceKeyColumns.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testReferenceKeyColumns.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stReferenceKeyColumns.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testReferenceKeyColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testReferenceKeyColumns.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testReferenceKeyColumns.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testReferenceKeyColumns.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stReferenceKeyColumns.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testSchemas.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testSchemas.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testSchemas.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testSchemas.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testSchemas.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stSchemas.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testSchemas.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testSchemas.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testSchemas.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testSchemas.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stSchemas.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testTableIsSystem.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testTableIsSystem.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTableIsSystem.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTableIsSystem.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTableIsSystem.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stTableIsSystem.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testTableIsSystem.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTableIsSystem.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTableIsSystem.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTableIsSystem.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stTableIsSystem.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testTables.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testTables.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTables.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTables.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTables.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stTables.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testTables.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTables.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTables.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testTables.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stTables.expected:3507-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestS=
ystemVirtualModel/testVDBResources.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testVDBResources.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testVDBResources.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testVDBResources.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testVDBResources.expected:4002-4046
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stVDBResources.expected:3507-3666
+ /branches/7.4.x/test-integration/common/src/test/resources/TestSystemV=
irtualModel/testVDBResources.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testVDBResources.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testVDBResources.expected:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtua=
lModel/testVDBResources.expected:4002-4046,4048-4051
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/te=
stVDBResources.expected:3507-3666
Property changes on: trunk/test-integration/db/src/main/java/org/teiid/inte=
rnal
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal:3=
535-3555*
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal:3673-3=
711*,3754-3769
/branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal:3816-3=
868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/main/java/org/teiid/internal:4002-4=
046*
/trunk/test-integration/db/src/main/java/org/teiid/internal:3507-3666
+ /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal:3=
535-3555*
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal:3673-3=
711*,3754-3769
/branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal:3816-3=
868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/main/java/org/teiid/internal:4002-4=
046*,4048-4051*
/trunk/test-integration/db/src/main/java/org/teiid/internal:3507-3666
Property changes on: trunk/test-integration/db/src/main/java/org/teiid/inte=
rnal/core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/c=
ore:3535-3555*
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal/core:3=
673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal/core:3=
816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/main/java/org/teiid/internal/core:4=
002-4046*
/trunk/test-integration/db/src/main/java/org/teiid/internal/core:3507-3666
+ /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/c=
ore:3535-3555*
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal/core:3=
673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal/core:3=
816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/main/java/org/teiid/internal/core:4=
002-4046*,4048-4051*
/trunk/test-integration/db/src/main/java/org/teiid/internal/core:3507-3666
Property changes on: trunk/test-integration/db/src/main/java/org/teiid/inte=
rnal/core/xml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/c=
ore/xml:3535-3555
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal/core/x=
ml:3673-3711,3754-3769
/branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal/core/x=
ml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/db/src/main/java/org/teiid/internal/core/x=
ml:4002-4046
/trunk/test-integration/db/src/main/java/org/teiid/internal/core/xml:3507-3=
666
+ /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/c=
ore/xml:3535-3555
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal/core/x=
ml:3673-3711,3754-3769
/branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal/core/x=
ml:3816-3868,3876-3915,3920-3983
/branches/8.0.x/test-integration/db/src/main/java/org/teiid/internal/core/x=
ml:4002-4046,4048-4051
/trunk/test-integration/db/src/main/java/org/teiid/internal/core/xml:3507-3=
666
Property changes on: trunk/test-integration/db/src/test/java/com
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/db/src/test/java/com:3535-3555*
/branches/7.6.x/test-integration/db/src/test/java/com:3673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/test/java/com:3816-3868*,3876-3915*=
,3920-3983*
/branches/8.0.x/test-integration/db/src/test/java/com:4002-4046*
/trunk/test-integration/db/src/test/java/com:3507-3666
+ /branches/7.4.x/test-integration/db/src/test/java/com:3535-3555*
/branches/7.6.x/test-integration/db/src/test/java/com:3673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/test/java/com:3816-3868*,3876-3915*=
,3920-3983*
/branches/8.0.x/test-integration/db/src/test/java/com:4002-4046*,4048-4051*
/trunk/test-integration/db/src/test/java/com:3507-3666
Property changes on: trunk/test-integration/db/src/test/java/org/teiid/inte=
rnal
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal:3=
535-3555*
/branches/7.6.x/test-integration/db/src/test/java/org/teiid/internal:3673-3=
711*,3754-3769
/branches/7.7.x/test-integration/db/src/test/java/org/teiid/internal:3816-3=
868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/test/java/org/teiid/internal:4002-4=
046*
/trunk/test-integration/db/src/test/java/org/teiid/internal:3507-3666
+ /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal:3=
535-3555*
/branches/7.6.x/test-integration/db/src/test/java/org/teiid/internal:3673-3=
711*,3754-3769
/branches/7.7.x/test-integration/db/src/test/java/org/teiid/internal:3816-3=
868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/test/java/org/teiid/internal:4002-4=
046*,4048-4051*
/trunk/test-integration/db/src/test/java/org/teiid/internal:3507-3666
Property changes on: trunk/test-integration/db/src/test/java/org/teiid/inte=
rnal/core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal/c=
ore:3535-3555*
/branches/7.6.x/test-integration/db/src/test/java/org/teiid/internal/core:3=
673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/test/java/org/teiid/internal/core:3=
816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/test/java/org/teiid/internal/core:4=
002-4046*
/trunk/test-integration/db/src/test/java/org/teiid/internal/core:3507-3666
+ /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal/c=
ore:3535-3555*
/branches/7.6.x/test-integration/db/src/test/java/org/teiid/internal/core:3=
673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/test/java/org/teiid/internal/core:3=
816-3868*,3876-3915*,3920-3983*
/branches/8.0.x/test-integration/db/src/test/java/org/teiid/internal/core:4=
002-4046*,4048-4051*
/trunk/test-integration/db/src/test/java/org/teiid/internal/core:3507-3666
--===============2968965142478545221==--
From jboss-qa-internal at redhat.com Thu May 3 02:11:53 2012
Content-Type: multipart/mixed; boundary="===============9191041426882966209=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: teiid-commits at lists.jboss.org
Subject: [teiid-commits] Teiid-NightlyBuild - Build # 1515 - Still Failing!
Date: Thu, 03 May 2012 01:04:38 -0400
Message-ID: <1964349621.22951336025512430.JavaMail.hudsonmaster@hudson.mw.lab.eng.bos.redhat.com>
In-Reply-To: 600471042.18241335939736007.JavaMail.hudsonmaster@hudson.mw.lab.eng.bos.redhat.com
--===============9191041426882966209==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Teiid-NightlyBuild - Build # 1515 - Still Failing:
Check console output at http://hudson.qa.jboss.com/hudson/job/Teiid-Nightly=
Build/1515/ to view the results.
--===============9191041426882966209==--
From jboss-qa-internal at redhat.com Thu May 3 13:30:22 2012
Content-Type: multipart/mixed; boundary="===============4022816587296546591=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: teiid-commits at lists.jboss.org
Subject: [teiid-commits] Teiid-NightlyBuild - Build # 1516 - Still Failing!
Date: Thu, 03 May 2012 13:30:21 -0400
Message-ID: <1805760614.25281336066221100.JavaMail.hudsonmaster@hudson.mw.lab.eng.bos.redhat.com>
In-Reply-To: 1964349621.22951336025512430.JavaMail.hudsonmaster@hudson.mw.lab.eng.bos.redhat.com
--===============4022816587296546591==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Teiid-NightlyBuild - Build # 1516 - Still Failing:
Check console output at http://hudson.qa.jboss.com/hudson/job/Teiid-Nightly=
Build/1516/ to view the results.
--===============4022816587296546591==--
From jboss-qa-internal at redhat.com Thu May 3 13:40:52 2012
Content-Type: multipart/mixed; boundary="===============1382660697316026312=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: teiid-commits at lists.jboss.org
Subject: [teiid-commits] Teiid-NightlyBuild - Build # 1517 - Still Failing!
Date: Thu, 03 May 2012 13:40:51 -0400
Message-ID: <113525758.25321336066851593.JavaMail.hudsonmaster@hudson.mw.lab.eng.bos.redhat.com>
In-Reply-To: 1805760614.25281336066221100.JavaMail.hudsonmaster@hudson.mw.lab.eng.bos.redhat.com
--===============1382660697316026312==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Teiid-NightlyBuild - Build # 1517 - Still Failing:
Check console output at http://hudson.qa.jboss.com/hudson/job/Teiid-Nightly=
Build/1517/ to view the results.
--===============1382660697316026312==--
From teiid-commits at lists.jboss.org Fri May 4 14:06:19 2012
Content-Type: multipart/mixed; boundary="===============0277319698140748847=="
MIME-Version: 1.0
From: teiid-commits at lists.jboss.org
To: teiid-commits at lists.jboss.org
Subject: [teiid-commits] teiid SVN: r4056 - in trunk:
api/src/main/java/org/teiid/translator and 15 other directories.
Date: Fri, 04 May 2012 14:06:18 -0400
Message-ID: <201205041806.q44I6IXs030929@svn01.web.mwc.hst.phx2.redhat.com>
--===============0277319698140748847==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: shawkins
Date: 2012-05-04 14:06:14 -0400 (Fri, 04 May 2012)
New Revision: 4056
Added:
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/=
testProperties.expected
trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtu=
alProc/
trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtu=
alProc/testDefect15241b.expected
Modified:
trunk/api/src/main/java/org/teiid/metadata/FunctionMethod.java
trunk/api/src/main/java/org/teiid/metadata/Schema.java
trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java
trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java
trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.j=
ava
trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java
trunk/runtime/src/main/java/org/teiid/transport/ODBCSocketListener.java
trunk/runtime/src/main/java/org/teiid/transport/PGCharsetConverter.java
trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
trunk/runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java
trunk/test-integration/common/pom.xml
trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestSy=
stemVirtualModel.java
trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestVi=
rtualDocWithVirtualProc.java
trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBC=
SocketTransport.java
trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBC=
SocketTransport.java
trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport=
/testSelect.expected
trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/=
testGetColumns.expected
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_=
ATTRDEF.expected
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_=
ATTRIBUTE.expected
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_=
TYPE.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport=
/testColumnMetadataWithAlias.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport=
/testPk.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport=
/testPkPrepared.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport=
/testSelect.expected
trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetada=
ta/testColumns.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/=
testColumns.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/=
testKeyColumns.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/=
testKeys.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/=
testTables.expected
Log:
TEIID-1977 fix for using a later driver with teiid odbc
Modified: trunk/api/src/main/java/org/teiid/metadata/FunctionMethod.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/api/src/main/java/org/teiid/metadata/FunctionMethod.java 2012-05-=
02 21:36:21 UTC (rev 4055)
+++ trunk/api/src/main/java/org/teiid/metadata/FunctionMethod.java 2012-05-=
04 18:06:14 UTC (rev 4056)
@@ -482,6 +482,17 @@
this.aggregateAttributes =3D aggregateAttributes;
}
=
+ public static FunctionMethod createFunctionMethod(String name, String des=
cription, String category,
+ String returnType, String... paramTypes) {
+ FunctionParameter[] params =3D new FunctionParameter[paramTypes.length];
+ for (int i =3D 0; i < paramTypes.length; i++) {
+ params[i] =3D new FunctionParameter("param" + (i+1), paramTypes[i]); //=
$NON-NLS-1$
+ }
+ FunctionMethod method =3D new FunctionMethod(name, description, category=
, params, new FunctionParameter("result", returnType)); //$NON-NLS-1$
+ method.setNameInSource(name);
+ return method;
+ }
+
public static void convertExtensionMetadata(Procedure procedureRecord,
FunctionMethod function) {
String deterministic =3D procedureRecord.getProperty(AbstractMetadataRec=
ord.RELATIONAL_URI + "deterministic", true); //$NON-NLS-1$
Modified: trunk/api/src/main/java/org/teiid/metadata/Schema.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/api/src/main/java/org/teiid/metadata/Schema.java 2012-05-02 21:36=
:21 UTC (rev 4055)
+++ trunk/api/src/main/java/org/teiid/metadata/Schema.java 2012-05-04 18:06=
:14 UTC (rev 4056)
@@ -56,8 +56,12 @@
}
=
public void addFunction(FunctionMethod function) {
+ addFunction(function.getName(), function);
+ } =
+ =
+ public void addFunction(String uniqueName, FunctionMethod function) {
function.setParent(this);
- if (this.functions.put(function.getName(), function) !=3D null) {
+ if (this.functions.put(uniqueName, function) !=3D null) {
throw new DuplicateRecordException(DataPlugin.Util.gs(DataPlugin.Event.=
TEIID60015, function.getName()));
}
} =
Modified: trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012=
-05-02 21:36:21 UTC (rev 4055)
+++ trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012=
-05-04 18:06:14 UTC (rev 4056)
@@ -688,12 +688,9 @@
}
=
protected FunctionMethod addPushDownFunction(String qualifier, String =
name, String returnType, String...paramTypes) {
- FunctionParameter[] params =3D new FunctionParameter[paramTypes.lengt=
h];
- for (int i =3D 0; i < paramTypes.length; i++) {
- params[i] =3D new FunctionParameter("param" + (i+1), paramTypes[i]); //=
$NON-NLS-1$
- }
- FunctionMethod method =3D new FunctionMethod(qualifier + '.' + name, =
name, qualifier, params, new FunctionParameter("result", returnType)); //$N=
ON-NLS-1$
- method.setNameInSource(name);
+ FunctionMethod method =3D FunctionMethod.createFunctionMethod(qualifi=
er + '.' + name, name, qualifier,
+ returnType, paramTypes);
+ method.setNameInSource(name);
pushdownFunctionMethods.add(method);
return method;
}
Modified: trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java 20=
12-05-02 21:36:21 UTC (rev 4055)
+++ trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java 20=
12-05-04 18:06:14 UTC (rev 4056)
@@ -36,6 +36,7 @@
import java.util.Map;
import java.util.TimeZone;
import java.util.TreeMap;
+import java.util.regex.Matcher;
=
import org.teiid.client.RequestMessage;
import org.teiid.client.RequestMessage.ResultsMode;
@@ -248,6 +249,13 @@
} else if(resultSet !=3D null) {
metadata =3D resultSet.getMetaData();
} else {
+ Matcher matcher =3D StatementImpl.SHOW_STATEMENT.matcher(prepareSql);
+ if (matcher.matches()) {
+ this.executeShow(matcher);
+ metadata =3D this.resultSet.getMetaData();
+ this.resultSet =3D null;
+ return metadata;
+ } =
if (getMetadataResults().getColumnMetadata() =3D=3D null) {
return null;
}
@@ -259,9 +267,9 @@
return metadata;
}
=
- private MetadataResult getMetadataResults() throws TeiidSQLException {
+ private MetadataResult getMetadataResults() throws SQLException {
if (metadataResults =3D=3D null) {
- if (StatementImpl.SET_STATEMENT.matcher(prepareSql).matches() || Statem=
entImpl.TRANSACTION_STATEMENT.matcher(prepareSql).matches() || StatementImp=
l.SHOW_STATEMENT.matcher(prepareSql).matches()) {
+ if (StatementImpl.SET_STATEMENT.matcher(prepareSql).matches() || Statem=
entImpl.TRANSACTION_STATEMENT.matcher(prepareSql).matches()) {
metadataResults =3D new MetadataResult();
} else {
try {
Modified: trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2012-05-02=
21:36:21 UTC (rev 4055)
+++ trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2012-05-04=
18:06:14 UTC (rev 4056)
@@ -506,51 +506,7 @@
if (resultsMode =3D=3D ResultsMode.UPDATECOUNT) {
throw new TeiidSQLException(JDBCPlugin.Util.getString("Statemen=
tImpl.show_update_count")); //$NON-NLS-1$
}
- String show =3D match.group(1);
- if (show.equalsIgnoreCase("PLAN")) { //$NON-NLS-1$
- List> records =3D new ArrayList>(1);
- PlanNode plan =3D driverConnection.getCurrentPlanDescription();
- if (plan !=3D null) {
- ArrayList row =3D new ArrayList(3);
- row.add(DataTypeTransformer.getClob(plan.toString()));
- row.add(new SQLXMLImpl(plan.toXml()));
- row.add(DataTypeTransformer.getClob(driverConnection.getDebugL=
og()));
- records.add(row);
- }
- createResultSet(records, new String[] {"PLAN_TEXT", "PLAN_XML",=
"DEBUG_LOG"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- new String[] {DataTypeManager.DefaultDataTypes.CLOB, DataType=
Manager.DefaultDataTypes.XML, DataTypeManager.DefaultDataTypes.CLOB});
- return booleanFuture(true);
- }
- if (show.equalsIgnoreCase("ANNOTATIONS")) { //$NON-NLS-1$
- List> records =3D new ArrayList>(1);
- Collection annos =3D driverConnection.getAnnotation=
s();
- for (Annotation annotation : annos) {
- ArrayList row =3D new ArrayList(4);
- row.add(annotation.getCategory());
- row.add(annotation.getPriority().name());
- row.add(annotation.getAnnotation());
- row.add(annotation.getResolution());
- records.add(row);
- }
- createResultSet(records, new String[] {"CATEGORY", "PRIORITY", =
"ANNOTATION", "RESOLUTION"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$N=
ON-NLS-4$
- new String[] {DataTypeManager.DefaultDataTypes.STRING, DataTy=
peManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING,=
DataTypeManager.DefaultDataTypes.STRING});
- return booleanFuture(true);
- }
- if (show.equalsIgnoreCase("ALL")) { //$NON-NLS-1$
- List> records =3D new ArrayList>(1);
- for (String key : driverConnection.getExecutionProperties().str=
ingPropertyNames()) {
- ArrayList row =3D new ArrayList(4);
- row.add(key);
- row.add(driverConnection.getExecutionProperties().get(key));
- records.add(row);
- }
- createResultSet(records, new String[] {"NAME", "VALUE"}, //$NON=
-NLS-1$ //$NON-NLS-2$
- new String[] {DataTypeManager.DefaultDataTypes.STRING, DataTy=
peManager.DefaultDataTypes.STRING});
- return booleanFuture(true);
- }
- List> records =3D Collections.singletonList(Collect=
ions.singletonList(driverConnection.getExecutionProperties().getProperty(JD=
BCURL.getValidKey(show))));
- createResultSet(records, new String[] {show}, new String[] {DataTyp=
eManager.DefaultDataTypes.STRING});
- return booleanFuture(true);
+ return executeShow(match);
}
}
=
@@ -592,6 +548,55 @@
return result;
}
=
+ ResultsFuture executeShow(Matcher match)
+ throws SQLException {
+ String show =3D match.group(1);
+ if (show.equalsIgnoreCase("PLAN")) { //$NON-NLS-1$
+ List> records =3D new ArrayList>(1);
+ PlanNode plan =3D driverConnection.getCurrentPlanDescription();
+ if (plan !=3D null) {
+ ArrayList row =3D new ArrayList(3);
+ row.add(DataTypeTransformer.getClob(plan.toString()));
+ row.add(new SQLXMLImpl(plan.toXml()));
+ row.add(DataTypeTransformer.getClob(driverConnection.getDebugLog()));
+ records.add(row);
+ }
+ createResultSet(records, new String[] {"PLAN_TEXT", "PLAN_XML", "DEBUG_=
LOG"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ new String[] {DataTypeManager.DefaultDataTypes.CLOB, DataTypeManager.=
DefaultDataTypes.XML, DataTypeManager.DefaultDataTypes.CLOB});
+ return booleanFuture(true);
+ }
+ if (show.equalsIgnoreCase("ANNOTATIONS")) { //$NON-NLS-1$
+ List> records =3D new ArrayList>(1);
+ Collection annos =3D driverConnection.getAnnotations();
+ for (Annotation annotation : annos) {
+ ArrayList row =3D new ArrayList(4);
+ row.add(annotation.getCategory());
+ row.add(annotation.getPriority().name());
+ row.add(annotation.getAnnotation());
+ row.add(annotation.getResolution());
+ records.add(row);
+ }
+ createResultSet(records, new String[] {"CATEGORY", "PRIORITY", "ANNOTAT=
ION", "RESOLUTION"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ new String[] {DataTypeManager.DefaultDataTypes.STRING, DataTypeManage=
r.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING, DataTyp=
eManager.DefaultDataTypes.STRING});
+ return booleanFuture(true);
+ }
+ if (show.equalsIgnoreCase("ALL")) { //$NON-NLS-1$
+ List> records =3D new ArrayList>(1);
+ for (String key : driverConnection.getExecutionProperties().stringPrope=
rtyNames()) {
+ ArrayList row =3D new ArrayList(4);
+ row.add(key);
+ row.add(driverConnection.getExecutionProperties().get(key));
+ records.add(row);
+ }
+ createResultSet(records, new String[] {"NAME", "VALUE"}, //$NON-NLS-1$ =
//$NON-NLS-2$
+ new String[] {DataTypeManager.DefaultDataTypes.STRING, DataTypeManage=
r.DefaultDataTypes.STRING});
+ return booleanFuture(true);
+ }
+ List> records =3D Collections.singletonList(Collections.sin=
gletonList(driverConnection.getExecutionProperties().getProperty(JDBCURL.ge=
tValidKey(show))));
+ createResultSet(records, new String[] {show}, new String[] {DataTypeMana=
ger.DefaultDataTypes.STRING});
+ return booleanFuture(true);
+ }
+
private ResultsFuture execute(final RequestMessage reqMsg=
, boolean synch) throws SQLException,
TeiidSQLException {
this.getConnection().beginLocalTxnIfNeeded();
Modified: trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadata=
Store.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.=
java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.=
java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -21,8 +21,8 @@
*/
package org.teiid.deployers;
=
+import java.lang.reflect.Method;
import java.math.BigInteger;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Map;
import java.util.Properties;
@@ -34,11 +34,11 @@
import org.teiid.metadata.Column;
import org.teiid.metadata.Datatype;
import org.teiid.metadata.FunctionMethod;
-import org.teiid.metadata.FunctionMethod.PushDown;
-import org.teiid.metadata.FunctionParameter;
import org.teiid.metadata.MetadataFactory;
import org.teiid.metadata.Table;
+import org.teiid.metadata.FunctionMethod.PushDown;
import org.teiid.metadata.Table.Type;
+import org.teiid.odbc.ODBCServerRemoteImpl;
import org.teiid.translator.TranslatorException;
=
public class PgCatalogMetadataStore extends MetadataFactory {
@@ -66,7 +66,9 @@
add_pg_user();
add_matpg_relatt();
add_matpg_datatype();
- addHasFunctionPrivilage();
+ addFunction("hasPerm", "has_function_privilege"); //$NON-NLS-1$ //$NON-N=
LS-2$
+ addFunction("getExpr2", "pg_get_expr"); //$NON-NLS-1$ //$NON-NLS-2$
+ addFunction("getExpr3", "pg_get_expr"); //$NON-NLS-1$ //$NON-NLS-2$
}
=
@Override
@@ -107,21 +109,27 @@
return t; =
}
=
- // column defaul values
+ // column default values
private Table add_pg_attrdef() throws TranslatorException {
Table t =3D createView("pg_attrdef"); //$NON-NLS-1$ =
=
addColumn("adrelid", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NO=
N-NLS-1$ =
- addColumn("adnum", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-=
NLS-1$
+ addColumn("adnum", DataTypeManager.DefaultDataTypes.SHORT, t); //$NON-NL=
S-1$
addColumn("adbin", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-N=
LS-1$
addColumn("adsrc", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-N=
LS-1$
=
- String transformation =3D "SELECT null as oid, null as adsrc, null as ad=
relid, null as adnum from sys.tables where 1 =3D 0"; //$NON-NLS-1$
+ String transformation =3D "SELECT st.oid as adrelid, convert(t1.Position=
, short) as adnum, " + //$NON-NLS-1$
+ "case when t1.IsAutoIncremented then 'nextval(' else t1.DefaultValue e=
nd as adbin, " + //$NON-NLS-1$
+ "case when t1.IsAutoIncremented then 'nextval(' else t1.DefaultValue e=
nd as adsrc " + //$NON-NLS-1$
+ "FROM SYS.Columns as t1 LEFT OUTER JOIN SYS.Tables st ON (st.Name =3D =
t1.TableName AND st.SchemaName =3D t1.SchemaName)"; //$NON-NLS-1$
t.setSelectTransformation(transformation);
return t; =
}
=
- // table columns ("attributes")
+ /**
+ * table columns ("attributes")
+ * see also {@link ODBCServerRemoteImpl} getPGColInfo for the mod calcula=
tion
+ */
private Table add_pg_attribute() throws TranslatorException {
Table t =3D createView("pg_attribute"); //$NON-NLS-1$ =
=
@@ -375,18 +383,20 @@
addColumn("typlen", DataTypeManager.DefaultDataTypes.SHORT, t); //$NON-N=
LS-1$ =
// typtype is b for a base type, c for a composite type (e.g., a table=
's row type), d for a domain, =
// e for an enum type, or p for a pseudo-type. See also typrelid and typ=
basetype
- addColumn("typtype", DataTypeManager.DefaultDataTypes.CHAR, t); //$NON-N=
LS-1$ =
+ addColumn("typtype", DataTypeManager.DefaultDataTypes.CHAR, t); //$NON-N=
LS-1$
+ // typnotnull represents a not-null constraint on a type. Used for domai=
ns only.
+ addColumn("typnotnull", DataTypeManager.DefaultDataTypes.BOOLEAN, t); //=
$NON-NLS-1$
// if this is a domain (see typtype), then typbasetype identifies the ty=
pe that this one is based on. =
// Zero if this type is not a domain =
addColumn("typbasetype", DataTypeManager.DefaultDataTypes.INTEGER, t); /=
/$NON-NLS-1$ =
// Domains use typtypmod to record the typmod to be applied to their bas=
e type =
// (-1 if base type does not use a typmod). -1 if this type is not a dom=
ain =
addColumn("typtypmod", DataTypeManager.DefaultDataTypes.INTEGER, t); //$=
NON-NLS-1$ =
- =
+ addColumn("typdelim", DataTypeManager.DefaultDataTypes.CHAR, t); //$NON-=
NLS-1$
addColumn("typrelid", DataTypeManager.DefaultDataTypes.INTEGER, t); //$N=
ON-NLS-1$ =
addColumn("typelem", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NO=
N-NLS-1$
String transformation =3D
- "select oid, typname, (SELECT OID FROM SYS.Schemas where Name =3D 'SYS'=
) as typnamespace, typlen, typtype, typbasetype, typtypmod, typrelid, typel=
em from texttable('" + //$NON-NLS-1$
+ "select oid, typname, (SELECT OID FROM SYS.Schemas where Name =3D 'SYS'=
) as typnamespace, typlen, typtype, false as typnotnull, typbasetype, typty=
pmod, cast(',' as char) as typdelim, typrelid, typelem from texttable('" + =
//$NON-NLS-1$
"16,boolean,1,b,0,-1,0,0\n" + //$NON-NLS-1$
"1043,string,-1,b,0,-1,0,0\n" + //$NON-NLS-1$
"25,text,-1,b,0,-1,0,0\n" + //$NON-NLS-1$
@@ -513,29 +523,46 @@
return t;
} =
=
- private FunctionMethod addHasFunctionPrivilage() throws TranslatorExcepti=
on {
- FunctionMethod func =3D addFunction("has_function_privilege"); //$NON-NL=
S-1$
- =
- ClassLoader classLoader =3D Thread.currentThread().getContextClassLoader=
();
- =
- ArrayList inParams =3D new ArrayList();
- inParams.add(new FunctionParameter("oid", DataTypeManager.DefaultDataTyp=
es.INTEGER, ""));//$NON-NLS-1$ //$NON-NLS-2$
- inParams.add(new FunctionParameter("permission", DataTypeManager.Default=
DataTypes.STRING, "")); //$NON-NLS-1$ //$NON-NLS-2$
- =
- func.setInputParameters(inParams);
- func.setOutputParameter(new FunctionParameter("result", DataTypeManager.=
DefaultDataTypes.BOOLEAN, "")); //$NON-NLS-1$ //$NON-NLS-2$
- =
- func.setInvocationClass(ReturnTrue.class.getName());
- func.setInvocationMethod("result"); //$NON-NLS-1$
- func.setPushdown(PushDown.CANNOT_PUSHDOWN);
- func.setClassloader(classLoader); =
- =
- return func;
+ private FunctionMethod addFunction(String javaFunction, String name) {
+ Method[] methods =3D FunctionMethods.class.getMethods();
+ for (Method method : methods) {
+ if (!method.getName().equals(javaFunction)) {
+ continue;
+ }
+ String returnType =3D DataTypeManager.getDataTypeName(method.getReturnT=
ype());
+ Class[] params =3D method.getParameterTypes();
+ String[] paramTypes =3D new String[params.length];
+ for (int i =3D 0; i < params.length; i++) {
+ paramTypes[i] =3D DataTypeManager.getDataTypeName(params[i]);
+ }
+ FunctionMethod func =3D FunctionMethod.createFunctionMethod(name, name,=
"pg", returnType, paramTypes); //$NON-NLS-1$
+ setUUID(func);
+ addFunction(javaFunction, func);
+ ClassLoader classLoader =3D Thread.currentThread().getContextClassLoade=
r();
+ func.setInvocationMethod(javaFunction);
+ func.setPushdown(PushDown.CANNOT_PUSHDOWN);
+ func.setClassloader(classLoader);
+ func.setInvocationClass(FunctionMethods.class.getName());
+ return func;
+ }
+ throw new AssertionError("Could not find function"); //$NON-NLS-1$
}
=
- public static class ReturnTrue{
- public static boolean result(@SuppressWarnings("unused")int oid, @Suppre=
ssWarnings("unused") String permission) {
+ public static class FunctionMethods {
+ public static Boolean hasPerm(@SuppressWarnings("unused") Integer oid,
+ @SuppressWarnings("unused") String permission) {
return true;
}
+
+ public static String getExpr2(String text,
+ @SuppressWarnings("unused") Integer oid) {
+ return text;
+ }
+
+ public static String getExpr3(String text,
+ @SuppressWarnings("unused") Integer oid,
+ @SuppressWarnings("unused") Boolean prettyPrint) {
+ return text;
+ }
}
}
Modified: trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 20=
12-05-02 21:36:21 UTC (rev 4055)
+++ trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 20=
12-05-04 18:06:14 UTC (rev 4056)
@@ -47,6 +47,7 @@
import org.teiid.client.util.ResultsFuture;
import org.teiid.core.util.ApplicationInfo;
import org.teiid.core.util.StringUtil;
+import org.teiid.deployers.PgCatalogMetadataStore;
import org.teiid.jdbc.ConnectionImpl;
import org.teiid.jdbc.PreparedStatementImpl;
import org.teiid.jdbc.ResultSetImpl;
@@ -144,9 +145,6 @@
"\\s+and cn.contype =3D 'p'\\)" + //$NON-NLS-1$
"\\s+order by ref.oid, ref.i", Pattern.DOTALL|Pattern.CASE_INSENSITIVE)=
; //$NON-NLS-1$
=
- private static Pattern preparedAutoIncrement =3D Pattern.compile("select =
1 \\s*from pg_catalog.pg_attrdef \\s*where adrelid =3D \\$1 AND adnum =3D \=
\$2 " + //$NON-NLS-1$
- "\\s*and pg_catalog.pg_get_expr\\(adbin, adrelid\\) \\s*like '%nextval\=
\(%'", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
- =
private static Pattern cursorSelectPattern =3D Pattern.compile("DECLARE \=
"(\\w+)\" CURSOR(\\s(WITH HOLD|SCROLL))? FOR (.*)", Pattern.CASE_INSENSITIV=
E|Pattern.DOTALL); //$NON-NLS-1$
private static Pattern fetchPattern =3D Pattern.compile("FETCH (\\d+) IN =
\"(\\w+)\".*", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
private static Pattern movePattern =3D Pattern.compile("MOVE (\\d+) IN \"=
(\\w+)\".*", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
@@ -490,7 +488,7 @@
ResultsFuture result =3D new ResultsFuture();
if (future.get()) {
List cols =3D getPgColInfo(stmt.getResultSet=
().getMetaData());
- client.sendResults(query.sql, stmt.getResultSe=
t(), cols, result, true);
+ client.sendResults(query.sql, stmt.getResultSe=
t(), cols, result, false);
} else {
client.sendUpdateCount(query.sql, stmt.getUpdateCount()=
);
setEncoding();
@@ -594,15 +592,10 @@
else if (modified.equalsIgnoreCase("select db_name() dbname")) { //$NON=
-NLS-1$
return "SELECT current_database()"; //$NON-NLS-1$
}
- else if (preparedAutoIncrement.matcher(modified).matches()) {
- return "SELECT 1 from matpg_relatt where attrelid =3D ? and attnum =3D=
? and autoinc =3D true"; //$NON-NLS-1$
- }
- else {
+ else if (sql.equalsIgnoreCase("select current_schema()")) { //$NON-NLS-=
1$
// since teiid can work with multiple schemas at a given time
// this call resolution is ambiguous
- if (sql.equalsIgnoreCase("select current_schema()")) { //$NON-NLS-1$
- return "SELECT ''"; //$NON-NLS-1$
- } =
+ return "SELECT ''"; //$NON-NLS-1$
}
=
}
@@ -850,19 +843,33 @@
}
=
private void setEncoding() {
+ String encoding =3D getEncoding();
+ if (encoding !=3D null) {
+ //this may be unnecessary
+ this.client.setEncoding(encoding);
+ }
+ }
+ =
+ private String getEncoding() {
+ StatementImpl t =3D null;
try {
- StatementImpl t =3D connection.createStatement();
+ t =3D connection.createStatement();
ResultSet rs =3D t.executeQuery("show client_encoding"); //$NON-NLS-1$
if (rs.next()) {
- String encoding =3D rs.getString(1);
- if (encoding !=3D null) {
- //this may be unnecessary
- this.client.setEncoding(encoding);
- }
+ return rs.getString(1);
}
} catch (Exception e) {
//don't care
+ } finally {
+ try {
+ if (t !=3D null) {
+ t.close();
+ }
+ } catch (SQLException e) {
+ =
+ }
}
+ return null;
}
=
private final class QueryWorkItem implements Runnable {
@@ -958,7 +965,10 @@
done(null);
}
}
- =
+
+ /**
+ * @see PgCatalogMetadataStore add_pg_attribute for mod calculation
+ */
private List getPgColInfo(ResultSetMetaData meta)
throws SQLException {
if (meta =3D=3D null) {
@@ -966,12 +976,17 @@
}
int columns =3D meta.getColumnCount();
final ArrayList result =3D new ArrayList(columns);
- for (int i =3D 1; i < columns + 1; i++) {
+ for (int i =3D 1; i <=3D columns; i++) {
final PgColInfo info =3D new PgColInfo();
info.name =3D meta.getColumnLabel(i).toLowerCase();
info.type =3D meta.getColumnType(i);
info.type =3D convertType(info.type);
info.precision =3D meta.getColumnDisplaySize(i);
+ if (info.type =3D=3D PG_TYPE_NUMERIC || info.type =3D=3D PG_TYPE_FLOAT4=
|| info.type =3D=3D PG_TYPE_FLOAT8) {
+ info.mod =3D (int) Math.min(Integer.MAX_VALUE, (4+(65536*(long)meta.ge=
tPrecision(i))+meta.getScale(i)));
+ } else {
+ info.mod =3D (int) Math.min(Integer.MAX_VALUE, 4+(long)meta.getColumnD=
isplaySize(i));
+ }
String name =3D meta.getColumnName(i);
String table =3D meta.getTableName(i);
String schema =3D meta.getSchemaName(i);
Modified: trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java 2012-05-02 21:36=
:21 UTC (rev 4055)
+++ trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java 2012-05-04 18:06=
:14 UTC (rev 4056)
@@ -58,6 +58,7 @@
public short attnum;
public int type;
public int precision;
+ public int mod =3D -1;
}
=
/**
Modified: trunk/runtime/src/main/java/org/teiid/transport/ODBCSocketListene=
r.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/src/main/java/org/teiid/transport/ODBCSocketListener.java=
2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/runtime/src/main/java/org/teiid/transport/ODBCSocketListener.java=
2012-05-04 18:06:14 UTC (rev 4056)
@@ -59,9 +59,9 @@
return new SSLAwareChannelHandler(this, config, Thread.currentThread().g=
etContextClassLoader(), storageManager) {
public ChannelPipeline getPipeline() throws Exception {
ChannelPipeline pipeline =3D new DefaultChannelPipeline();
-
- pipeline.addLast("odbcFrontendProtocol", new PgFrontendProtocol(1 <=
< 20)); //$NON-NLS-1$
- pipeline.addLast("odbcBackendProtocol", new PgBackendProtocol(maxLo=
bSize, maxBufferSize, config)); //$NON-NLS-1$
+ PgBackendProtocol pgBackendProtocol =3D new PgBackendProtocol(maxLobSi=
ze, maxBufferSize, config);
+ pipeline.addLast("odbcFrontendProtocol", new PgFrontendProtocol(pgB=
ackendProtocol, 1 << 20)); //$NON-NLS-1$
+ pipeline.addLast("odbcBackendProtocol", pgBackendProtocol); //$NON-=
NLS-1$
pipeline.addLast("handler", this); //$NON-NLS-1$
return pipeline;
} =
Modified: trunk/runtime/src/main/java/org/teiid/transport/PGCharsetConverte=
r.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/src/main/java/org/teiid/transport/PGCharsetConverter.java=
2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/runtime/src/main/java/org/teiid/transport/PGCharsetConverter.java=
2012-05-04 18:06:14 UTC (rev 4056)
@@ -29,7 +29,6 @@
*/
public class PGCharsetConverter {
private static HashMap charSetMap =3D new HashMap();
- private static HashMap inverseCharSetMap =3D new HashMap=
();
=
static {
mapCharset("BIG5", Charset.forName("Big5")); //$NON-NLS-1$ //$NON-NLS-2$
@@ -70,14 +69,10 @@
=
private static void mapCharset(String name, Charset cs) {
charSetMap.put(name, cs);
- inverseCharSetMap.put(cs, name);
}
=
public static Charset getCharset(String name) {
return charSetMap.get(name);
}
=
- public static String getEncoding(Charset cs) {
- return inverseCharSetMap.get(cs);
- }
}
Modified: trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java =
2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java =
2012-05-04 18:06:14 UTC (rev 4056)
@@ -182,6 +182,7 @@
=
private Properties props; =
private Charset encoding =3D Charset.forName("UTF-8");
+ private String clientEncoding =3D "UTF8";
private ReflectionHelper clientProxy =3D new ReflectionHelper(ODBCClie=
ntRemote.class);
private ChannelHandlerContext ctx;
private MessageEvent message;
@@ -229,7 +230,7 @@
@Override
public void initialized(Properties props) {
this.props =3D props;
- setEncoding(props.getProperty("client_encoding", "UTF-8"));
+ setEncoding(props.getProperty("client_encoding", "UTF8"));
}
=
@Override
@@ -258,7 +259,7 @@
// releases before 8.1; IntervalStyle was not reported by releases befor=
e 8.4; =
// application_name was not reported by releases before 9.0.)
=
- sendParameterStatus("client_encoding", PGCharsetConverter.getEncoding(th=
is.encoding));
+ sendParameterStatus("client_encoding", clientEncoding);
sendParameterStatus("DateStyle", this.props.getProperty("DateStyle", "IS=
O"));
sendParameterStatus("integer_datetimes", "off");
sendParameterStatus("is_superuser", "off");
@@ -303,8 +304,14 @@
Charset cs =3D PGCharsetConverter.getCharset(value);
if (cs !=3D null) {
this.encoding =3D cs;
+ this.clientEncoding =3D value;
+ //TODO: for non-init this should send a parameter status
}
}
+ =
+ public Charset getEncoding() {
+ return encoding;
+ }
=
@Override
public void sendParameterDescription(ParameterMetaData meta, int[] paramT=
ype) {
@@ -634,7 +641,7 @@
// pg_type.typlen
writeShort(getTypeSize(info.type, info.precision));
// pg_attribute.atttypmod
- writeInt(-1);
+ writeInt(info.mod);
// text
writeShort(0);
}
@@ -663,16 +670,6 @@
sendMessage();
}
=
- private void sendNoticeResponse(String message) {
- trace("notice:", message);
- startMessage('N');
- write('S');
- writeString("ERROR");
- write('M');
- writeString(message);
- sendMessage();
- }
-
private void sendParseComplete() {
startMessage('1');
sendMessage();
Modified: trunk/runtime/src/main/java/org/teiid/transport/PgFrontendProtoco=
l.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java=
2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java=
2012-05-04 18:06:14 UTC (rev 4056)
@@ -64,20 +64,20 @@
private Byte messageType;
private Integer dataLength;
private boolean initialized =3D false;
- private Charset encoding =3D Charset.forName("UTF-8"); // client can over=
ride this
private ODBCServerRemote odbcProxy;
private PGRequest message;
private String user;
private String databaseName;
+ private PgBackendProtocol pgBackendProtocol;
=
- public PgFrontendProtocol(int maxObjectSize) {
+ public PgFrontendProtocol(PgBackendProtocol pgBackendProtocol, int maxObj=
ectSize) {
=
if (maxObjectSize <=3D 0) {
throw new IllegalArgumentException("maxObjectSize: " + maxObje=
ctSize); //$NON-NLS-1$
}
=
this.maxObjectSize =3D maxObjectSize;
- =
+ this.pgBackendProtocol =3D pgBackendProtocol;
// the proxy is used for generating the object based message based on Se=
rviceInvocationStruct class.
this.odbcProxy =3D (ODBCServerRemote)Proxy.newProxyInstance(this.getClas=
s().getClassLoader(), new Class[] {ODBCServerRemote.class}, new InvocationH=
andler() {
@Override
@@ -131,7 +131,7 @@
=
byte[] data =3D createByteArray(this.dataLength - 4);
buffer.readBytes(data);
- createRequestMessage(this.messageType, new NullTerminatedStringDataInput=
Stream(data, new DataInputStream(new ByteArrayInputStream(data, 0, this.dat=
aLength-4)), this.encoding));
+ createRequestMessage(this.messageType, new NullTerminatedStringDataInput=
Stream(data, new DataInputStream(new ByteArrayInputStream(data, 0, this.dat=
aLength-4)), this.pgBackendProtocol.getEncoding()));
this.dataLength =3D null;
this.messageType =3D null;
return message;
@@ -209,20 +209,16 @@
} =
this.user =3D props.getProperty("user");
this.databaseName =3D props.getProperty("database");
- String clientEncoding =3D props.getProperty("client_encoding", "UT=
F-8");
+ String clientEncoding =3D props.getProperty("client_encoding", "UT=
F8");
props.setProperty("client_encoding", clientEncoding);
props.setProperty("default_transaction_isolation", "read committed=
");
props.setProperty("DateStyle", "ISO");
props.setProperty("TimeZone", Calendar.getInstance().getTimeZone()=
.getDisplayName());
- Charset cs =3D PGCharsetConverter.getCharset(clientEncoding);
- if (cs !=3D null) {
- this.encoding =3D cs;
- }
this.odbcProxy.initialize(props);
return message;
}
=
- private Object buildLogin(NullTerminatedStringDataInputStream data) throw=
s IOException{
+ private Object buildLogin(NullTerminatedStringDataInputStream data) {
this.odbcProxy.logon(this.databaseName, this.user, data);
return message;
} =
@@ -263,7 +259,7 @@
=
// the params can be either text or binary
if (formatCodeCount =3D=3D 0 || (formatCodeCount =3D=3D 1 && f=
ormatCodes[0] =3D=3D 0) || formatCodes[i] =3D=3D 0) {
- params[i] =3D new String(paramdata, this.encoding);
+ params[i] =3D new String(paramdata, this.pgBackendProtocol.ge=
tEncoding());
}
else {
params[i] =3D paramdata;
Modified: trunk/test-integration/common/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/test-integration/common/pom.xml 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/pom.xml 2012-05-04 18:06:14 UTC (rev 4056)
@@ -13,7 +13,7 @@
postgresql
postgresql
- 8.3-606.jdbc3
+ 9.1-901.jdbc4
com.h2database
Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel=
/TestSystemVirtualModel.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestS=
ystemVirtualModel.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestS=
ystemVirtualModel.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -93,14 +93,7 @@
}
=
@Test public void testProperties() throws Exception {
- String[] expected =3D { "Name[string] Value[string] UID[string] OID[inte=
ger] ClobValue[clob]",
- "pg_type:oid 30 mmuid:ffa4ac73-b549-470e-931f-dc36330cb8c4 1 30",
- "pg_type:oid 1009 mmuid:d9f36bdc-7b25-4af0-b9f5-a96aac6d3094 2 1009",
- "pg_type:oid 1002 mmuid:bcbed548-176c-4116-a5d6-7638cb0206e1 3 1002",
- "pg_type:oid 1028 mmuid:a385751f-a31a-4d5d-9197-3fbd390b0251 4 1028"
- =
- }; //$NON-NLS-1$
- executeAndAssertResults("select* from SYS.Properties", expected); //$NON=
-NLS-1$
+ checkResult("testProperties", "select* from SYS.Properties"); //$NON-NLS=
-1$
}
=
@Test public void testVirtualDatabase() throws Exception {
Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel=
/TestVirtualDocWithVirtualProc.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestV=
irtualDocWithVirtualProc.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestV=
irtualDocWithVirtualProc.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -30,6 +30,7 @@
import org.teiid.core.util.UnitTestUtil;
import org.teiid.jdbc.AbstractMMQueryTestCase;
import org.teiid.jdbc.FakeServer;
+import org.teiid.jdbc.TestMMDatabaseMetaData;
=
=
/**
@@ -94,18 +95,9 @@
}
=
@Test public void testDefect15241b() throws Exception {
- =
String sql =3D "SELECT p.Name, p.Value, UID FROM SYS.Properties p ord=
er by p.Name"; //$NON-NLS-1$
- String[] expected =3D{
- "Name[string] Value[string] UID[string]", //$NON-NLS-1$
- "NugentXAttribute Nuuuuuge22222 mmuuid:4789b280-841c-1f15-9526-ebd0ca=
ce03e1", //$NON-NLS-1$
- "NugentYAttribute Nuuuuuge44444 mmuuid:4789b280-841c-1f15-9526-ebd0ca=
ce03e1",
- "pg_type:oid 30 mmuid:ffa4ac73-b549-470e-931f-dc36330cb8c4" ,
- "pg_type:oid 1009 mmuid:d9f36bdc-7b25-4af0-b9f5-a96aac6d3094" ,
- "pg_type:oid 1002 mmuid:bcbed548-176c-4116-a5d6-7638cb0206e1",
- "pg_type:oid 1028 mmuid:a385751f-a31a-4d5d-9197-3fbd390b0251" =
- };
- executeAndAssertResults(sql, expected);
+ execute(sql);
+ TestMMDatabaseMetaData.compareResultSet(this.internalResultSet);
}
=
}
Modified: trunk/test-integration/common/src/test/java/org/teiid/transport/T=
estJDBCSocketTransport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDB=
CSocketTransport.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDB=
CSocketTransport.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -137,13 +137,13 @@
=
@Test public void testXmlTableScrollable() throws Exception {
Statement s =3D conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, =
ResultSet.CONCUR_READ_ONLY);
- assertTrue(s.execute("select * from xmltable('/root/row' passing (select=
xmlelement(name \"root\", xmlagg(xmlelement(name \"row\", xmlforest(t.name=
)) order by t.name)) from tables as t, columns as t1) columns \"Name\" stri=
ng) as x"));
+ assertTrue(s.execute("select * from xmltable('/root/row' passing (select=
xmlelement(name \"root\", xmlagg(xmlelement(name \"row\", xmlforest(t.name=
)) order by t.name)) from (select t.* from tables as t, columns as t1 limit=
7000) as t) columns \"Name\" string) as x"));
ResultSet rs =3D s.getResultSet();
int count =3D 0;
while (rs.next()) {
count++;
}
- assertEquals(7812, count);
+ assertEquals(7000, count);
rs.beforeFirst();
while (rs.next()) {
count--;
Modified: trunk/test-integration/common/src/test/java/org/teiid/transport/T=
estODBCSocketTransport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/test-integration/common/src/test/java/org/teiid/transport/TestODB=
CSocketTransport.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/java/org/teiid/transport/TestODB=
CSocketTransport.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -55,6 +55,7 @@
import org.teiid.jdbc.FakeServer;
import org.teiid.jdbc.TeiidDriver;
import org.teiid.jdbc.TestMMDatabaseMetaData;
+import org.teiid.jdbc.util.ResultSetUtil;
import org.teiid.net.socket.SocketUtil;
=
@SuppressWarnings("nls")
@@ -195,14 +196,14 @@
=
@Test public void testMultibatchSelect() throws Exception {
Statement s =3D conn.createStatement();
- assertTrue(s.execute("select * from tables, columns"));
+ assertTrue(s.execute("select * from tables, columns limit 7000"));
ResultSet rs =3D s.getResultSet();
int i =3D 0;
while (rs.next()) {
i++;
rs.getString(1);
}
- assertEquals(7812, i);
+ assertEquals(7000, i);
}
=
@Test public void testBlob() throws Exception {
@@ -364,6 +365,6 @@
ResultSet rs =3D s.getResultSet();
assertTrue(rs.next());
String str =3D rs.getString(1);
- assertEquals("ProjectNode\n + Output Columns:expr1 (integer)\n + Stati=
stics:\n 0: Node Output Rows: 1\n 1: Node Process Time: 0\n 2: Nod=
e Cumulative Process Time: 0\n 3: Node Cumulative Next Batch Process Tim=
e: 0\n 4: Node Next Batch Calls: 1\n 5: Node Blocks: 0\n + Cost Esti=
mates:Estimated Node Cardinality: 1.0\n + Select Columns:1\n", str);
+ assertTrue(str.startsWith("ProjectNode\n + Output Columns:expr1 (intege=
r)\n + Statistics:\n 0: Node Output Rows: 1"));
}
}
Modified: trunk/test-integration/common/src/test/resources/TestJDBCSocketTr=
ansport/testSelect.expected
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/test-integration/common/src/test/resources/TestJDBCSocketTranspor=
t/testSelect.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestJDBCSocketTranspor=
t/testSelect.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -18,19 +18,19 @@
parts SYS =
Tables =
Table <=
null> true =
false mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7 -1 =
=
true false 17 =
parts SYSADMI=
N VDBResources =
Table <=
null> true =
false mmuuid:1785804d-beaf-4831-9531-e59164fedd49 -1 =
=
true false 7 =
parts SYS =
VirtualDatabase=
s Table <=
null> true =
false mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489 -1 =
=
true false 18 =
-parts pg_cata=
log matpg_datatype =
Table <=
null> false =
false mmuid:17448311-6679-4dfd-aeb6-4aabbd894729 -1 =
=
true true 19 =
-parts pg_cata=
log matpg_relatt =
Table <=
null> false =
false mmuid:8c0714d6-1c72-40b4-8528-3b2c63059107 -1 =
=
true true 20 =
-parts pg_cata=
log pg_am =
Table <=
null> false =
false mmuid:f6517a63-8c14-4b73-a18d-afaa5dfb35d9 -1 =
=
true false 21 =
-parts pg_cata=
log pg_attrdef =
Table <=
null> false =
false mmuid:76a7dd05-9a7d-4243-b561-f3056500dcaf -1 =
=
true false 22 =
+parts pg_cata=
log matpg_datatype =
Table <=
null> false =
false mmuid:0f312b3c-98ca-4a09-81fa-f1ff83f0a6c1 -1 =
=
true true 19 =
+parts pg_cata=
log matpg_relatt =
Table <=
null> false =
false mmuid:0b0894ba-e1ea-4eaf-bcd2-ea9ebd05e47d -1 =
=
true true 20 =
+parts pg_cata=
log pg_am =
Table <=
null> false =
false mmuid:da4b747e-7d87-403a-8309-2cdf1399031b -1 =
=
true false 21 =
+parts pg_cata=
log pg_attrdef =
Table <=
null> false =
false mmuid:e9b278d4-49af-442f-9a5a-b699fe3b102b -1 =
=
true false 22 =
parts pg_cata=
log pg_attribute =
Table <=
null> false =
false mmuid:fa463d98-365f-489a-a707-025193cb51eb -1 =
=
true true 23 =
parts pg_cata=
log pg_class =
Table <=
null> false =
false mmuid:7e21f2e6-06e3-4bca-9b01-72ea47821560 -1 =
=
true true 24 =
-parts pg_cata=
log pg_database =
Table <=
null> false =
false mmuid:382f9fc9-8c96-4df7-ab5d-04dfb47ee142 -1 =
=
true false 25 =
-parts pg_cata=
log pg_index =
Table <=
null> false =
false mmuid:09daed8d-b0b8-4552-a261-2b6c775b46b0 -1 =
=
true true 26 =
+parts pg_cata=
log pg_database =
Table <=
null> false =
false mmuid:1aedd02c-5801-41e7-accd-da1f257c26e8 -1 =
=
true false 25 =
+parts pg_cata=
log pg_index =
Table <=
null> false =
false mmuid:8709e084-48df-417d-b3f8-f4e9b7d8802b -1 =
=
true true 26 =
parts pg_cata=
log pg_namespace =
Table <=
null> false =
false mmuid:6609866a-3d7b-4f4b-95fe-ebfac769d699 -1 =
=
true false 27 =
-parts pg_cata=
log pg_proc =
Table <=
null> false =
false mmuid:f20c9489-10ca-4596-8a37-24218b67f764 -1 =
=
true true 28 =
-parts pg_cata=
log pg_trigger =
Table <=
null> false =
false mmuid:2b75f0b1-7475-4ed5-9da3-d37a8a25f26a -1 =
=
true false 29 =
+parts pg_cata=
log pg_proc =
Table <=
null> false =
false mmuid:b288b3aa-37f2-4a8e-8b1b-e932a2ce3e25 -1 =
=
true true 28 =
+parts pg_cata=
log pg_trigger =
Table <=
null> false =
false mmuid:64977f3e-f2a0-466e-a5d1-80bb058cbe08 -1 =
=
true false 29 =
parts pg_cata=
log pg_type =
Table <=
null> false =
false mmuid:9462e3f8-cd3c-414f-a570-f6f33c40e36a -1 =
=
true false 30 =
-parts pg_cata=
log pg_user =
Table <=
null> false =
false mmuid:e63613cb-01ee-4b37-8b91-99d1aac4dfcb -1 =
=
true false 31 =
+parts pg_cata=
log pg_user =
Table <=
null> false =
false mmuid:236445e1-408c-40a1-a61c-40e96fb5dc9f -1 =
=
true false 31 =
Row Count : 31
getColumnName getColumnType getCatalogName getColumnClassName getCol=
umnLabel getColumnTypeName getSchemaName getTableName getColumnDisplay=
Size getPrecision getScale isAutoIncrement isCaseSensitive isCurrency =
isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWr=
itable =
VDBName 12 parts java.lang.String VDBNam=
e string SYS Tables 255 =
255 0 false true false =
true 1 false true true true=
=
Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMe=
taData/testGetColumns.expected
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData=
/testGetColumns.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData=
/testGetColumns.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -792,7 +792,7 @@
QT_Ora9DS pg_cata=
log pg_am =
oid =
4 integer =
10 =
0 0 =
2 =
=
=
0 =
1 =
=
=
!
=
NO =
=
QT_Ora9DS pg_cata=
log pg_am =
amname =
12 string =
4000 =
0 0 =
2 =
=
=
0 =
2 =
=
=
!
=
NO =
=
QT_Ora9DS pg_cata=
log pg_attrdef =
adrelid =
4 integer =
10 =
0 0 =
2 =
=
=
0 =
1 =
=
=
!
=
NO =
=
-QT_Ora9DS pg_cata=
log pg_attrdef =
adnum =
4 integer =
10 =
0 0 =
2 =
=
=
0 =
2 =
=
=
!