Projects information

Chunk

Conflicting content
import org.teiid.designer.relational.model.RelationalSchema; import org.teiid.designer.relational.model.RelationalTable; import org.teiid.designer.relational.model.RelationalUniqueConstraint; <<<<<<< HEAD import org.teiid.designer.type.IDataTypeManagerService; ======= import org.teiid.designer.relational.model.RelationalViewProcedure; >>>>>>> 45932362172b8a1a37d173ca797592d063129093 /** * Node importer for standard DDL

Conflicting content

import org.teiid.designer.relational.model.RelationalSchema;
import org.teiid.designer.relational.model.RelationalTable;
import org.teiid.designer.relational.model.RelationalUniqueConstraint;
<<<<<<< HEAD
import org.teiid.designer.type.IDataTypeManagerService;
=======
import org.teiid.designer.relational.model.RelationalViewProcedure;
>>>>>>> 45932362172b8a1a37d173ca797592d063129093

/**
 * Node importer for standard DDL

Solution content
import org.teiid.designer.relational.model.RelationalSchema; import org.teiid.designer.relational.model.RelationalTable; import org.teiid.designer.relational.model.RelationalUniqueConstraint; import org.teiid.designer.type.IDataTypeManagerService; /** * Node importer for standard DDL

Solution content

import org.teiid.designer.relational.model.RelationalSchema;
import org.teiid.designer.relational.model.RelationalTable;
import org.teiid.designer.relational.model.RelationalUniqueConstraint;
import org.teiid.designer.type.IDataTypeManagerService;

/**
 * Node importer for standard DDL

File
StandardImporter.java

Developer's decision
Version 1

Kind of conflict
Import

Chunk

Conflicting content
} protected void init(AstNode node, RelationalModel model) throws Exception { <<<<<<< HEAD String name = node.getName(); int ndx = name.lastIndexOf('.'); if (ndx >= 0) { schema = null; this.name = name; } else { schema = null; this.name = name; } ======= schema = null; this.name = node.getName(); >>>>>>> 45932362172b8a1a37d173ca797592d063129093 } protected String removeLeadingTrailingTicks(String name) {

Conflicting content

		}

		protected void init(AstNode node, RelationalModel model) throws Exception {
<<<<<<< HEAD
			String name = node.getName();
			int ndx = name.lastIndexOf('.');
			if (ndx >= 0) {
				schema = null;
				this.name = name;
			} else {
				schema = null;
				this.name = name;
			}
=======
			schema = null;
			this.name = node.getName();
>>>>>>> 45932362172b8a1a37d173ca797592d063129093
		}

		protected String removeLeadingTrailingTicks(String name) {

Solution content
} protected void init(AstNode node, RelationalModel model) throws Exception { schema = null; this.name = node.getName(); } protected String removeLeadingTrailingTicks(String name) {

File
StandardImporter.java

Developer's decision
Version 2

Kind of conflict
Attribute
If statement
Method invocation
Variable

Chunk

Conflicting content
import org.teiid.designer.relational.model.RelationalSchema; import org.teiid.designer.relational.model.RelationalTable; import org.teiid.designer.relational.model.RelationalUniqueConstraint; <<<<<<< HEAD ======= import org.teiid.designer.relational.model.RelationalViewProcedure; >>>>>>> 45932362172b8a1a37d173ca797592d063129093 import org.teiid.designer.relational.model.RelationalViewTable;

Conflicting content

import org.teiid.designer.relational.model.RelationalSchema;
import org.teiid.designer.relational.model.RelationalTable;
import org.teiid.designer.relational.model.RelationalUniqueConstraint;
<<<<<<< HEAD
=======
import org.teiid.designer.relational.model.RelationalViewProcedure;
>>>>>>> 45932362172b8a1a37d173ca797592d063129093
import org.teiid.designer.relational.model.RelationalViewTable;

Solution content
import org.teiid.designer.relational.model.RelationalSchema; import org.teiid.designer.relational.model.RelationalTable; import org.teiid.designer.relational.model.RelationalUniqueConstraint; import org.teiid.designer.relational.model.RelationalViewProcedure; import org.teiid.designer.relational.model.RelationalViewTable;

Solution content

import org.teiid.designer.relational.model.RelationalSchema;
import org.teiid.designer.relational.model.RelationalTable;
import org.teiid.designer.relational.model.RelationalUniqueConstraint;
import org.teiid.designer.relational.model.RelationalViewProcedure;
import org.teiid.designer.relational.model.RelationalViewTable;

File
TeiidDdlImporter.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content
// Deploy the VDB deployed = DeployVdbAction.deployVdb(teiidServer, selectedVdbFile); <<<<<<< HEAD String vdbName = selectedVdb.getFullPath().removeFileExtension().lastSegment(); if( vdbName.indexOf('.') > -1 ) { vdbName = new Path(vdbName).removeFileExtension().toString(); } ======= String vdbName = FileUtils.getNameWithoutExtension(selectedVdbFile); >>>>>>> 45932362172b8a1a37d173ca797592d063129093 if (teiidServer.isVdbActive(vdbName)) { if( deployed ) { executeVdb(DqpPlugin.getInstance().getServerManager().getDefaultServer(), vdbName);

Conflicting content

					// Deploy the VDB
                    deployed = DeployVdbAction.deployVdb(teiidServer, selectedVdbFile);
                    
<<<<<<< HEAD
				    String vdbName = selectedVdb.getFullPath().removeFileExtension().lastSegment();
					if( vdbName.indexOf('.') > -1 ) {
						vdbName = new Path(vdbName).removeFileExtension().toString();
						}
=======
				    String vdbName = FileUtils.getNameWithoutExtension(selectedVdbFile);
>>>>>>> 45932362172b8a1a37d173ca797592d063129093
                    if (teiidServer.isVdbActive(vdbName)) {
                    	if( deployed ) {
                    		executeVdb(DqpPlugin.getInstance().getServerManager().getDefaultServer(), vdbName);

Solution content
// Deploy the VDB deployed = DeployVdbAction.deployVdb(teiidServer, selectedVdbFile); String vdbName = FileUtils.getNameWithoutExtension(selectedVdbFile); if (teiidServer.isVdbActive(vdbName)) { if( deployed ) { executeVdb(DqpPlugin.getInstance().getServerManager().getDefaultServer(), vdbName);

Solution content

					// Deploy the VDB
                    deployed = DeployVdbAction.deployVdb(teiidServer, selectedVdbFile);
                    
				    String vdbName = FileUtils.getNameWithoutExtension(selectedVdbFile);
                    if (teiidServer.isVdbActive(vdbName)) {
                    	if( deployed ) {
                    		executeVdb(DqpPlugin.getInstance().getServerManager().getDefaultServer(), vdbName);

File
ExecuteVdbWorker.java

Developer's decision
Version 2

Kind of conflict
If statement
Method invocation
Variable

Chunk

Conflicting content
if (this.status == null) { monitor.subTask(UTIL.getString(PREFIX + "deployVdbTask", getVdbName())); //$NON-NLS-1$ <<<<<<< HEAD // VDB name can contain an integer value // VDB can also have a version in it's manifest (vdb.xml) // // EXAMPLE: Customers.2.vdb // int version = vdb.getVersion(); // Manifest version int versionInName = getVdbVersion(getVdbName()); // version in name if( versionInName > 0 ) { // If version in name, then use it (i.e. ignore manifest version) version = versionInName; } teiidServer.deployVdb(vdb.getFile(), version); //teiidServer.deployVdb(vdb.getFile()); // VDB name may have a version in it, so need to strip off any extension String actualName = new Path(getVdbName()).removeFileExtension().toString(); this.status = (teiidServer.hasVdb(actualName) ? DeployStatus.DEPLOYED_VDB : DeployStatus.DEPLOY_VDB_FAILED); } ======= teiidServer.deployVdb(vdb.getSourceFile()); this.status = (teiidServer.hasVdb(getVdbName()) ? DeployStatus.DEPLOYED_VDB : DeployStatus.DEPLOY_VDB_FAILED); } >>>>>>> 45932362172b8a1a37d173ca797592d063129093 } catch (Exception e) { this.status = DeployStatus.EXCEPTION; this.error = e;

Conflicting content

            if (this.status == null) {
                monitor.subTask(UTIL.getString(PREFIX + "deployVdbTask", getVdbName())); //$NON-NLS-1$
<<<<<<< HEAD

             // VDB name can contain an integer value
             // VDB can also have a version in it's manifest (vdb.xml)
             //
             // EXAMPLE: Customers.2.vdb
             //
             int version = vdb.getVersion(); // Manifest version
             int versionInName = getVdbVersion(getVdbName()); // version in name
             if( versionInName > 0 ) { // If version in name, then use it (i.e. ignore manifest version)
             version = versionInName;
             }
             teiidServer.deployVdb(vdb.getFile(), version);
             //teiidServer.deployVdb(vdb.getFile());
             // VDB name may have a version in it, so need to strip off any extension
             String actualName = new Path(getVdbName()).removeFileExtension().toString();
             this.status = (teiidServer.hasVdb(actualName) ? DeployStatus.DEPLOYED_VDB : DeployStatus.DEPLOY_VDB_FAILED);            }
=======
                teiidServer.deployVdb(vdb.getSourceFile());
                this.status = (teiidServer.hasVdb(getVdbName()) ? DeployStatus.DEPLOYED_VDB : DeployStatus.DEPLOY_VDB_FAILED);
            }
>>>>>>> 45932362172b8a1a37d173ca797592d063129093
        } catch (Exception e) {
            this.status = DeployStatus.EXCEPTION;
            this.error = e;

Solution content
if (this.status == null) { monitor.subTask(UTIL.getString(PREFIX + "deployVdbTask", getVdbName())); //$NON-NLS-1$ // VDB name can contain an integer value // VDB can also have a version in it's manifest (vdb.xml) // // EXAMPLE: Customers.2.vdb // int version = vdb.getVersion(); // Manifest version int versionInName = getVdbVersion(getVdbName()); // version in name if (versionInName > 0) { // If version in name, then use it (i.e. ignore manifest version) version = versionInName; } teiidServer.deployVdb(vdb.getSourceFile(), version); // VDB name may have a version in it, so need to strip off any extension this.status = (teiidServer.hasVdb(getVdbName()) ? DeployStatus.DEPLOYED_VDB : DeployStatus.DEPLOY_VDB_FAILED); } } catch (Exception e) { this.status = DeployStatus.EXCEPTION; this.error = e;

Solution content

            if (this.status == null) {
                monitor.subTask(UTIL.getString(PREFIX + "deployVdbTask", getVdbName())); //$NON-NLS-1$

             // VDB name can contain an integer value
             // VDB can also have a version in it's manifest (vdb.xml)
             //
             // EXAMPLE: Customers.2.vdb
             //
                int version = vdb.getVersion(); // Manifest version
                int versionInName = getVdbVersion(getVdbName()); // version in name
                if (versionInName > 0) { // If version in name, then use it (i.e. ignore manifest version)
                    version = versionInName;
                }

                teiidServer.deployVdb(vdb.getSourceFile(), version);
                // VDB name may have a version in it, so need to strip off any extension
                this.status = (teiidServer.hasVdb(getVdbName()) ? DeployStatus.DEPLOYED_VDB : DeployStatus.DEPLOY_VDB_FAILED);
            }
        } catch (Exception e) {
            this.status = DeployStatus.EXCEPTION;
            this.error = e;

File
VdbDeployer.java

Developer's decision
Manual

Kind of conflict
Attribute
Comment
If statement
Method invocation
Variable

Chunk

Conflicting content
return null; } <<<<<<< HEAD private int getVdbVersion(String originalVdbName) throws Exception { String vdbName = originalVdbName; String vdbVersionStr = null; int firstIndex = vdbName.indexOf('.'); int lastIndex = vdbName.lastIndexOf('.'); if (firstIndex != -1) { if (firstIndex != lastIndex) { // TODO: throw new Exception(UTIL.getString(PREFIX + "vdbNameContainsTooManyDotsErrorMessage", originalVdbName)); //$NON-NLS-1$"VBD Version contains more than one '.'"); //Messages.getString(Messages.ExecutionAdmin.invalidVdbName, originalVdbName)); } vdbVersionStr = vdbName.substring(firstIndex+1); return Integer.parseInt(vdbVersionStr); } return -1; } ======= >>>>>>> 45932362172b8a1a37d173ca797592d063129093 /* * Check the server sources to see if a datasource with the provided JNDI name exists. * @param jndiName the jndi name to check

Conflicting content

        return null;
    }
    
<<<<<<< HEAD
    private int getVdbVersion(String originalVdbName) throws Exception {
    	String vdbName = originalVdbName;
    	String vdbVersionStr = null;
    	int firstIndex = vdbName.indexOf('.');
    	int lastIndex = vdbName.lastIndexOf('.');
    	if (firstIndex != -1) {
    	if (firstIndex != lastIndex) {
    	// TODO:
    	throw new Exception(UTIL.getString(PREFIX + "vdbNameContainsTooManyDotsErrorMessage", originalVdbName)); //$NON-NLS-1$"VBD Version contains more than one '.'"); //Messages.getString(Messages.ExecutionAdmin.invalidVdbName, originalVdbName));
    	}
    	vdbVersionStr = vdbName.substring(firstIndex+1);
    	return Integer.parseInt(vdbVersionStr);
    	}
    	return -1;
    	}
    
=======
>>>>>>> 45932362172b8a1a37d173ca797592d063129093
    /*
     * Check the server sources to see if a datasource with the provided JNDI name exists.
     * @param jndiName the jndi name to check

Solution content
return null; } private int getVdbVersion(String originalVdbName) throws Exception { String vdbName = originalVdbName; String vdbVersionStr = null; int firstIndex = vdbName.indexOf('.'); int lastIndex = vdbName.lastIndexOf('.'); if (firstIndex != -1) { if (firstIndex != lastIndex) { // TODO: throw new Exception(UTIL.getString(PREFIX + "vdbNameContainsTooManyDotsErrorMessage", originalVdbName)); //$NON-NLS-1$"VBD Version contains more than one '.'"); //Messages.getString(Messages.ExecutionAdmin.invalidVdbName, originalVdbName)); } vdbVersionStr = vdbName.substring(firstIndex+1); return Integer.parseInt(vdbVersionStr); } return -1; } /* * Check the server sources to see if a datasource with the provided JNDI name exists. * @param jndiName the jndi name to check

Solution content

        return null;
    }
    
    private int getVdbVersion(String originalVdbName) throws Exception {
    	String vdbName = originalVdbName;
    	String vdbVersionStr = null;
    	int firstIndex = vdbName.indexOf('.');
    	int lastIndex = vdbName.lastIndexOf('.');
    	if (firstIndex != -1) {
    	if (firstIndex != lastIndex) {
    	// TODO:
    	throw new Exception(UTIL.getString(PREFIX + "vdbNameContainsTooManyDotsErrorMessage", originalVdbName)); //$NON-NLS-1$"VBD Version contains more than one '.'"); //Messages.getString(Messages.ExecutionAdmin.invalidVdbName, originalVdbName));
    	}
    	vdbVersionStr = vdbName.substring(firstIndex+1);
    	return Integer.parseInt(vdbVersionStr);
    	}
    	return -1;
    	}
    
    /*
     * Check the server sources to see if a datasource with the provided JNDI name exists.
     * @param jndiName the jndi name to check

File
VdbDeployer.java

Developer's decision
Version 1

Kind of conflict
Method declaration

Chunk

Conflicting content
} } <<<<<<< HEAD int version = ((ITeiidVdb)value).getVersion(); builder.append("\nVersion:").append(version); //$NON-NLS-1$ ======= >>>>>>> 45932362172b8a1a37d173ca797592d063129093 builder.append("\nModels:"); //$NON-NLS-1$ for (String modelName : vdb.getModelNames()) { builder.append("\n\t ").append(modelName); //$NON-NLS-1$

Conflicting content

                }
            }

<<<<<<< HEAD
            int version = ((ITeiidVdb)value).getVersion();
            builder.append("\nVersion:").append(version); //$NON-NLS-1$
=======
>>>>>>> 45932362172b8a1a37d173ca797592d063129093
            builder.append("\nModels:"); //$NON-NLS-1$
            for (String modelName : vdb.getModelNames()) {
                builder.append("\n\t   ").append(modelName); //$NON-NLS-1$

Solution content
} } int version = ((ITeiidVdb)value).getVersion(); builder.append("\nVersion:").append(version); //$NON-NLS-1$ builder.append("\nModels:"); //$NON-NLS-1$ for (String modelName : vdb.getModelNames()) { builder.append("\n\t ").append(modelName); //$NON-NLS-1$

Solution content

                }
            }

            int version = ((ITeiidVdb)value).getVersion();
            builder.append("\nVersion:").append(version); //$NON-NLS-1$
            builder.append("\nModels:"); //$NON-NLS-1$
            for (String modelName : vdb.getModelNames()) {
                builder.append("\n\t   ").append(modelName); //$NON-NLS-1$

File
TeiidDataNode.java

Developer's decision
Version 1

Kind of conflict
Comment
Method invocation
Variable

Chunk

Conflicting content
String methods = generateMethods(resource); AntTasks.replace(resourceJavaFile, "${httpMethods}", methods); //$NON-NLS-1$ <<<<<<< HEAD AntTasks.replace(indexHtml, "${title}", vdbName); //$NON-NLS-1$ AntTasks.replace(indexHtml, "${context}", context); //$NON-NLS-1$ AntTasks.replace(indexHtml, "${modelName}", resource); //$NON-NLS-1$ ======= >>>>>>> 45932362172b8a1a37d173ca797592d063129093 singletonSb.append(NEWLINE + "singletons.add(new org.teiid.rest.services." + resource + "());"); //$NON-NLS-1$ //$NON-NLS-2$

Conflicting content

            String methods = generateMethods(resource);
            AntTasks.replace(resourceJavaFile, "${httpMethods}", methods); //$NON-NLS-1$
<<<<<<< HEAD
            AntTasks.replace(indexHtml, "${title}", vdbName); //$NON-NLS-1$
            AntTasks.replace(indexHtml, "${context}", context); //$NON-NLS-1$
            AntTasks.replace(indexHtml, "${modelName}", resource); //$NON-NLS-1$
=======
>>>>>>> 45932362172b8a1a37d173ca797592d063129093

            singletonSb.append(NEWLINE + "singletons.add(new org.teiid.rest.services." + resource + "());"); //$NON-NLS-1$ //$NON-NLS-2$

Solution content
String methods = generateMethods(resource); AntTasks.replace(resourceJavaFile, "${httpMethods}", methods); //$NON-NLS-1$ AntTasks.replace(indexHtml, "${title}", vdbName); //$NON-NLS-1$ AntTasks.replace(indexHtml, "${context}", context); //$NON-NLS-1$ AntTasks.replace(indexHtml, "${modelName}", resource); //$NON-NLS-1$ singletonSb.append(NEWLINE + "singletons.add(new org.teiid.rest.services." + resource + "());"); //$NON-NLS-1$ //$NON-NLS-2$

Solution content

            String methods = generateMethods(resource);
            AntTasks.replace(resourceJavaFile, "${httpMethods}", methods); //$NON-NLS-1$
            AntTasks.replace(indexHtml, "${title}", vdbName); //$NON-NLS-1$
            AntTasks.replace(indexHtml, "${context}", context); //$NON-NLS-1$
            AntTasks.replace(indexHtml, "${modelName}", resource); //$NON-NLS-1$

            singletonSb.append(NEWLINE + "singletons.add(new org.teiid.rest.services." + resource + "());"); //$NON-NLS-1$ //$NON-NLS-2$

File
RestWebArchiveBuilderImpl.java

Developer's decision
Version 1

Kind of conflict
Comment
Method invocation

Chunk

Conflicting content
String pathToJar1 = webInfLibDirectory.getCanonicalPath() + File.separator + JACKSON_CORE_JAR; String pathToJar2 = webInfLibDirectory.getCanonicalPath() + File.separator + JACKSON_JAXRS_JAR; <<<<<<< HEAD String pathToJar3 = webInfLibDirectory.getCanonicalPath() + File.separator + JSON_JAR; String pathToJar4 = webInfLibDirectory.getCanonicalPath() + File.separator + JAXRS_API_JAR; String pathToJar5 = webInfLibDirectory.getCanonicalPath() + File.separator + SWAGGER_ANNOTATIONS_JAR; String pathToJar6 = webInfLibDirectory.getCanonicalPath() + File.separator + SWAGGER_CORE_JAR; String pathToJar7 = webInfLibDirectory.getCanonicalPath() + File.separator + SWAGGER_JAXRS_JAR; String pathToJar8 = webInfLibDirectory.getCanonicalPath() + File.separator + SERVLET_API; String pathToJar9 = webInfLibDirectory.getCanonicalPath() + File.separator + REFLECTIONS; String pathToJar10 = webInfLibDirectory.getCanonicalPath() + File.separator + SCALA_LIBRARY; String pathToJar11 = webInfLibDirectory.getCanonicalPath() + File.separator + JACKSON_CORE_JAR; String pathToJar12 = webInfLibDirectory.getCanonicalPath() + File.separator + JACKSON_DATABIND_JAR; ======= String pathToJar3 = webInfLibDirectory.getCanonicalPath() + File.separator + JACKSON_MAPPER_ASL_JAR; String pathToJar4 = webInfLibDirectory.getCanonicalPath() + File.separator + JSON_JAR; String pathToJar5 = webInfLibDirectory.getCanonicalPath() + File.separator + JAXRS_API_JAR; String pathToJar6 = webInfLibDirectory.getCanonicalPath() + File.separator + SAXONHE_JAR; >>>>>>> 45932362172b8a1a37d173ca797592d063129093 FileUtils.copy(spiFile, webInfLibDirectory, true); FileUtils.copy(runtimeFile, webInfLibDirectory, true);

Conflicting content

            String pathToJar1 = webInfLibDirectory.getCanonicalPath() + File.separator + JACKSON_CORE_JAR;
            String pathToJar2 = webInfLibDirectory.getCanonicalPath() + File.separator + JACKSON_JAXRS_JAR;
<<<<<<< HEAD
            String pathToJar3 = webInfLibDirectory.getCanonicalPath() + File.separator + JSON_JAR;
            String pathToJar4 = webInfLibDirectory.getCanonicalPath() + File.separator + JAXRS_API_JAR;
            String pathToJar5 = webInfLibDirectory.getCanonicalPath() + File.separator + SWAGGER_ANNOTATIONS_JAR;
            String pathToJar6 = webInfLibDirectory.getCanonicalPath() + File.separator + SWAGGER_CORE_JAR;
            String pathToJar7 = webInfLibDirectory.getCanonicalPath() + File.separator + SWAGGER_JAXRS_JAR;
            String pathToJar8 = webInfLibDirectory.getCanonicalPath() + File.separator + SERVLET_API;
            String pathToJar9 = webInfLibDirectory.getCanonicalPath() + File.separator + REFLECTIONS;
            String pathToJar10 = webInfLibDirectory.getCanonicalPath() + File.separator + SCALA_LIBRARY;
            String pathToJar11 = webInfLibDirectory.getCanonicalPath() + File.separator + JACKSON_CORE_JAR;
            String pathToJar12 = webInfLibDirectory.getCanonicalPath() + File.separator + JACKSON_DATABIND_JAR;
=======
            String pathToJar3 = webInfLibDirectory.getCanonicalPath() + File.separator + JACKSON_MAPPER_ASL_JAR;
            String pathToJar4 = webInfLibDirectory.getCanonicalPath() + File.separator + JSON_JAR;
            String pathToJar5 = webInfLibDirectory.getCanonicalPath() + File.separator + JAXRS_API_JAR;
            String pathToJar6 = webInfLibDirectory.getCanonicalPath() + File.separator + SAXONHE_JAR;
>>>>>>> 45932362172b8a1a37d173ca797592d063129093
            
            FileUtils.copy(spiFile, webInfLibDirectory, true);
            FileUtils.copy(runtimeFile, webInfLibDirectory, true);

Solution content

            String pathToJar1 = webInfLibDirectory.getCanonicalPath() + File.separator + JACKSON_CORE_JAR;
            String pathToJar2 = webInfLibDirectory.getCanonicalPath() + File.separator + JACKSON_JAXRS_JAR;
            String pathToJar3 = webInfLibDirectory.getCanonicalPath() + File.separator + JSON_JAR;
            String pathToJar4 = webInfLibDirectory.getCanonicalPath() + File.separator + JAXRS_API_JAR;
            String pathToJar5 = webInfLibDirectory.getCanonicalPath() + File.separator + SWAGGER_ANNOTATIONS_JAR;
            String pathToJar6 = webInfLibDirectory.getCanonicalPath() + File.separator + SWAGGER_CORE_JAR;
            String pathToJar7 = webInfLibDirectory.getCanonicalPath() + File.separator + SWAGGER_JAXRS_JAR;
            String pathToJar8 = webInfLibDirectory.getCanonicalPath() + File.separator + SERVLET_API;
            String pathToJar9 = webInfLibDirectory.getCanonicalPath() + File.separator + REFLECTIONS;
            String pathToJar10 = webInfLibDirectory.getCanonicalPath() + File.separator + SCALA_LIBRARY;
            String pathToJar11 = webInfLibDirectory.getCanonicalPath() + File.separator + JACKSON_CORE_JAR;
            String pathToJar12 = webInfLibDirectory.getCanonicalPath() + File.separator + JACKSON_DATABIND_JAR;
            
            FileUtils.copy(spiFile, webInfLibDirectory, true);
            FileUtils.copy(runtimeFile, webInfLibDirectory, true);

File
RestWebArchiveBuilderImpl.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

            classPaths.add(new File(pathToJar3));
            classPaths.add(new File(pathToJar4));
            classPaths.add(new File(pathToJar5));
<<<<<<< HEAD
            classPaths.add(new File(pathToJar6));
            classPaths.add(new File(pathToJar7));
            classPaths.add(new File(pathToJar8));
            classPaths.add(new File(pathToJar9));
            classPaths.add(new File(pathToJar10));
            classPaths.add(new File(pathToJar11));
            classPaths.add(new File(pathToJar12));
=======
>>>>>>> 45932362172b8a1a37d173ca797592d063129093

            classPaths.add(runtimeFile);
            classPaths.add(spiFile);

Solution content

            classPaths.add(new File(pathToJar3));
            classPaths.add(new File(pathToJar4));
            classPaths.add(new File(pathToJar5));
            classPaths.add(new File(pathToJar6));
            classPaths.add(new File(pathToJar7));
            classPaths.add(new File(pathToJar8));
            classPaths.add(new File(pathToJar9));
            classPaths.add(new File(pathToJar10));
            classPaths.add(new File(pathToJar11));
            classPaths.add(new File(pathToJar12));

            classPaths.add(runtimeFile);
            classPaths.add(spiFile);

File
RestWebArchiveBuilderImpl.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content

import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchWizard;
<<<<<<< HEAD
import org.teiid.core.designer.util.I18nUtil;
=======
>>>>>>> 45932362172b8a1a37d173ca797592d063129093
import org.teiid.core.designer.util.StringConstants;
import org.teiid.core.designer.util.StringUtilities;
import org.teiid.designer.core.ModelerCore;

Solution content

import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchWizard;
import org.teiid.core.designer.util.I18nUtil;
import org.teiid.core.designer.util.StringConstants;
import org.teiid.core.designer.util.StringUtilities;
import org.teiid.designer.core.ModelerCore;

File
DataRoleWizard.java

Developer's decision
Version 1

Kind of conflict
Import

Chunk

Conflicting content

        ITeiidServerVersion myMinVersion = getMinimumVersion();
        ITeiidServerVersion otherMaxVersion = otherVersion.getMaximumVersion();

<<<<<<< HEAD
        int majCompResult;
        try {
            int myMax = Integer.parseInt(myMaxVersion.getMajor());
            int otherMin = Integer.parseInt(otherMinVersion.getMajor());
            majCompResult = Integer.valueOf(myMax).compareTo(Integer.valueOf(otherMin));

        } catch (NumberFormatException ex) {
            // One or other is a string so compare lexographically
            majCompResult = myMaxVersion.getMajor().compareTo(otherMinVersion.getMajor());
        }

        if (majCompResult > 0)
            return true;

        int minCompResult;
        try {
            int myMax = Integer.parseInt(myMaxVersion.getMinor());
            int otherMin = Integer.parseInt(otherMinVersion.getMinor());
            minCompResult = Integer.valueOf(myMax).compareTo(Integer.valueOf(otherMin));

        } catch (NumberFormatException ex) {
            // One or other is a string so compare lexographically
            minCompResult = myMaxVersion.getMinor().compareTo(otherMinVersion.getMinor());
        }

        if (majCompResult == 0 && minCompResult > 0)
            return true;

        int micCompResult;
        try {
            int myMax = Integer.parseInt(myMaxVersion.getMicro());
            int otherMin = Integer.parseInt(otherMinVersion.getMicro());
            micCompResult = Integer.valueOf(myMax).compareTo(Integer.valueOf(otherMin));

        } catch (NumberFormatException ex) {
            // One or other is a string so compare lexographically
            micCompResult = myMaxVersion.getMicro().compareTo(otherMinVersion.getMicro());
        }

=======
        int majCompResult = isOtherNumberGreaterThan(myMinVersion.getMajor(), otherMaxVersion.getMajor());
        if (majCompResult > 0)
            return true;
        
        int minCompResult = isOtherNumberGreaterThan(myMinVersion.getMinor(), otherMaxVersion.getMinor());
        if (majCompResult == 0 && minCompResult > 0)
            return true;

        int micCompResult = isOtherNumberGreaterThan(myMinVersion.getMicro(), otherMaxVersion.getMicro());
>>>>>>> 45932362172b8a1a37d173ca797592d063129093
        if (majCompResult == 0 && minCompResult == 0 && micCompResult > 0)
            return true;

Solution content

        ITeiidServerVersion myMinVersion = getMinimumVersion();
        ITeiidServerVersion otherMaxVersion = otherVersion.getMaximumVersion();

        int majCompResult = isOtherNumberGreaterThan(myMinVersion.getMajor(), otherMaxVersion.getMajor());
        if (majCompResult > 0)
            return true;
        
        int minCompResult = isOtherNumberGreaterThan(myMinVersion.getMinor(), otherMaxVersion.getMinor());
        if (majCompResult == 0 && minCompResult > 0)
            return true;

        int micCompResult = isOtherNumberGreaterThan(myMinVersion.getMicro(), otherMaxVersion.getMicro());
        if (majCompResult == 0 && minCompResult == 0 && micCompResult > 0)
            return true;

File
TeiidServerVersion.java

Developer's decision
Version 2

Kind of conflict
If statement
Method invocation
Try statement
Variable

Chunk

Conflicting content

            		if( desc != null && desc.length() > 0 ) {
            			newVdb.setDescription(desc);
            		}
<<<<<<< HEAD
            		
            		// Now parse the name to see if it contains a version
                    String fullVdbName = newVdb.getName().removeFileExtension().lastSegment();
    				int firstIndex = fullVdbName.indexOf('.');
                    String versionStr = fullVdbName.substring(firstIndex + 1);
					int version = 1;
					try {
						version = Integer.parseInt(versionStr);
					} catch (NumberFormatException e) {
						// Do nothing.. shouldn't get here and swallow anyway cause version == 1 is back-up
					}
					newVdb.setVersion(version);;
            		
                    newVdb.save(monitor);
=======
                    newVdb.save();
>>>>>>> 45932362172b8a1a37d173ca797592d063129093
                    NewVdbWizard.this.folder.refreshLocal(IResource.DEPTH_INFINITE, monitor);

Solution content

            		if( desc != null && desc.length() > 0 ) {
            			newVdb.setDescription(desc);
            		}
	
            		// Now parse the name to see if it contains a version
                    String fullVdbName = newVdb.getName();
    				int firstIndex = fullVdbName.indexOf('.');
                    String versionStr = fullVdbName.substring(firstIndex + 1);
					int version = 1;
					try {
						version = Integer.parseInt(versionStr);
					} catch (NumberFormatException e) {
						// Do nothing.. shouldn't get here and swallow anyway cause version == 1 is back-up
					}
					newVdb.setVersion(version);;
            		
                    newVdb.save();
                    NewVdbWizard.this.folder.refreshLocal(IResource.DEPTH_INFINITE, monitor);

File
NewVdbWizard.java

Developer's decision
Manual

Kind of conflict
Comment
Method invocation
Try statement
Variable

Chunk

Conflicting content

            } else if (ModelUtilities.vdbNameReservedValidation(proposedName) != null) {
                this.mainPage.setErrorMessage(ModelUtilities.vdbNameReservedValidation(proposedName));
                this.mainPage.setPageComplete(false);
<<<<<<< HEAD
			} else if (proposedName.indexOf('.') > -1) {
				// VDB name can contain an integer value
				// EXAMPLE: Customers.2.vdb
				//
				// make sure there is only 1 '.'
				int firstIndex = proposedName.indexOf('.');
				int lastIndex = proposedName.lastIndexOf('.');
				if (lastIndex != -1 && firstIndex != lastIndex) {
					String error = VdbUiPlugin.Util.getString(I18N_PREFIX + "vdbNameContainsTooManyDotsErrorMessage", proposedName); //$NON-NLS-1$)
					this.mainPage.setErrorMessage(error);
					this.mainPage.setPageComplete(false);
				} else {
					// Check for integer
					String versionStr = proposedName.substring(firstIndex + 1);
					boolean succeeded = false;
					try {
						Integer.parseInt(versionStr);
						succeeded = true;
					} catch (NumberFormatException e) {
						this.mainPage.setErrorMessage(
								VdbUiConstants.Util.getString(I18N_PREFIX
														+ "vdbNameErrorVersionNotAnInteger", versionStr)); //$NON-NLS-1$);
						this.mainPage.setPageComplete(false);
						succeeded = false;
					}
					if (succeeded) {
						this.mainPage.setErrorMessage(null);
						this.mainPage.setPageComplete(true);
					}
				}
			} else {
=======
            } else {
>>>>>>> 45932362172b8a1a37d173ca797592d063129093
                this.mainPage.setErrorMessage(null);
                this.mainPage.setPageComplete(true);
            }

Solution content

            } else if (ModelUtilities.vdbNameReservedValidation(proposedName) != null) {
                this.mainPage.setErrorMessage(ModelUtilities.vdbNameReservedValidation(proposedName));
                this.mainPage.setPageComplete(false);
			} else if (proposedName.indexOf('.') > -1) {
				// VDB name can contain an integer value
				// EXAMPLE: Customers.2.vdb
				//
				// make sure there is only 1 '.'
				int firstIndex = proposedName.indexOf('.');
				int lastIndex = proposedName.lastIndexOf('.');
				if (lastIndex != -1 && firstIndex != lastIndex) {
					String error = VdbUiConstants.Util.getString(I18N_PREFIX + "vdbNameContainsTooManyDotsErrorMessage", proposedName); //$NON-NLS-1$)
					this.mainPage.setErrorMessage(error);
					this.mainPage.setPageComplete(false);
				} else {
					// Check for integer
					String versionStr = proposedName.substring(firstIndex + 1);
					boolean succeeded = false;
					try {
						Integer.parseInt(versionStr);
						succeeded = true;
					} catch (NumberFormatException e) {
						this.mainPage.setErrorMessage(
								VdbUiConstants.Util.getString(I18N_PREFIX
														+ "vdbNameErrorVersionNotAnInteger", versionStr)); //$NON-NLS-1$);
						this.mainPage.setPageComplete(false);
						succeeded = false;
					}
					if (succeeded) {
						this.mainPage.setErrorMessage(null);
						this.mainPage.setPageComplete(true);
					}
				}
            } else {
                this.mainPage.setErrorMessage(null);
                this.mainPage.setPageComplete(true);
            }

File
NewVdbWizard.java

Developer's decision
Manual

Kind of conflict
Comment
If statement
Method invocation
Variable

Chunk

Conflicting content

	 */
	@Override
	public String toString() {
<<<<<<< HEAD:plugins/org.teiid.designer.roles/src/org/teiid/designer/roles/Permission.java
		StringBuilder sb = new StringBuilder("Permission: ").append(this.targetName); //$NON-NLS-1$
		String value = NULL;
		if( this.crud.c != null ) {
			value = Boolean.toString(this.crud.c.booleanValue());
		}
		sb.append("\n\t").append("c = " + value); //$NON-NLS-1$ //$NON-NLS-2$
		value = NULL;
		if( this.crud.r != null ) {
			value = Boolean.toString(this.crud.r.booleanValue());
		}
		sb.append("\n\t").append("r = " + value); //$NON-NLS-1$ //$NON-NLS-2$
		value = NULL;
		if( this.crud.u != null ) {
			value = Boolean.toString(this.crud.u.booleanValue());
		}
		sb.append("\n\t").append("u = " + value); //$NON-NLS-1$ //$NON-NLS-2$
		value = NULL;
		if( this.crud.d != null ) {
			value = Boolean.toString(this.crud.d.booleanValue());
		}
		sb.append("\n\t").append("d = " + value); //$NON-NLS-1$ //$NON-NLS-2$
		value = NULL;
		if( this.crud.e != null ) {
			value = Boolean.toString(this.crud.e.booleanValue());
		}
		sb.append("\n\t").append("e = " + value); //$NON-NLS-1$ //$NON-NLS-2$
		value = NULL;
		if( this.crud.a != null ) {
			value = Boolean.toString(this.crud.a.booleanValue());
		}
		sb.append("\n\t").append("a = " + value); //$NON-NLS-1$ //$NON-NLS-2$

=======
		StringBuilder sb = new StringBuilder("Permission: ").append(getName()); //$NON-NLS-1$
		sb.append("\n\t").append("c = " + this.crud.c.booleanValue()); //$NON-NLS-1$ //$NON-NLS-2$
		sb.append("\n\t").append("r = " + this.crud.r.booleanValue()); //$NON-NLS-1$ //$NON-NLS-2$
		sb.append("\n\t").append("u = " + this.crud.u.booleanValue()); //$NON-NLS-1$ //$NON-NLS-2$
		sb.append("\n\t").append("d = " + this.crud.d.booleanValue()); //$NON-NLS-1$ //$NON-NLS-2$
		sb.append("\n\t").append("e = " + this.crud.e.booleanValue()); //$NON-NLS-1$ //$NON-NLS-2$
		sb.append("\n\t").append("a = " + this.crud.a.booleanValue()); //$NON-NLS-1$ //$NON-NLS-2$
>>>>>>> 45932362172b8a1a37d173ca797592d063129093:plugins/org.teiid.designer.vdb/src/org/teiid/designer/roles/Permission.java
		sb.append("\n\t").append("allow-language = " + allowLanguage); //$NON-NLS-1$ //$NON-NLS-2$
		return sb.toString();
	}

