Update teiid libraries to teiid 8.2.Alpha2

* TestDisplayNodeFactory
 * Fix references to RaiseErrorStatement as its been renamed to
   RaiseStatement

* ModelerCoreException
* UserCancelledException
* ModelAnnotationImpl
 * TeiidRuntimeException constructors have been modified so remove
   dependency on them

* TransformationValidator
 * CreateProcedureCommand no longer contains a results command

plugins/org.teiid.core.designer/src/org/teiid/designer/core/ModelerCoreRuntimeException.java

@@ -7,15 +7,18 @@
  */
 package org.teiid.designer.core;
 
-import org.teiid.core.TeiidRuntimeException;
 
 /**
  *
  * @since 8.0
  */
-public class ModelerCoreRuntimeException extends TeiidRuntimeException {
+public class ModelerCoreRuntimeException extends RuntimeException {
 
 	Throwable child = null;
+
+	/** An error code. */
+    private String code;
+
     /**
      */
     private static final long serialVersionUID = 1L;
@@ -42,7 +45,8 @@ public ModelerCoreRuntimeException(String message) {
      * @param message
      */
     public ModelerCoreRuntimeException(int code, String message) {
-        super(Integer.toString(code), message);
+        super(message);
+        setCode(Integer.toString(code));
     }
 
     /**
@@ -59,7 +63,7 @@ public ModelerCoreRuntimeException(Throwable e) {
      * @param message
      */
     public ModelerCoreRuntimeException(Throwable e, String message) {
-        super(e, message);
+        super(message, e);
     }
 
     /**
@@ -69,7 +73,7 @@ public ModelerCoreRuntimeException(Throwable e, String message) {
      * @param message
      */
     public ModelerCoreRuntimeException(Throwable e, int code, String message) {
-        super(Integer.toString(code), message);
+        this(code, message);
         child = e;
     }
 
@@ -80,5 +84,27 @@ public ModelerCoreRuntimeException(Throwable e, int code, String message) {
     public Throwable getChild() {
     	return this.child;
     }
+
+    /**
+     * Get the error code.
+     *
+     * @return The error code 
+     */
+    public String getCode() {
+        return this.code;
+    }
+
+    private void setCode( String code ) {
+        this.code = code;
+    }
+
+    @Override
+    public String getMessage() {
+        String message = super.getMessage();
+        if (code == null || code.length() == 0 || message.startsWith(code)) {
+            return message;
+        }
+        return code + " " + message; //$NON-NLS-1$
+    } 
 
 }

plugins/org.teiid.designer.jdbc.relational/src/org/teiid/designer/jdbc/relational/impl/UserCancelledException.java

@@ -7,15 +7,13 @@
  */
 package org.teiid.designer.jdbc.relational.impl;
 
-import org.teiid.core.BundleUtil;
-import org.teiid.core.TeiidRuntimeException;
 
 /**
  * UserCancelledException
  *
  * @since 8.0
  */
-public class UserCancelledException extends TeiidRuntimeException {
+public class UserCancelledException extends RuntimeException {
 
     /**
      */
@@ -38,15 +36,6 @@ public UserCancelledException(String message) {
         super(message);
     }
 
-    /**
-     * Construct an instance of UserCancelledException.
-     * @param code
-     * @param message
-     */
-    public UserCancelledException(int code, String message) {
-        super(Integer.toString(code), message);
-    }
-
     /**
      * Construct an instance of UserCancelledException.
      * @param e
@@ -55,23 +44,4 @@ public UserCancelledException(Throwable e) {
         super(e);
     }
 
-    /**
-     * Construct an instance of UserCancelledException.
-     * @param e
-     * @param message
-     */
-    public UserCancelledException(Throwable e, String message) {
-        super(e, message);
-    }
-
-    /**
-     * Construct an instance of UserCancelledException.
-     * @param e
-     * @param code
-     * @param message
-     */
-    public UserCancelledException(BundleUtil.Event code, Throwable e, String message) {
-        super(code, e, message);
-    }
-
 }

plugins/org.teiid.designer.metamodels.core/src/org/teiid/designer/metamodels/core/impl/ModelAnnotationImpl.java

@@ -26,6 +26,7 @@
 import org.eclipse.emf.ecore.util.EcoreEMap;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.teiid.core.TeiidRuntimeException;
+import org.teiid.designer.core.ModelerCoreRuntimeException;
 import org.teiid.designer.metamodels.core.CoreMetamodelPlugin;
 import org.teiid.designer.metamodels.core.CorePackage;
 import org.teiid.designer.metamodels.core.ModelAnnotation;
@@ -692,11 +693,10 @@ public String getNamespaceUri() {
      * Sets the namespace URI to the specified value. The {@link UriValidator} is used to validate the proposed value.
      * 
      * @param theNewNamespaceUri the proposed value
-     * @throws TeiidRuntimeException if the proposed value is not valid
      * @generated NOT
      */
     @Override
-	public void setNamespaceUri( String theNewNamespaceUri ) throws TeiidRuntimeException {
+	public void setNamespaceUri( String theNewNamespaceUri ) {
         try {
             IStatus status = UriValidator.validate(theNewNamespaceUri);
 
@@ -706,7 +706,7 @@ public void setNamespaceUri( String theNewNamespaceUri ) throws TeiidRuntimeExce
         } catch (RuntimeException theException) {
             String msg = CoreMetamodelPlugin.Util.getString("ModelAnnotationImpl.invalidNamespaceUriMsg", //$NON-NLS-1$
                                                             new Object[] {theNewNamespaceUri, theException.getLocalizedMessage()});
-            throw new TeiidRuntimeException(theException, msg);
+            throw new ModelerCoreRuntimeException(theException, msg);
         }
 
         setNamespaceUriGen(theNewNamespaceUri);

plugins/org.teiid.designer.transformation/src/org/teiid/designer/transformation/validation/TransformationValidator.java

@@ -69,7 +69,6 @@
 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.DynamicCommand;
 import org.teiid.query.sql.proc.CreateProcedureCommand;
 import org.teiid.query.sql.symbol.ElementSymbol;
 import org.teiid.query.sql.symbol.GroupSymbol;
@@ -442,9 +441,7 @@ public SqlTransformationResult resolveCommand( final Command command,
             QueryResolver.resolveCommand(command, gSymbol, getTeiidCommandType(transformType), metadata);
             // If unsuccessful, an exception is thrown
 
-            if (command instanceof CreateProcedureCommand
-                    && ((CreateProcedureCommand)command).getResultsCommand() instanceof DynamicCommand
-                    && !((DynamicCommand)((CreateProcedureCommand)command).getResultsCommand()).isAsClauseSet()) {
+            if (command instanceof CreateProcedureCommand) {
                 List<ElementSymbol> projectedSymbols = getProjectedSymbols();
                 ((CreateProcedureCommand)command).setProjectedSymbols(projectedSymbols);
             }

plugins/teiid_embedded_query/.classpath

@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="lib/teiid/teiid-admin-8.1.0.Final.jar" sourcepath="lib/teiid/teiid-8.1.0.Final-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/teiid/teiid-api-8.1.0.Final.jar" sourcepath="lib/teiid/teiid-8.1.0.Final-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/teiid/teiid-client-8.1.0.Final.jar" sourcepath="lib/teiid/teiid-8.1.0.Final-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/teiid/teiid-common-core-8.1.0.Final.jar" sourcepath="lib/teiid/teiid-8.1.0.Final-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/teiid/teiid-engine-8.1.0.Final.jar" sourcepath="lib/teiid/teiid-8.1.0.Final-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/teiid/jta-1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/common/commons-cli-1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/common/hamcrest-core-1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/common/jansi-1.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/common/jline-0.9.94.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/common/staxmapper-1.1.0.Final.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/common/xnio-api-3.0.3.GA.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/common/xnio-nio-3.0.3.GA.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jboss/jboss-as-build-config-7.1.1.Final.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/common/connector-api-1.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/common/jgroups-3.0.8.Final.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/common/json-simple-1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/common/jta-1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/common/nux-1.6.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/common/rhq-pluginAnnotations-3.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/common/xom-1.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jboss/jboss-as-cli-7.1.1.Final.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jboss/jboss-as-controller-client-7.1.1.Final.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jboss/jboss-as-protocol-7.1.1.Final.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jboss/jboss-dmr-1.1.1.Final.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jboss/jboss-logging-3.1.0.GA.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jboss/jboss-marshalling-1.3.11.GA.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jboss/jboss-marshalling-river-1.3.11.GA.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jboss/jboss-remoting-3.2.3.GA.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jboss/jboss-sasl-1.0.0.Final.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jboss/jboss-threads-2.0.0.GA.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/teiid/teiid-admin-8.2.0.Alpha2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/teiid/teiid-api-8.2.0.Alpha2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/teiid/teiid-client-8.2.0.Alpha2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/teiid/teiid-common-core-8.2.0.Alpha2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/teiid/teiid-engine-8.2.0.Alpha2.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>

plugins/teiid_embedded_query/META-INF/MANIFEST.MF

@@ -6,33 +6,34 @@ Bundle-Version: 8.0.0.qualifier
 Bundle-Vendor: %pluginProvider
 Bundle-ClassPath: .,
  System.vdb,
- lib/teiid/teiid-api-8.1.0.Final.jar,
- lib/teiid/teiid-admin-8.1.0.Final.jar,
- lib/teiid/teiid-client-8.1.0.Final.jar,
- lib/teiid/teiid-common-core-8.1.0.Final.jar,
- lib/teiid/teiid-engine-8.1.0.Final.jar,
- lib/jboss/jboss-as-build-config-7.1.1.Final.jar,
+ lib/common/connector-api-1.5.jar,
+ lib/common/jgroups-3.0.8.Final.jar,
+ lib/common/json-simple-1.1.jar,
+ lib/common/jta-1.1.jar,
+ lib/common/nux-1.6.jar,
+ lib/common/rhq-pluginAnnotations-3.0.4.jar,
+ lib/common/xnio-api-3.0.3.GA.jar,
+ lib/common/xnio-nio-3.0.3.GA.jar,
+ lib/common/xom-1.2.jar,
  lib/jboss/jboss-as-cli-7.1.1.Final.jar,
  lib/jboss/jboss-as-controller-client-7.1.1.Final.jar,
  lib/jboss/jboss-as-protocol-7.1.1.Final.jar,
  lib/jboss/jboss-dmr-1.1.1.Final.jar,
  lib/jboss/jboss-logging-3.1.0.GA.jar,
  lib/jboss/jboss-marshalling-1.3.11.GA.jar,
+ lib/jboss/jboss-marshalling-river-1.3.11.GA.jar,
  lib/jboss/jboss-remoting-3.2.3.GA.jar,
  lib/jboss/jboss-sasl-1.0.0.Final.jar,
  lib/jboss/jboss-threads-2.0.0.GA.jar,
- lib/common/commons-cli-1.2.jar,
- lib/common/hamcrest-core-1.1.jar,
- lib/common/jansi-1.2.1.jar,
- lib/common/jline-0.9.94.jar,
- lib/common/staxmapper-1.1.0.Final.jar,
- lib/common/xnio-api-3.0.3.GA.jar,
- lib/common/xnio-nio-3.0.3.GA.jar,
- lib/teiid/jta-1.1.jar
-Export-Package: javax.transaction,
- javax.transaction.xa,
- jline,
- org.teiid,
+ lib/teiid/teiid-admin-8.2.0.Alpha2.jar,
+ lib/teiid/teiid-api-8.2.0.Alpha2.jar,
+ lib/teiid/teiid-client-8.2.0.Alpha2.jar,
+ lib/teiid/teiid-common-core-8.2.0.Alpha2.jar,
+ lib/teiid/teiid-engine-8.2.0.Alpha2.jar
+Require-Bundle: org.jdom;bundle-version="[1.1.1,2.0.0)",
+ net.sf.saxon;bundle-version="[9.2.1,10.0.0)",
+ org.hamcrest.core;bundle-version="[1.1.0,2.0.0)"
+Export-Package: org.teiid,
  org.teiid.adminapi,
  org.teiid.adminapi.impl,
  org.teiid.api.exception.query,
@@ -112,6 +113,4 @@ Import-Package: javax.sql,
  javax.sql.rowset.serial,
  javax.sql.rowset.spi,
  javax.transaction.xa
-Require-Bundle: org.jdom;bundle-version="[1.1.1,2.0.0)",
- net.sf.saxon;bundle-version="[9.2.1,10.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

plugins/teiid_embedded_query/build.properties

@@ -11,29 +11,30 @@ bin.includes = .,\
                System.vdb,\
                LEGAL.txt,\
                lib/,\
-               lib/jboss/jboss-as-build-config-7.1.1.Final.jar,\
+               lib/common/connector-api-1.5.jar,\
+               lib/common/jgroups-3.0.8.Final.jar,\
+               lib/common/json-simple-1.1.jar,\
+               lib/common/jta-1.1.jar,\
+               lib/common/nux-1.6.jar,\
+               lib/common/rhq-pluginAnnotations-3.0.4.jar,\
+               lib/common/xnio-api-3.0.3.GA.jar,\
+               lib/common/xnio-nio-3.0.3.GA.jar,\
+               lib/common/xom-1.2.jar,\
                lib/jboss/jboss-as-cli-7.1.1.Final.jar,\
                lib/jboss/jboss-as-controller-client-7.1.1.Final.jar,\
                lib/jboss/jboss-as-protocol-7.1.1.Final.jar,\
                lib/jboss/jboss-dmr-1.1.1.Final.jar,\
                lib/jboss/jboss-logging-3.1.0.GA.jar,\
                lib/jboss/jboss-marshalling-1.3.11.GA.jar,\
+               lib/jboss/jboss-marshalling-river-1.3.11.GA.jar,\
                lib/jboss/jboss-remoting-3.2.3.GA.jar,\
                lib/jboss/jboss-sasl-1.0.0.Final.jar,\
                lib/jboss/jboss-threads-2.0.0.GA.jar,\
-               lib/common/commons-cli-1.2.jar,\
-               lib/common/hamcrest-core-1.1.jar,\
-               lib/common/jansi-1.2.1.jar,\
-               lib/common/jline-0.9.94.jar,\
-               lib/common/staxmapper-1.1.0.Final.jar,\
-               lib/common/xnio-api-3.0.3.GA.jar,\
-               lib/common/xnio-nio-3.0.3.GA.jar,\
-               lib/teiid/jta-1.1.jar,\
-               lib/teiid/teiid-admin-8.1.0.Final.jar,\
-               lib/teiid/teiid-api-8.1.0.Final.jar,\
-               lib/teiid/teiid-client-8.1.0.Final.jar,\
-               lib/teiid/teiid-common-core-8.1.0.Final.jar,\
-               lib/teiid/teiid-engine-8.1.0.Final.jar
+               lib/teiid/teiid-admin-8.2.0.Alpha2.jar,\
+               lib/teiid/teiid-api-8.2.0.Alpha2.jar,\
+               lib/teiid/teiid-client-8.2.0.Alpha2.jar,\
+               lib/teiid/teiid-common-core-8.2.0.Alpha2.jar,\
+               lib/teiid/teiid-engine-8.2.0.Alpha2.jar
 source.. = src/
 output.. = bin/
 source.System.vdb = src/