Solution content

	 */
	@Override
	public String toString() {
		StringBuilder sb = new StringBuilder("Permission: ").append(getTargetName()); //$NON-NLS-1$
		String value = NULL;
		if( this.crud.c != null ) {
			value = Boolean.toString(this.crud.c.booleanValue());
		}
		sb.append("\n\t").append("c = " + value); //$NON-NLS-1$ //$NON-NLS-2$
		value = NULL;
		if( this.crud.r != null ) {
			value = Boolean.toString(this.crud.r.booleanValue());
		}
		sb.append("\n\t").append("r = " + value); //$NON-NLS-1$ //$NON-NLS-2$
		value = NULL;
		if( this.crud.u != null ) {
			value = Boolean.toString(this.crud.u.booleanValue());
		}
		sb.append("\n\t").append("u = " + value); //$NON-NLS-1$ //$NON-NLS-2$
		value = NULL;
		if( this.crud.d != null ) {
			value = Boolean.toString(this.crud.d.booleanValue());
		}
		sb.append("\n\t").append("d = " + value); //$NON-NLS-1$ //$NON-NLS-2$
		value = NULL;
		if( this.crud.e != null ) {
			value = Boolean.toString(this.crud.e.booleanValue());
		}
		sb.append("\n\t").append("e = " + value); //$NON-NLS-1$ //$NON-NLS-2$
		value = NULL;
		if( this.crud.a != null ) {
			value = Boolean.toString(this.crud.a.booleanValue());
		}
		sb.append("\n\t").append("a = " + value); //$NON-NLS-1$ //$NON-NLS-2$

		sb.append("\n\t").append("allow-language = " + allowLanguage); //$NON-NLS-1$ //$NON-NLS-2$
		return sb.toString();
	}

File
Permission.java

Developer's decision
Manual

Kind of conflict
Attribute
Comment
If statement
Method invocation
Variable

Chunk

Conflicting content

    	super();
    	name = dataRole.getName();
    	anyAuthenticated = dataRole.isAnyAuthenticated();
<<<<<<< HEAD
    	allowCreateTempTables = dataRole.allowCreateTempTables();
    	
    	if( dataRole.doGrantAll() ) {
    		grantAll = Boolean.TRUE;
    	} else grantAll = null;
    	
=======
    	allowCreateTempTables = dataRole.isAllowCreateTempTables();
    	grantAll = dataRole.isGrantAll();
>>>>>>> 45932362172b8a1a37d173ca797592d063129093
    	description = dataRole.getDescription();
    	for( Permission permission : dataRole.getPermissions() ) {
    		getPermissions().add(new PermissionElement(permission));

Solution content

    	super();
    	name = dataRole.getName();
    	anyAuthenticated = dataRole.isAnyAuthenticated();
    	allowCreateTempTables = dataRole.isAllowCreateTempTables();
    	grantAll = dataRole.isGrantAll();
    	description = dataRole.getDescription();
    	for( Permission permission : dataRole.getPermissions() ) {
    		getPermissions().add(new PermissionElement(permission));

File
DataRoleElement.java

Developer's decision
Version 2

Kind of conflict
Attribute
If statement
Method invocation

Chunk

Conflicting content

     */
     * @param vdb
     * @throws Exception
<<<<<<< HEAD
    public VdbElement( final Vdb vdb ) throws Exception {
        String initialVdbName = vdb.getName().removeFileExtension().lastSegment();
        int indexOfDot = initialVdbName.indexOf('.');
        if( indexOfDot > -1 ) {
        	initialVdbName = initialVdbName.substring(0, indexOfDot);
        }
        name = initialVdbName;
        description = vdb.getDescription();
        version = vdb.getVersion();
=======
    public VdbElement( final XmiVdb vdb ) throws Exception {
>>>>>>> 45932362172b8a1a37d173ca797592d063129093
        for (final VdbEntry entry : vdb.getEntries())
            getEntries().add(new EntryElement(entry));

Solution content
* @param vdb * @throws Exception */ public VdbElement( final XmiVdb vdb ) throws Exception { for (final VdbEntry entry : vdb.getEntries()) getEntries().add(new EntryElement(entry));

File
VdbElement.java

Developer's decision
Version 2

Kind of conflict
Attribute
If statement
Method invocation
Method signature
Variable

Chunk

Conflicting content

import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbenchWindow;
import org.teiid.core.designer.ModelerCoreException;
<<<<<<< HEAD
import org.teiid.core.designer.util.CoreArgCheck;
=======
import org.teiid.core.designer.util.FileUtils;
>>>>>>> 45932362172b8a1a37d173ca797592d063129093
import org.teiid.core.designer.util.StringConstants;
import org.teiid.core.designer.util.StringUtilities;
import org.teiid.designer.core.ModelerCore;

Solution content

import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbenchWindow;
import org.teiid.core.designer.ModelerCoreException;
import org.teiid.core.designer.util.FileUtils;
import org.teiid.core.designer.util.StringConstants;
import org.teiid.core.designer.util.StringUtilities;
import org.teiid.designer.core.ModelerCore;

File
GenerateRestVirtualProceduresAction.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content

        		String columnXmlTag = dialog.getColumnXmlTag();
        		String restMethod = dialog.getRestMethodValue();
        		IContainer folder = dialog.getViewModelFolder();
<<<<<<< HEAD
=======
        		String modelName = dialog.getViewModelName();
        		if( !modelName.toUpperCase().endsWith(StringConstants.DOT_XMI.toUpperCase())) {
        			modelName = modelName + StringConstants.DOT_XMI;
        		}
>>>>>>> 45932362172b8a1a37d173ca797592d063129093
        		
        		boolean cancelled = false;
        		Collection procedureInfos = new ArrayList(selectedViewsAndTables.length);

Solution content

        		String columnXmlTag = dialog.getColumnXmlTag();
        		String restMethod = dialog.getRestMethodValue();
        		IContainer folder = dialog.getViewModelFolder();

        		boolean cancelled = false;
        		Collection procedureInfos = new ArrayList(selectedViewsAndTables.length);

File
GenerateRestVirtualProceduresAction.java

Developer's decision
Version 1

Kind of conflict
If statement
Method invocation
Variable

Chunk

Conflicting content

            if (folder != null) {
                this.viewModelContainerText.setText(folder.getFullPath().toString());
                viewModelFolder = folder;
<<<<<<< HEAD
=======
            } else {
                this.viewModelContainerText.setText(StringConstants.EMPTY_STRING);
>>>>>>> 45932362172b8a1a37d173ca797592d063129093
            }

    		validate();

Solution content
if (folder != null) { this.viewModelContainerText.setText(folder.getFullPath().toString()); viewModelFolder = folder; } validate();

File
GenerateRestVirtualProceduresAction.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content

    @Override
    public void deployVdb( IFile vdbFile ) throws Exception {
<<<<<<< HEAD
        ArgCheck.isNotNull(vdbFile, "vdbFile"); //$NON-NLS-1$

        String vdbDeploymentName = vdbFile.getFullPath().lastSegment();
        String vdbName = vdbFile.getFullPath().removeFileExtension().lastSegment();
    
        // For Teiid Version less than 8.7, do explicit undeploy (TEIID-2873)
    	if(isLessThanTeiidEightSeven()) {
    		undeployVdb(vdbName);
    	}
        
        doDeployVdb(vdbDeploymentName, getVdbName(vdbName), 1, vdbFile.getContents());
    }
    
	@Override
	public void deployVdb(IFile vdbFile, int version) throws Exception {
		ArgCheck.isNotNull(vdbFile, "vdbFile"); //$NON-NLS-1$
		String vdbDeploymentName = vdbFile.getFullPath().lastSegment();
		String vdbName = vdbFile.getFullPath().removeFileExtension()
				.lastSegment();
		// For Teiid Version less than 8.7, do explicit undeploy (TEIID-2873)
		if (isLessThanTeiidEightSeven()) {
			undeployVdb(vdbName);
		}
		int vdbVersion = 1;
		if (version > 1) {
			vdbVersion = version;
		}
		doDeployVdb(vdbDeploymentName, getVdbName(vdbName), vdbVersion,
				vdbFile.getContents());
	}
=======
        deployVdb(vdbFile, 1);
    }

    @Override
    public void deployVdb( IFile vdbFile, int version) throws Exception {
        ArgCheck.isNotNull(vdbFile, "vdbFile"); //$NON-NLS-1$

        String vdbDeploymentName = vdbFile.getFullPath().lastSegment();
        String vdbName = vdbFile.getFullPath().removeFileExtension().lastSegment();
        
        // For Teiid Version less than 8.7, do explicit undeploy (TEIID-2873)
    	if(isLessThanTeiidEightSeven()) {
    		undeployVdb(vdbName);
    	}
    	
    	int vdbVersion = 1;
    	if( version > 1 ) {
    		vdbVersion = version;
    	}
        
        doDeployVdb(vdbDeploymentName, getVdbName(vdbName), vdbVersion, vdbFile.getContents());
    }
>>>>>>> 45932362172b8a1a37d173ca797592d063129093
    
    @Override
    public void deployDynamicVdb( String deploymentName, InputStream inStream ) throws Exception {

Solution content

    @Override
    public void deployVdb( IFile vdbFile ) throws Exception {
        deployVdb(vdbFile, 1);
    }

    @Override
    public void deployVdb( IFile vdbFile, int version) throws Exception {
        ArgCheck.isNotNull(vdbFile, "vdbFile"); //$NON-NLS-1$

        String vdbDeploymentName = vdbFile.getFullPath().lastSegment();
        String vdbName = vdbFile.getFullPath().removeFileExtension().lastSegment();
        
        // For Teiid Version less than 8.7, do explicit undeploy (TEIID-2873)
    	if(isLessThanTeiidEightSeven()) {
    		undeployVdb(vdbName);
    	}
    	
    	int vdbVersion = 1;
    	if( version > 1 ) {
    		vdbVersion = version;
    	}
        
        doDeployVdb(vdbDeploymentName, getVdbName(vdbName), vdbVersion, vdbFile.getContents());
    }
 
    @Override
    public void deployDynamicVdb( String deploymentName, InputStream inStream ) throws Exception {

File
ExecutionAdmin.java

Developer's decision
Version 2

Kind of conflict
Annotation
Comment
If statement
Method declaration
Method invocation
Variable

Projects >> teiid-designer >>93968d583cb9179dd8c0b1068a8cd78c43df47a4