DEVOPS-3416 Deploy all plugins for Black Duck scans

* task(TCOMP-691): create context menu for Tacokit node in repository
panel
https://jira.talendforge.org/browse/TCOMP-691

* task(TCOMP-691): create context menu for Tacokit node in repository
panel
https://jira.talendforge.org/browse/TCOMP-691

* "task(TCOMP-691): create context menu for Tacokit node in repository
panel https://jira.talendforge.org/browse/TCOMP-691"

improvement

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/SAPHanaDataBaseMetadata.java

@@ -0,0 +1,359 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2017 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.commons.utils.database;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.talend.fakejdbc.FakeDatabaseMetaData;
+
+/**
+ * 
+ * created by hcyi on Nov 3, 2017 Detailled comment
+ *
+ */
+public class SAPHanaDataBaseMetadata extends FakeDatabaseMetaData {
+
+    private static final String[] TABLE_META = { "ID", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE", "REMARKS", "TABLE_CAT" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
+
+    private static final String[] COLUMN_META = { "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME", "COLUMN_SIZE", "DECIMAL_DIGITS", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+            "IS_NULLABLE", "REMARKS", "COLUMN_DEF", "NUM_PREC_RADIX" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+
+    private static final String[] NEEDED_TYPES = { "TABLE", "VIEW", "SYNONYM", "CALCULATION VIEW" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
+
+    private Connection connection;
+
+    public SAPHanaDataBaseMetadata(Connection connection) {
+        this.connection = connection;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.talend.commons.utils.database.FakeDatabaseMetaData#getConnection()
+     */
+    @Override
+    public Connection getConnection() throws SQLException {
+        return connection;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.talend.commons.utils.database.FakeDatabaseMetaData#getSchemas()
+     */
+    @Override
+    public ResultSet getSchemas() throws SQLException {
+        return connection.getMetaData().getSchemas();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.talend.commons.utils.database.FakeDatabaseMetaData#getPrimaryKeys(java.lang.String, java.lang.String,
+     * java.lang.String)
+     */
+    @Override
+    public ResultSet getPrimaryKeys(String catalog, String schema, String table) throws SQLException {
+        return new SAPHanaResultSet();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.talend.commons.utils.database.FakeDatabaseMetaData#getTableTypes()
+     */
+    @Override
+    public ResultSet getTableTypes() throws SQLException {
+        String[] s1 = new String[] { "TABLE" }; //$NON-NLS-1$
+        String[] s2 = new String[] { "VIEW" }; //$NON-NLS-1$
+        String[] s3 = new String[] { "SYNONYM" }; //$NON-NLS-1$
+        String[] s4 = new String[] { "CALCULATION VIEW" }; //$NON-NLS-1$
+
+        List<String[]> list = new ArrayList<String[]>();
+
+        list.add(s1);
+        list.add(s2);
+        list.add(s3);
+        list.add(s4);
+
+        SAPHanaResultSet tableResultSet = new SAPHanaResultSet();
+        tableResultSet.setMetadata(new String[] { "TABLE_TYPE" }); //$NON-NLS-1$
+        tableResultSet.setData(list);
+
+        return tableResultSet;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.talend.commons.utils.database.FakeDatabaseMetaData#getExportedKeys(java.lang.String, java.lang.String,
+     * java.lang.String)
+     */
+    @Override
+    public ResultSet getExportedKeys(String catalog, String schema, String table) throws SQLException {
+        return new SAPHanaResultSet();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.talend.commons.utils.database.FakeDatabaseMetaData#getTables(java.lang.String, java.lang.String,
+     * java.lang.String, java.lang.String[])
+     */
+    @Override
+    public ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String[] types)
+            throws SQLException {
+        String[] neededTypes = getNeededTypes(types);
+        ResultSet rs = connection.getMetaData().getTables(catalog, schemaPattern, tableNamePattern, neededTypes);
+        List<String[]> list = new ArrayList<String[]>();
+        while (rs.next()) {
+            String name = rs.getString("TABLE_NAME"); //$NON-NLS-1$
+            String schema = rs.getString("TABLE_SCHEM"); //$NON-NLS-1$
+            String type = rs.getString("TABLE_TYPE"); //$NON-NLS-1$
+
+            String id = ""; //$NON-NLS-1$
+            String remarks = ""; //$NON-NLS-1$
+            try {
+                remarks = rs.getString("REMARKS"); //$NON-NLS-1$
+            } catch (Exception e) {
+                // nothing
+            }
+
+            if (ArrayUtils.contains(neededTypes, type)) {
+                // check if the type is contained is in the types needed.
+                // since sybase can return some system views as "SYSTEM VIEW" instead of "VIEW/TABLE" from the request.
+                String[] r = new String[] { id, schema, name, type, remarks, null };
+                list.add(r);
+            }
+        }
+
+        // For Calculation View
+        if (ArrayUtils.contains(neededTypes, NEEDED_TYPES[3])) {
+            // check if the type is contained is in the types needed.
+            String sqlcv = "SELECT CATALOG_NAME,SCHEMA_NAME,CUBE_NAME, COLUMN_OBJECT,CUBE_TYPE,DESCRIPTION from _SYS_BI.BIMC_CUBES"; //$NON-NLS-1$
+            ResultSet rscv = null;
+            Statement stmtcv = null;
+            List<String[]> listcv = new ArrayList<String[]>();
+            try {
+                stmtcv = connection.createStatement();
+                rscv = stmtcv.executeQuery(sqlcv);
+                while (rscv.next()) {
+                    String catalogName = rscv.getString("CATALOG_NAME"); //$NON-NLS-1$
+                    if (catalogName != null) {
+                        catalogName = catalogName.trim();
+                    }
+                    String schemaName = rscv.getString("SCHEMA_NAME"); //$NON-NLS-1$
+                    if (schemaName != null) {
+                        schemaName = schemaName.trim();
+                    }
+                    String cubeName = rscv.getString("CUBE_NAME"); //$NON-NLS-1$
+                    if (cubeName != null) {
+                        cubeName = cubeName.trim();
+                    }
+                    String id = ""; //$NON-NLS-1$
+                    // String type = rscv.getString("CUBE_TYPE"); //$NON-NLS-1$
+
+                    String remarks = rscv.getString("DESCRIPTION"); //$NON-NLS-1$
+                    String name = catalogName + "/" + cubeName;//$NON-NLS-1$
+
+                    String[] r = new String[] { id, schemaName, name, NEEDED_TYPES[3], remarks, catalogName };
+                    listcv.add(r);
+                }
+            } catch (SQLException e) {
+                throw new RuntimeException(e);
+            } finally {
+                try {
+                    rscv.close();
+                    stmtcv.close();
+                } catch (Exception e) {
+                }
+            }
+            list.addAll(listcv);
+        }
+        SAPHanaResultSet tableResultSet = new SAPHanaResultSet();
+        tableResultSet.setMetadata(TABLE_META);
+        tableResultSet.setData(list);
+        return tableResultSet;
+    }
+
+    private String[] getNeededTypes(String[] types) {
+        List<String> list = new ArrayList<String>();
+        if (types != null && types.length > 0) {
+            for (String type : types) {
+                if (ArrayUtils.contains(NEEDED_TYPES, type)) {
+                    list.add(type);
+                }
+            }
+        }
+        return list.toArray(new String[list.size()]);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.talend.commons.utils.database.FakeDatabaseMetaData#supportsSchemasInDataManipulation()
+     */
+    @Override
+    public boolean supportsSchemasInDataManipulation() throws SQLException {
+        return true;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.talend.commons.utils.database.FakeDatabaseMetaData#supportsSchemasInTableDefinitions()
+     */
+    @Override
+    public boolean supportsSchemasInTableDefinitions() throws SQLException {
+        return true;
+    }
+
+    @Override
+    public boolean supportsSchemasInIndexDefinitions() throws SQLException {
+        return true;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.talend.commons.utils.database.FakeDatabaseMetaData#getColumns(java.lang.String, java.lang.String,
+     * java.lang.String, java.lang.String)
+     */
+    @Override
+    public ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern)
+            throws SQLException {
+        boolean load = false;
+        ResultSet rs = connection.getMetaData().getColumns(catalog, schemaPattern, tableNamePattern, columnNamePattern);
+        List<String[]> list = new ArrayList<String[]>();
+        try {
+            while (rs.next()) {
+                String tableName = rs.getString("TABLE_NAME"); //$NON-NLS-1$
+                if (tableName != null) {
+                    tableName = tableName.trim();
+                }
+                String columnName = rs.getString("COLUMN_NAME"); //$NON-NLS-1$
+                if (columnName != null) {
+                    columnName = columnName.trim();
+                }
+                String typeName = rs.getString("TYPE_NAME"); //$NON-NLS-1$
+                if (typeName != null) {
+                    typeName = typeName.trim();
+                }
+                String columnSize = rs.getString("COLUMN_SIZE"); //$NON-NLS-1$
+                if (columnSize != null) {
+                    columnSize = columnSize.trim();
+                }
+                String decimalDigits = rs.getString("DECIMAL_DIGITS"); //$NON-NLS-1$
+                if (decimalDigits != null) {
+                    decimalDigits = decimalDigits.trim();
+                }
+                String isNullable = rs.getString("IS_NULLABLE");//$NON-NLS-1$
+                if (isNullable != null) {
+                    isNullable = isNullable.trim();
+                }
+                if (isNullable != null && isNullable.equalsIgnoreCase("NO")) { //$NON-NLS-1$
+                    isNullable = "YES"; //$NON-NLS-1$
+                } else {
+                    isNullable = "NO"; //$NON-NLS-1$
+                }
+                // String keys = rs.getString("keys");
+                String remarks = rs.getString("REMARKS");//$NON-NLS-1$
+                if (remarks != null) {
+                    remarks = remarks.trim();
+                }
+                String columnDef = rs.getString("COLUMN_DEF");//$NON-NLS-1$
+                if (columnDef != null) {
+                    columnDef = columnDef.trim();
+                }
+                String sourceDataType = rs.getString("SOURCE_DATA_TYPE");//$NON-NLS-1$
+                if (sourceDataType != null) {
+                    sourceDataType = sourceDataType.trim();
+                }
+                String[] r = new String[] { tableName, columnName, typeName, columnSize, decimalDigits, isNullable, // keys
+                        // ,
+                        remarks, columnDef, sourceDataType };
+                list.add(r);
+                load = true;
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        } finally {
+            try {
+                rs.close();
+            } catch (Exception e) {
+            }
+        }
+
+        // For Calculation View
+        if (!load) {
+            String sqlcv = "SELECT * from \"" + schemaPattern + "\".\"" + tableNamePattern + "\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            ResultSet rscv = null;
+            Statement stmtcv = null;
+            List<String[]> listcv = new ArrayList<String[]>();
+            try {
+                stmtcv = connection.createStatement();
+                rscv = stmtcv.executeQuery(sqlcv);
+                int i = 1;
+                while (rscv.next()) {
+                    String tableName = tableNamePattern;
+                    String columnName = rscv.getMetaData().getColumnName(i);
+                    String typeName = rscv.getMetaData().getColumnTypeName(i);
+                    int columnCount = rscv.getMetaData().getColumnCount();
+                    String columnSize = String.valueOf(columnCount);
+                    String decimalDigits = String.valueOf(rscv.getMetaData().getPrecision(i));
+                    String isNullable = String.valueOf(rscv.getMetaData().isNullable(i));
+                    // fill default value if null
+                    if (typeName == null) {
+                        typeName = "CV"; //$NON-NLS-1$
+                    }
+                    if (columnSize == null) {
+                        columnSize = "255";//$NON-NLS-1$
+                    }
+                    if (decimalDigits == null) {
+                        decimalDigits = "0";//$NON-NLS-1$
+                    }
+                    String remarks = ""; //$NON-NLS-1$
+                    String columnDef = ""; //$NON-NLS-1$
+
+                    String[] r = new String[] { tableName, columnName, typeName, columnSize, decimalDigits, isNullable, remarks,
+                            columnDef };
+                    listcv.add(r);
+                    if (i == columnCount) {
+                        break;
+                    }
+                    i++;
+                }
+            } catch (SQLException e) {
+                throw new RuntimeException(e);
+            } finally {
+                try {
+                    rscv.close();
+                    stmtcv.close();
+                } catch (Exception e) {
+                }
+            }
+            list.addAll(listcv);
+        }
+
+        SAPHanaResultSet tableResultSet = new SAPHanaResultSet();
+        tableResultSet.setMetadata(COLUMN_META);
+        tableResultSet.setData(list);
+        return tableResultSet;
+    }
+}

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/SAPHanaResultSet.java

@@ -0,0 +1,143 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2017 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.commons.utils.database;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.talend.commons.i18n.internal.Messages;
+import org.talend.commons.utils.TalendDBUtils;
+import org.talend.fakejdbc.FakeResultSet;
+
+/**
+ * 
+ * created by hcyi on Nov 3, 2017 Detailled comment
+ *
+ */
+public class SAPHanaResultSet extends FakeResultSet {
+
+    private String[] tableMeta = null;
+
+    private List<String[]> data;
+
+    int index = -1;
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.talend.commons.utils.database.FakeResultSet#next()
+     */
+    @Override
+    public boolean next() throws SQLException {
+        if (data == null || data.size() == 0 || index >= data.size() - 1) {
+            return false;
+        }
+        index++;
+        return true;
+    }
+
+    public static int indexOf(String string, String[] search) {
+        for (int i = 0; i < search.length; i++) {
+            if (search[i].equals(string)) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.talend.commons.utils.database.FakeResultSet#getString(java.lang.String)
+     */
+    @Override
+    public String getString(String columnLabel) throws SQLException {
+        int columnIndex = indexOf(columnLabel, tableMeta);
+
+        if (columnIndex == -1) {
+            throw new SQLException(Messages.getString("DB2ForZosResultSet.unknowCloumn") + columnLabel); //$NON-NLS-1$
+        }
+
+        return getString(columnIndex + 1);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.talend.commons.utils.database.FakeResultSet#getInt(java.lang.String)
+     */
+    @Override
+    public int getInt(String columnLabel) throws SQLException {
+        String str = getString(columnLabel);
+        if (columnLabel.equals("TYPE_NAME")) {
+            int index = TalendDBUtils.convertToJDBCType(str);
+            return index;
+        } else if (columnLabel.equals("IS_NULLABLE")) {
+            if (str.equals("N")) {
+                return 1;
+            } else {
+                return 0;
+            }
+        } else {
+            return Integer.parseInt(str);
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.talend.commons.utils.database.FakeResultSet#getBoolean(java.lang.String)
+     */
+    @Override
+    public boolean getBoolean(String columnLabel) throws SQLException {
+        String str = getString(columnLabel);
+        return Boolean.parseBoolean(str);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.talend.commons.utils.database.FakeResultSet#getString(int)
+     */
+    @Override
+    public String getString(int columnIndex) throws SQLException {
+        String[] row = data.get(index);
+        columnIndex--;
+
+        if (columnIndex < 0 || columnIndex > row.length) {
+            throw new SQLException(
+                    Messages.getString("DB2ForZosResultSet.parameterIndex") + columnIndex + Messages.getString("DB2ForZosResultSet.outofRange")); //$NON-NLS-1$ //$NON-NLS-2$
+        }
+        return row[columnIndex];
+    }
+
+    /**
+     * DOC bqian Comment method "setMetadata".
+     * 
+     * @param table_meta
+     */
+    public void setMetadata(String[] tableMeta) {
+        this.tableMeta = tableMeta;
+
+    }
+
+    /**
+     * DOC bqian Comment method "setData".
+     * 
+     * @param tables
+     */
+    public void setData(List<String[]> data) {
+        this.data = data;
+    }
+
+}

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/network/NetworkUtil.java

@@ -43,7 +43,7 @@ public class NetworkUtil {
             return false;
         }
         try {
-            URL url = new URL("https://www.talendforge.org"); //$NON-NLS-1$
+            URL url = new URL("https://www.talend.com"); //$NON-NLS-1$
             HttpURLConnection conn = (HttpURLConnection) url.openConnection();
             conn.setConnectTimeout(4000);
             conn.setReadTimeout(4000);

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/gmf/util/DisplayUtils.java

@@ -12,10 +12,13 @@
 // ============================================================================
 package org.talend.commons.ui.gmf.util;
 
+import java.util.concurrent.Semaphore;
+
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
+import org.talend.commons.exception.ExceptionHandler;
 
 /**
  * Utility methods to work with Display object
@@ -99,4 +102,53 @@ public class DisplayUtils {
         }
     }
 
+    /**
+     * Simply run in a new created UI thread<br>
+     * <br>
+     * <b>NOTE!!</b> The runnable should be simple, can <b>NOT</b> call any UI element belongs to other UI thread.
+     * 
+     * @param runnable
+     * @throws Exception
+     */
+    public static void syncExecInNewUIThread(Runnable runnable) throws Exception {
+        final Semaphore semaphore = new Semaphore(1, true);
+        semaphore.acquire();
+        Thread thread = new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                Display display = new Display();
+                try {
+                    Thread currentThread = Thread.currentThread();
+                    boolean releasedLock = false;
+                    while (!currentThread.isInterrupted()) {
+                        if (!display.readAndDispatch()) {
+                            if (!releasedLock) {
+                                semaphore.release();
+                                releasedLock = true;
+                            }
+                            Thread.sleep(50);
+                        }
+                    }
+                } catch (InterruptedException e) {
+                    // ignore
+                } catch (Exception e) {
+                    ExceptionHandler.process(e);
+                } finally {
+                    if (semaphore.availablePermits() <= 0) {
+                        semaphore.release();
+                    }
+                    display.dispose();
+                }
+            }
+        });
+        thread.start();
+
+        semaphore.acquire();
+        semaphore.release();
+        Display display = Display.findDisplay(thread);
+        display.syncExec(runnable);
+        thread.interrupt();
+    }
+
 }

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/preferences/AbstractPreferenceTableEditorView.java

@@ -31,7 +31,7 @@ import org.talend.commons.ui.swt.tableviewer.TableViewerCreator;
  */
 public abstract class AbstractPreferenceTableEditorView<B> extends FieldEditor {
 
-    private AbstractDataTableEditorView<B> tableEditorView;
+    protected AbstractDataTableEditorView<B> tableEditorView;
 
     private AbstractPreferencesHelperForTable preferencesHelper;
 

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/tableviewer/behavior/DefaultCellModifier.java

@@ -94,7 +94,7 @@ public class DefaultCellModifier implements ICellModifier {
             modifiedObjectInfo.setPreviousPropertyBeanValue(returnValue);
             // System.out.println("getValue : value=" + returnValue);
         }
-        return returnValue;
+        return returnValue == null ? "" : returnValue;
     }
 
     /*

main/plugins/org.talend.core.repository/schema/repository_provider.exsd

@@ -1,254 +1,273 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.talend.designer.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.talend.designer.core" id="providers_repository" name="Repository provider"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to define content providers for the repository.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="RepositoryFactory" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="RepositoryFactory">
-      <complexType>
-         <sequence>
-            <element ref="loginField" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="button" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="choiceField" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.talend.designer.core.extension.IRepositoryFactory"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="authenticationNeeded" type="boolean" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="displayToUser" type="boolean" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="loginField">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="required" type="boolean" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="password" type="boolean" use="default" value="false">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="button">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="selectionListener" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.swt.events.SelectionListener"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="choiceField">
-      <complexType>
-         <sequence minOccurs="1" maxOccurs="unbounded">
-            <element ref="choice"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="choice">
-      <complexType>
-         <attribute name="label" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="value" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         beta2
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of the extension point:&lt;br&gt;
-&amp;lt;extension point=&amp;quot;org.talend.repository.repository_provider&amp;quot;&amp;gt;&lt;br&gt;
-  &amp;lt;RepositoryFactory class=&amp;quot;org.talend.repository.localprovider.model.RepositoryFactory&amp;quot;/&amp;gt;&lt;br&gt;
-&amp;lt;/extension&amp;gt;&lt;br&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The value of the class attribute must be a fully qualified name of the class that implements org.talend.designer.core.extension.IRepositoryFactory.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         Talend application needs at least one plug-in using this extension point. If many, user will have to choose on login window.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Talend Community Edition&lt;br&gt;
-Copyright (C) 2006-2013 Talend - www.talend.com
-      </documentation>
-   </annotation>
-
-</schema>
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.talend.designer.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.talend.designer.core" id="providers_repository" name="Repository provider"/>
+      </appInfo>
+      <documentation>
+         This extension point is used to define content providers for the repository.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="RepositoryFactory" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="RepositoryFactory">
+      <complexType>
+         <sequence>
+            <element ref="loginField" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="button" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="choiceField" minOccurs="0" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn="org.talend.designer.core.extension.IRepositoryFactory"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="authenticationNeeded" type="boolean" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="displayToUser" type="boolean" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="only4Talend" type="boolean">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="loginField">
+      <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="required" type="boolean" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="password" type="boolean" use="default" value="false">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="defaultValue" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="button">
+      <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="selectionListener" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn="org.eclipse.swt.events.SelectionListener"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="choiceField">
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="choice"/>
+         </sequence>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="choice">
+      <complexType>
+         <attribute name="label" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="value" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         beta2
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         The following is an example of the extension point:&lt;br&gt;
+&amp;lt;extension point=&amp;quot;org.talend.repository.repository_provider&amp;quot;&amp;gt;&lt;br&gt;
+  &amp;lt;RepositoryFactory class=&amp;quot;org.talend.repository.localprovider.model.RepositoryFactory&amp;quot;/&amp;gt;&lt;br&gt;
+&amp;lt;/extension&amp;gt;&lt;br&gt;
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         The value of the class attribute must be a fully qualified name of the class that implements org.talend.designer.core.extension.IRepositoryFactory.
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         Talend application needs at least one plug-in using this extension point. If many, user will have to choose on login window.
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         Talend Community Edition&lt;br&gt;
+Copyright (C) 2006-2013 Talend - www.talend.com
+      </documentation>
+   </annotation>
+
+</schema>

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages.properties

@@ -159,6 +159,7 @@ ProjectRepositoryNode.cdcFoundation=CDC Foundation
 ProjectRepositoryNode.genericSchema=Generic schemas
 ProjectRepositoryNode.queries=Queries
 ProjectRepositoryNode.synonymSchemas=Synonym schemas
+ProjectRepositoryNode.calculationViewSchemas=Calculation View schemas
 ProjectRepositoryNode.tableSchemas=Table schemas
 ProjectRepositoryNode.viewSchemas=View schemas
 ProjectRepositoryNode.sapFunctions=SAP Functions
@@ -167,6 +168,7 @@ ProjectRepositoryNode.sapFunctions.inputSchema=Input
 ProjectRepositoryNode.sapFunctions.outputSchema=Output
 ProjectRepositoryNode.sapIDocs=SAP iDocs
 ProjectRepositoryNode.sapTables=SAP Tables
+ProjectRepositoryNode.sapBWAdvancedDataStoreObject=SAP ADSO
 ProjectRepositoryNode.sapBWDataSource=SAP DataSource
 ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
 ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/DynamicFieldBean.java

@@ -24,14 +24,21 @@ public class DynamicFieldBean {
 
     private String name;
 
+    private String defaultValue;
+
     private boolean required;
 
     private boolean password;
 
     public DynamicFieldBean(String id, String name, boolean required, boolean password) {
+        this(id, name, null, required, password);
+    }
+
+    public DynamicFieldBean(String id, String name, String defaultValue, boolean required, boolean password) {
         super();
         this.id = id;
         this.name = name;
+        this.defaultValue = defaultValue;
         this.required = required;
         this.password = password;
     }
@@ -68,4 +75,12 @@ public class DynamicFieldBean {
         this.password = password;
     }
 
+    public String getDefaultValue() {
+        return this.defaultValue;
+    }
+
+    public void setDefaultValue(String defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+
 }

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProjectRepositoryNode.java

@@ -1541,6 +1541,14 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
                     Messages.getString("ProjectRepositoryNode.synonymSchemas"), ECoreImage.FOLDER_CLOSE_ICON); //$NON-NLS-1$
             node.getChildren().add(synonymsNode);
 
+            // 4.CALCULATION VIEWS:
+            RepositoryNode calculationViewsNode = new StableRepositoryNode(node,
+                    Messages.getString("ProjectRepositoryNode.calculationViewSchemas"), ECoreImage.FOLDER_CLOSE_ICON); //$NON-NLS-1$
+            if (PluginChecker.isTIS() && EDatabaseTypeName.SAPHana.getDisplayName()
+                    .equals(((DatabaseConnection) metadataConnection).getDatabaseType())) {
+                node.getChildren().add(calculationViewsNode);
+            }
+
             DatabaseConnection dbconn = (DatabaseConnection) metadataConnection;
             List<MetadataTable> allTables = ConnectionHelper.getTablesWithOrders(dbconn);
 
@@ -1575,6 +1583,9 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
                     } else if (typeTable.equals(MetadataManager.TYPE_SYNONYM)) {
                         createTable(synonymsNode, repObj, metadataTable, ERepositoryObjectType.METADATA_CON_TABLE,
                                 validationRules);
+                    } else if (typeTable.equals(MetadataManager.TYPE_CALCULATION_VIEW)) {
+                        createTable(calculationViewsNode, repObj, metadataTable, ERepositoryObjectType.METADATA_CON_TABLE,
+                                validationRules);
                     }
                     // bug 0017782 ,db2's SYNONYM need to convert to ALIAS;
                     else if (typeTable.equals(MetadataManager.TYPE_ALIAS)) {
@@ -1647,16 +1658,19 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
             node.getChildren().add(iDocNode);
             createSAPIDocNodes(repObj, metadataConnection, iDocNode);
 
-            // 4. BW DataSource:
+            // 4. BW AdvancedDataStoreObject:
+            createSAPBWAdvancedDataStoreObjectNodes(repObj, metadataConnection, node, validationRules);
+
+            // 5. BW DataSource:
             createSAPBWDataSourceNodes(repObj, metadataConnection, node, validationRules);
 
-            // 5. BW DataStoreObject:
+            // 6. BW DataStoreObject:
             createSAPBWDataStoreObjectNodes(repObj, metadataConnection, node, validationRules);
 
-            // 6. BW InfoCube:
+            // 7. BW InfoCube:
             createSAPBWInfoCubeNodes(repObj, metadataConnection, node, validationRules);
 
-            // 7. BW InfoObject:
+            // 8. BW InfoObject:
             createSAPBWInfoObjectNodes(repObj, metadataConnection, node, validationRules);
 
             // 8. BW Business Content Extractor:
@@ -1702,6 +1716,28 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     }
 
+    private void createSAPBWAdvancedDataStoreObjectNodes(IRepositoryViewObject repObj, Connection metadataConnection,
+            RepositoryNode node, List<IRepositoryViewObject> validationRules) {
+        StableRepositoryNode container = new StableRepositoryNode(node,
+                Messages.getString("ProjectRepositoryNode.sapBWAdvancedDataStoreObject"), ECoreImage.FOLDER_CLOSE_ICON); //$NON-NLS-1$
+        container.setChildrenObjectType(ERepositoryObjectType.METADATA_CON_TABLE);
+        container.setProperties(EProperties.CONTENT_TYPE, ERepositoryObjectType.METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT);
+
+        IRepositoryNode cacheNode = nodeCache.getCache(container);
+        if (cacheNode != null && cacheNode instanceof StableRepositoryNode) {
+            container = (StableRepositoryNode) cacheNode;
+            container.getChildren().clear();
+        } else {
+            nodeCache.addCache(container, true);
+        }
+        node.getChildren().add(container);
+
+        EList<SAPBWTable> advancedDataStoreObjects = ((SAPConnection) metadataConnection).getBWAdvancedDataStoreObjects();
+        EList tables = new BasicEList();
+        tables.addAll(advancedDataStoreObjects);
+        createTables(container, repObj, tables, ERepositoryObjectType.METADATA_CON_TABLE, validationRules);
+    }
+
     private void createSAPBWDataSourceNodes(IRepositoryViewObject repObj, Connection metadataConnection, RepositoryNode node,
             List<IRepositoryViewObject> validationRules) {
         StableRepositoryNode container = new StableRepositoryNode(node,

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/RepositoryFactoryProvider.java

@@ -25,7 +25,6 @@ import org.talend.commons.utils.workbench.extensions.ExtensionPointLimiterImpl;
 import org.talend.commons.utils.workbench.extensions.IExtensionPointLimiter;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.ui.branding.IBrandingService;
-import org.talend.repository.model.RepositoryConstants;
 
 /**
  * Provides, using extension points, implementation of many factories.
@@ -56,6 +55,14 @@ public class RepositoryFactoryProvider {
 
             for (IConfigurationElement current : extension) {
                 try {
+                    String only4TalendStr = current.getAttribute("only4Talend"); //$NON-NLS-1$
+                    if (Boolean.valueOf(only4TalendStr)) {
+                        IBrandingService brandingService = (IBrandingService) GlobalServiceRegister.getDefault()
+                                .getService(IBrandingService.class);
+                        if (!brandingService.isPoweredbyTalend()) {
+                            continue;
+                        }
+                    }
                     IRepositoryFactory currentAction = (IRepositoryFactory) current.createExecutableExtension("class"); //$NON-NLS-1$
                     currentAction.setId(current.getAttribute("id")); //$NON-NLS-1$
                     currentAction.setName(current.getAttribute("name")); //$NON-NLS-1$
@@ -66,6 +73,7 @@ public class RepositoryFactoryProvider {
                     for (IConfigurationElement currentLoginField : current.getChildren("loginField")) { //$NON-NLS-1$
                         DynamicFieldBean key = new DynamicFieldBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
                                 currentLoginField.getAttribute("name"), //$NON-NLS-1$
+                                currentLoginField.getAttribute("defaultValue"), //$NON-NLS-1$
                                 new Boolean(currentLoginField.getAttribute("required")), //$NON-NLS-1$
                                 new Boolean(currentLoginField.getAttribute("password"))); //$NON-NLS-1$
                         currentAction.getFields().add(key);

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/actions/DuplicateAction.java

@@ -164,6 +164,7 @@ public class DuplicateAction extends AContextualAction {
                             || node.getProperties(EProperties.CONTENT_TYPE) == ERepositoryObjectType.METADATA_CON_TABLE
                             || node.getProperties(EProperties.CONTENT_TYPE) == ERepositoryObjectType.METADATA_CON_VIEW
                             || node.getProperties(EProperties.CONTENT_TYPE) == ERepositoryObjectType.METADATA_CON_SYNONYM
+                            || node.getProperties(EProperties.CONTENT_TYPE) == ERepositoryObjectType.METADATA_CON_CALCULATION_VIEW
                             || node.getProperties(EProperties.CONTENT_TYPE) == ERepositoryObjectType.METADATA_SAP_FUNCTION
                             || node.getProperties(EProperties.CONTENT_TYPE) == ERepositoryObjectType.METADATA_SALESFORCE_MODULE
                             || node.getProperties(EProperties.CONTENT_TYPE) == ERepositoryObjectType.METADATA_SAP_IDOC

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/view/RepositoryLabelProvider.java

@@ -12,7 +12,6 @@
 // ============================================================================
 package org.talend.core.repository.ui.view;
 
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -178,6 +177,7 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv
                     || repositoryObjectType == ERepositoryObjectType.METADATA_CON_SYNONYM
                     || repositoryObjectType == ERepositoryObjectType.METADATA_CON_TABLE
                     || repositoryObjectType == ERepositoryObjectType.METADATA_CON_VIEW
+                    || repositoryObjectType == ERepositoryObjectType.METADATA_CON_CALCULATION_VIEW
                     || repositoryObjectType == ERepositoryObjectType.METADATA_CON_CDC
                     || repositoryObjectType == ERepositoryObjectType.METADATA_CON_CDC
                     || repositoryObjectType == ERepositoryObjectType.METADATA_SAP_IDOC
@@ -405,6 +405,7 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv
                     || repositoryObjectType == ERepositoryObjectType.SNIPPETS
                     || repositoryObjectType == ERepositoryObjectType.METADATA_CON_SYNONYM
                     || repositoryObjectType == ERepositoryObjectType.METADATA_CON_VIEW
+                    || repositoryObjectType == ERepositoryObjectType.METADATA_CON_CALCULATION_VIEW
                     || repositoryObjectType == ERepositoryObjectType.JOB_DOC
                     || repositoryObjectType == ERepositoryObjectType.JOBLET_DOC) {
                 return ImageProvider.getImage(nodeIcon);

main/plugins/org.talend.core.runtime/mappings/mapping_MicrosoftCrm_odata.xml

@@ -6,6 +6,7 @@
 			<dbType type="Binary" ignoreLen="true" ignorePre="true" />
 			<dbType type="Collection" ignorePre="true" />
 			<dbType type="DateTimeOffset" ignorePre="true" ignoreLen="true"/>
+			<dbType type="Date" ignorePre="true" ignoreLen="true"/>
 			<dbType type="Decimal" defaultLength="20" defaultPrecision="10" preBeforelen="false" />
 			<dbType type="Double" defaultLength="20" defaultPrecision="10" />
 			<dbType type="Guid" ignorePre="true" default="true" defaultLength="100" />
@@ -28,6 +29,7 @@
 				<talendType type="id_Character" />
 				<talendType type="id_Date">
 				    <dbType type="DateTimeOffset" default="true" />
+				    <dbType type="Date" />
 				</talendType>
 				<talendType type="id_BigDecimal">
 				    <dbType type="Decimal" default="true" />
@@ -62,6 +64,9 @@
 				<dbType type="DateTimeOffset">
 					<talendType type="id_Date" default="true" />
 				</dbType>
+				<dbType type="Date">
+					<talendType type="id_Date" default="true" />
+				</dbType>
 				<dbType type="Decimal">
 					<talendType type="id_BigDecimal" default="true" />
 				</dbType>

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/version/EDatabaseVersion4Drivers.java

@@ -82,7 +82,8 @@ public enum EDatabaseVersion4Drivers {
             "Microsoft SQL Server 2012", "Microsoft SQL Server 2012", "jtds-1.3.1-patch.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     MSSQL_PROP(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,
             "Microsoft", "MSSQL_PROP", "mssql-jdbc.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
+    
+    VERTICA_9(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 9.0", "VERTICA_9_0", "vertica-jdbc-9.0.0-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     VERTICA_7(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 7.0.x", "VERTICA_7_0_X", "vertica-jdbc-7.0.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     VERTICA_6_1_X(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 6.1.x", "VERTICA_6_1_X", "vertica-jdk5-6.1.2-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     VERTICA_6(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 6.0", "VERTICA_6_0", "vertica-jdk5-6.0.0-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/download/DownloadHelper.java

@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -58,18 +59,27 @@ public class DownloadHelper implements IDownloadHelper {
 
             bis = new BufferedInputStream(connection.getInputStream());
             bos = new BufferedOutputStream(new FileOutputStream(destination));
-            fireDownloadStart(connection.getContentLength());
+            int contentLength = connection.getContentLength();
+            fireDownloadStart(contentLength);
 
+            int refreshInterval = 1000;
+            if (contentLength < BUFFER_SIZE * 10) {
+                refreshInterval = contentLength / 200;
+            }
             byte[] buf = new byte[BUFFER_SIZE];
-            int bytesDownloaded = 0;
             int bytesRead = -1;
+            long startTime = new Date().getTime();
+            int byteReadInloop = 0;
             while ((bytesRead = bis.read(buf)) != -1) {
                 bos.write(buf, 0, bytesRead);
-                bytesDownloaded += bytesRead;
-
-                fireDownloadProgress(bytesRead);
+                long currentTime = new Date().getTime();
+                byteReadInloop = byteReadInloop + bytesRead;
+                if (currentTime - startTime > refreshInterval) {
+                    startTime = currentTime;
+                    fireDownloadProgress(byteReadInloop);
+                    byteReadInloop = 0;
+                }
                 if (isCancel()) {
-                    // cacel download process
                     return;
                 }
             }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/components/IComponent.java

@@ -225,4 +225,8 @@ public interface IComponent {
     boolean isSupportDbType();
 
     boolean isAllowedPropagated();
+
+    String getTemplateFolder();
+
+    String getTemplateNamePrefix();
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/components/IComponentFileNaming.java

@@ -23,4 +23,6 @@ import org.talend.core.model.temp.ECodePart;
 public interface IComponentFileNaming {
 
     public String getJetFileName(IComponent component, String languageSuffix, ECodePart codePart);
+
+    public String getJetFileName(String filePrefix, String languageSuffix, ECodePart codePart);
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/ISAPConstant.java

@@ -86,4 +86,16 @@ public interface ISAPConstant {
 
     public static final String OUTPUT_XML_META_NAME = PARAM_OUTPUT + SCHEMA_SUFIX;
 
+    // Hana database properties
+    public static final String PROP_USE_HANA = "db.useHana";//$NON-NLS-1$
+
+    public static final String PROP_DB_HOST = "db.host";//$NON-NLS-1$
+
+    public static final String PROP_DB_PORT = "db.port";//$NON-NLS-1$
+
+    public static final String PROP_DB_SCHEMA = "db.schema";//$NON-NLS-1$
+
+    public static final String PROP_DB_USERNAME = "db.username";//$NON-NLS-1$
+
+    public static final String PROP_DB_PASSWORD = "db.password";//$NON-NLS-1$
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataManager.java

@@ -25,6 +25,7 @@ import org.talend.core.model.properties.Item;
 import org.talend.core.model.repository.EPackageType;
 import org.talend.cwm.helper.ConnectionHelper;
 import org.talend.cwm.xml.TdXmlSchema;
+
 import orgomg.cwm.foundation.softwaredeployment.Component;
 import orgomg.cwm.objectmodel.core.Dependency;
 import orgomg.cwm.objectmodel.core.ModelElement;
@@ -41,6 +42,8 @@ public class MetadataManager {
 
     public static final String TYPE_SYNONYM = "SYNONYM"; //$NON-NLS-1$
 
+    public static final String TYPE_CALCULATION_VIEW = "CALCULATION VIEW"; //$NON-NLS-1$
+
     public static final String TYPE_ALIAS = "ALIAS"; //$NON-NLS-1$
 
     public static void addContents(ConnectionItem item, Resource itemResource) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/RepositoryToComponentProperty.java

@@ -90,6 +90,7 @@ import org.talend.core.service.IMetadataManagmentUiService;
 import org.talend.core.utils.KeywordsValidator;
 import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.cwm.helper.ConnectionHelper;
+import org.talend.cwm.helper.TaggedValueHelper;
 
 /**
  * DOC nrousseau class global comment. Detailled comment <br/>
@@ -406,8 +407,42 @@ public class RepositoryToComponentProperty {
                 }
             }
             return values;
+        } else if ("SAPHANA_HOST".equals(value)) { //$NON-NLS-1$
+            String dbHost = TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_HOST, connection);
+            if (isContextMode(connection, dbHost)) {
+                return dbHost;
+            } else {
+                return TalendQuoteUtils.addQuotes(dbHost);
+            }
+        } else if ("SAPHANA_PORT".equals(value)) { //$NON-NLS-1$
+            String dbPort = TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_PORT, connection);
+            if (isContextMode(connection, dbPort)) {
+                return dbPort;
+            } else {
+                return TalendQuoteUtils.addQuotes(dbPort);
+            }
+        } else if ("SAPHANA_TABLESCHEMA".equals(value)) { //$NON-NLS-1$
+            String dbSchema = TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_SCHEMA, connection);
+            if (isContextMode(connection, dbSchema)) {
+                return dbSchema;
+            } else {
+                return TalendQuoteUtils.addQuotes(dbSchema);
+            }
+        } else if ("SAPHANA_USER".equals(value)) { //$NON-NLS-1$
+            String dbUsername = TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_USERNAME, connection);
+            if (isContextMode(connection, dbUsername)) {
+                return dbUsername;
+            } else {
+                return TalendQuoteUtils.addQuotes(dbUsername);
+            }
+        } else if ("SAPHANA_PASS".equals(value)) { //$NON-NLS-1$
+            String dbPassword = TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_PASSWORD, connection);
+            if (isContextMode(connection, dbPassword)) {
+                return dbPassword;
+            } else {
+                return TalendQuoteUtils.addQuotes(connection.getValue(dbPassword, false));
+            }
         }
-
         return null;
     }
 
@@ -479,7 +514,7 @@ public class RepositoryToComponentProperty {
         }
         // for bug TDI-8662 . should be careful that connection.getModuleName() will always get the latest name of the
         // module which was the last one be retrived
-        //        else if ("CUSTOM_MODULE_NAME".equals(value)) { //$NON-NLS-1$
+        // else if ("CUSTOM_MODULE_NAME".equals(value)) { //$NON-NLS-1$
         // return TalendQuoteUtils.addQuotes(connection.getModuleName());
         // }
         else if ("MODULENAME".equals(value)) { //$NON-NLS-1$
@@ -589,7 +624,8 @@ public class RepositoryToComponentProperty {
         return null;
     }
 
-    private static SalesforceModuleUnit getSaleforceModuleUnitByTable(IMetadataTable table, EList<SalesforceModuleUnit> moduleList) {
+    private static SalesforceModuleUnit getSaleforceModuleUnitByTable(IMetadataTable table,
+            EList<SalesforceModuleUnit> moduleList) {
         for (SalesforceModuleUnit unit : moduleList) {
             if (table.getLabel().equals(unit.getModuleName())) {
                 return unit;
@@ -1204,11 +1240,11 @@ public class RepositoryToComponentProperty {
         if (value.equals("HBASE_MASTER_PRINCIPAL")) {
             String hbaseMasterPrinc = null;
             if (EDatabaseTypeName.HBASE.getDisplayName().equals(databaseType)) {
-                hbaseMasterPrinc = connection.getParameters().get(
-                        ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_MASTERPRINCIPAL);
+                hbaseMasterPrinc = connection.getParameters()
+                        .get(ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_MASTERPRINCIPAL);
             } else if (EDatabaseTypeName.MAPRDB.getDisplayName().equals(databaseType)) {
-                hbaseMasterPrinc = connection.getParameters().get(
-                        ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MASTERPRINCIPAL);
+                hbaseMasterPrinc = connection.getParameters()
+                        .get(ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MASTERPRINCIPAL);
             }
             return getAppropriateValue(connection, hbaseMasterPrinc);
         }
@@ -1216,11 +1252,11 @@ public class RepositoryToComponentProperty {
         if (value.equals("HBASE_REGIONSERVER_PRINCIPAL")) {
             String hbaseRegPrinc = null;
             if (EDatabaseTypeName.HBASE.getDisplayName().equals(databaseType)) {
-                hbaseRegPrinc = connection.getParameters().get(
-                        ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_REGIONSERVERPRINCIPAL);
+                hbaseRegPrinc = connection.getParameters()
+                        .get(ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_REGIONSERVERPRINCIPAL);
             } else if (EDatabaseTypeName.MAPRDB.getDisplayName().equals(databaseType)) {
-                hbaseRegPrinc = connection.getParameters().get(
-                        ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_REGIONSERVERPRINCIPAL);
+                hbaseRegPrinc = connection.getParameters()
+                        .get(ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_REGIONSERVERPRINCIPAL);
             }
             return getAppropriateValue(connection, hbaseRegPrinc);
         }
@@ -1228,11 +1264,11 @@ public class RepositoryToComponentProperty {
         if (value.equals("USE_MAPRTICKET")) {
             String useMaprTValue = null;
             if (EDatabaseTypeName.HBASE.getDisplayName().equals(databaseType)) {
-                useMaprTValue = connection.getParameters().get(
-                        ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_USE_MAPRTICKET);
+                useMaprTValue = connection.getParameters()
+                        .get(ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_USE_MAPRTICKET);
             } else if (EDatabaseTypeName.MAPRDB.getDisplayName().equals(databaseType)) {
-                useMaprTValue = connection.getParameters().get(
-                        ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_USE_MAPRTICKET);
+                useMaprTValue = connection.getParameters()
+                        .get(ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_USE_MAPRTICKET);
             } else if (EDatabaseTypeName.HIVE.getDisplayName().equals(databaseType)) {
                 useMaprTValue = connection.getParameters()
                         .get(ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_USE_MAPRTICKET);
@@ -1251,36 +1287,36 @@ public class RepositoryToComponentProperty {
             return getAppropriateValue(connection, connUserName);
         }
         if (value.equals("MAPRTICKET_USERNAME")) {
-            String maprticket_Username = connection.getParameters().get(
-                    ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_USERNAME);
+            String maprticket_Username = connection.getParameters()
+                    .get(ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_USERNAME);
             return getAppropriateValue(connection, maprticket_Username);
         }
 
         if (value.equals("MAPRTICKET_PASSWORD")) {
             String maprticket_Password = null;
             if (EDatabaseTypeName.HBASE.getDisplayName().equals(databaseType)) {
-                maprticket_Password = connection.getParameters().get(
-                        ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_MAPRTICKET_PASSWORD);
+                maprticket_Password = connection.getParameters()
+                        .get(ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_MAPRTICKET_PASSWORD);
             } else if (EDatabaseTypeName.MAPRDB.getDisplayName().equals(databaseType)) {
-                maprticket_Password = connection.getParameters().get(
-                        ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MAPRTICKET_PASSWORD);
+                maprticket_Password = connection.getParameters()
+                        .get(ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MAPRTICKET_PASSWORD);
             } else if (EDatabaseTypeName.HIVE.getDisplayName().equals(databaseType)) {
-                maprticket_Password = connection.getParameters().get(
-                        ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_MAPRTICKET_PASSWORD);
+                maprticket_Password = connection.getParameters()
+                        .get(ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_MAPRTICKET_PASSWORD);
             }
             return getAppropriateValue(connection, maprticket_Password);
         }
         if (value.equals("MAPRTICKET_CLUSTER")) {
             String maprticket_Cluster = null;
             if (EDatabaseTypeName.HBASE.getDisplayName().equals(databaseType)) {
-                maprticket_Cluster = connection.getParameters().get(
-                        ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_MAPRTICKET_CLUSTER);
+                maprticket_Cluster = connection.getParameters()
+                        .get(ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_MAPRTICKET_CLUSTER);
             } else if (EDatabaseTypeName.MAPRDB.getDisplayName().equals(databaseType)) {
-                maprticket_Cluster = connection.getParameters().get(
-                        ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MAPRTICKET_CLUSTER);
+                maprticket_Cluster = connection.getParameters()
+                        .get(ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MAPRTICKET_CLUSTER);
             } else if (EDatabaseTypeName.HIVE.getDisplayName().equals(databaseType)) {
-                maprticket_Cluster = connection.getParameters().get(
-                        ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_MAPRTICKET_CLUSTER);
+                maprticket_Cluster = connection.getParameters()
+                        .get(ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_MAPRTICKET_CLUSTER);
             }
             return getAppropriateValue(connection, maprticket_Cluster);
         }
@@ -1304,8 +1340,8 @@ public class RepositoryToComponentProperty {
         }
 
         if (value.equals("SET_HADOOP_LOGIN")) {
-            String setMapRHadoopLogin = connection.getParameters().get(
-                    ConnParameterKeys.CONN_PARA_KEY_MAPRTICKET_SETMAPRHADOOPLOGIN);
+            String setMapRHadoopLogin = connection.getParameters()
+                    .get(ConnParameterKeys.CONN_PARA_KEY_MAPRTICKET_SETMAPRHADOOPLOGIN);
             return Boolean.parseBoolean(setMapRHadoopLogin);
         }
         if (value.equals("HADOOP_LOGIN")) {
@@ -1398,8 +1434,8 @@ public class RepositoryToComponentProperty {
         }
 
         if (value.equals("SSL_TRUST_STORE_PASSWORD") && EDatabaseTypeName.HIVE.getDisplayName().equals(databaseType)) {
-            return getAppropriateValue(connection, connection.getValue(
-                    connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_SSL_TRUST_STORE_PASSWORD), false));
+            return getAppropriateValue(connection, connection
+                    .getValue(connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_SSL_TRUST_STORE_PASSWORD), false));
         }
 
         if (value.equals("HADOOP_CUSTOM_JARS")) {
@@ -1638,8 +1674,8 @@ public class RepositoryToComponentProperty {
     private static boolean isContextMode(Connection connection, String value) {
         IMetadataManagmentUiService mmService = null;
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IMetadataManagmentUiService.class)) {
-            mmService = (IMetadataManagmentUiService) GlobalServiceRegister.getDefault().getService(
-                    IMetadataManagmentUiService.class);
+            mmService = (IMetadataManagmentUiService) GlobalServiceRegister.getDefault()
+                    .getService(IMetadataManagmentUiService.class);
         }
         if (mmService != null) {
             return mmService.isContextMode(connection, value);
@@ -1739,7 +1775,7 @@ public class RepositoryToComponentProperty {
      *
      */
     private static Object getEBCDICFieldValue(EbcdicConnection connection, String value) {
-        //        if ("XC2J_FILE".equals(value)) { //$NON-NLS-1$
+        // if ("XC2J_FILE".equals(value)) { //$NON-NLS-1$
         // if (isContextMode(connection, connection.getFilePath())) {
         // return connection.getMidFile();
         // } else {
@@ -1925,8 +1961,8 @@ public class RepositoryToComponentProperty {
                 Path p = new Path(connection.getXmlFilePath());
                 if ((p.toPortableString()).endsWith("xsd")) { //$NON-NLS-1$
                     if (GlobalServiceRegister.getDefault().isServiceRegistered(IMetadataManagmentUiService.class)) {
-                        IMetadataManagmentUiService mmUIService = (IMetadataManagmentUiService) GlobalServiceRegister
-                                .getDefault().getService(IMetadataManagmentUiService.class);
+                        IMetadataManagmentUiService mmUIService = (IMetadataManagmentUiService) GlobalServiceRegister.getDefault()
+                                .getService(IMetadataManagmentUiService.class);
                         String newPath = mmUIService.getAndOpenXSDFileDialog(p);
                         if (newPath != null) {
                             return TalendQuoteUtils.addQuotes(newPath);
@@ -2086,19 +2122,20 @@ public class RepositoryToComponentProperty {
                 // String label = metadataColumn.getLabel();
                 // String tagName = schema.getTagName();
                 // if (label.equals(tagName)
-                //                            || (label.length() > 1 && label.startsWith("_") && label.substring(1).equals(tagName) && KeywordsValidator //$NON-NLS-1$
+                // || (label.length() > 1 && label.startsWith("_") && label.substring(1).equals(tagName) &&
+                // KeywordsValidator //$NON-NLS-1$
                 // .isKeyword(tagName))) {
                 // Map<String, Object> map = new HashMap<String, Object>();
-                //                        map.put("SCHEMA_COLUMN", tagName); //$NON-NLS-1$
-                //                        map.put("QUERY", TalendQuoteUtils.addQuotes(schema.getRelativeXPathQuery())); //$NON-NLS-1$
+                // map.put("SCHEMA_COLUMN", tagName); //$NON-NLS-1$
+                // map.put("QUERY", TalendQuoteUtils.addQuotes(schema.getRelativeXPathQuery())); //$NON-NLS-1$
                 // tableInfo.add(map);
                 // }
                 // }
                 // }
                 // for (SchemaTarget schema : schemaTargets) {
                 // Map<String, Object> map = new HashMap<String, Object>();
-                //                    map.put("SCHEMA_COLUMN", schema.getTagName()); //$NON-NLS-1$
-                //                    map.put("QUERY", TalendQuoteUtils.addQuotes(schema.getRelativeXPathQuery())); //$NON-NLS-1$
+                // map.put("SCHEMA_COLUMN", schema.getTagName()); //$NON-NLS-1$
+                // map.put("QUERY", TalendQuoteUtils.addQuotes(schema.getRelativeXPathQuery())); //$NON-NLS-1$
                 // tableInfo.add(map);
                 // }
 
@@ -2293,8 +2330,8 @@ public class RepositoryToComponentProperty {
                         IMetadataManagmentService mmService = (IMetadataManagmentService) GlobalServiceRegister.getDefault()
                                 .getService(IMetadataManagmentService.class);
                         IMetadataTable convert = mmService.convertMetadataTable(repTable);
-                        String uinqueTableName = node.getProcess().generateUniqueConnectionName(
-                                MultiSchemasUtil.getConnectionBaseName(repTable.getLabel()));
+                        String uinqueTableName = node.getProcess()
+                                .generateUniqueConnectionName(MultiSchemasUtil.getConnectionBaseName(repTable.getLabel()));
                         convert.setTableName(uinqueTableName);
                         // IProxyRepositoryFactory factory =
                         // CorePlugin.getDefault().getRepositoryService().getProxyRepositoryFactory();
@@ -2484,8 +2521,8 @@ public class RepositoryToComponentProperty {
             if (isContextMode(connection, connection.getBindPassword())) {
                 return connection.getBindPassword();
             } else {
-                return TalendQuoteUtils.addQuotes(connection.getValue(connection.getBindPassword(), false)).replaceAll(
-                        "\\\\", "\\\\\\\\"); //$NON-NLS-1$ //$NON-NLS-2$
+                return TalendQuoteUtils.addQuotes(connection.getValue(connection.getBindPassword(), false)).replaceAll("\\\\", //$NON-NLS-1$
+                        "\\\\\\\\"); //$NON-NLS-1$
             }
         }
         if (value.equals("FILTER")) { //$NON-NLS-1$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/ITargetExecutionConfig.java

@@ -43,4 +43,14 @@ public interface ITargetExecutionConfig extends IServerConfiguration {
 	public String getRunAsUser();
 	
 	public void setRunAsUser(String runAsUser);
+
+	// If the remote id is not null means this execution configuration from TAC
+	public Integer getRemoteId();
+
+	public boolean isVirtualServer();
+	
+	public boolean isActiveServer();
+	
+	public String getEncryptedPassword();
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/ERepositoryObjectType.java

@@ -361,6 +361,10 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
     public final static ERepositoryObjectType METADATA_SAP_CONTENT_EXTRACTOR = new ERepositoryObjectType("repository.SAPTable", //$NON-NLS-1$
             "METADATA_SAP_CONTENT_EXTRACTOR", 105, true, true, new String[] { PROD_DI }, new String[] {}, false);
 
+    public final static ERepositoryObjectType METADATA_CON_CALCULATION_VIEW = new ERepositoryObjectType(
+            "repository.metadataCalculationView", "METADATA_CON_CALCULATION_VIEW", 106, true, true, new String[] { PROD_DI },
+            new String[] {}, false);
+
     private String label;
 
     private String alias;
@@ -537,6 +541,9 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
      */
     public final static ERepositoryObjectType PROCESS_SPARKSTREAMING = ERepositoryObjectType.valueOf("PROCESS_SPARKSTREAMING");
 
+    public final static ERepositoryObjectType METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT = ERepositoryObjectType
+            .valueOf("METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT"); //$NON-NLS-1$
+
     public final static ERepositoryObjectType METADATA_SAP_BW_DATASOURCE = ERepositoryObjectType
             .valueOf("METADATA_SAP_BW_DATASOURCE"); //$NON-NLS-1$
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ui/images/RepositoryImageProvider.java

@@ -67,7 +67,8 @@ public class RepositoryImageProvider {
             return ECoreImage.METADATA_COLUMN_ICON;
         } else if (type == ERepositoryObjectType.METADATA_CON_QUERY) {
             return ECoreImage.METADATA_QUERY_ICON;
-        } else if (type == ERepositoryObjectType.METADATA_CON_VIEW) {
+        } else if (type == ERepositoryObjectType.METADATA_CON_VIEW
+                || type == ERepositoryObjectType.METADATA_CON_CALCULATION_VIEW) {
             return ECoreImage.METADATA_VIEW_ICON;
         } else if (type == ERepositoryObjectType.METADATA_CON_SYNONYM) {
             return ECoreImage.METADATA_SYNONYM_ICON;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java

@@ -316,6 +316,12 @@ public final class ProjectManager {
                 return getProject(((Property) object).getItem());
             }
             if (object instanceof Item) {
+                if (((Item) object).getParent() == null) { // may be a routelet from reference project
+                    org.talend.core.model.properties.Project refProject = getProjectFromItemWithoutParent((Item)object);
+                    if (refProject != null) {
+                        return refProject;
+                    }
+                }
                 return getProject(((Item) object).getParent());
             }
         }
@@ -328,6 +334,46 @@ public final class ProjectManager {
         return null;
     }
 
+    /*
+     * Returns the project name found from the current path if the parent is null
+     */
+    private org.talend.core.model.properties.Project getProjectFromItemWithoutParent(Item item) {
+
+        final String URI_PREFIX = "platform:/resource/"; //$NON-NLS-1$
+
+        org.talend.core.model.properties.ItemState state = item.getState();
+
+        if ( state != null) {
+            if (state instanceof org.eclipse.emf.ecore.impl.EObjectImpl) {
+                org.eclipse.emf.common.util.URI eProxyUri = ((org.eclipse.emf.ecore.impl.EObjectImpl)state).eProxyURI();
+                if (eProxyUri == null) {
+                    return null;
+                }
+                String eProxyUriString = eProxyUri.toString();
+                if (eProxyUriString != null && eProxyUriString.startsWith(URI_PREFIX)) {
+                    
+                    String tmpString = eProxyUriString.substring(URI_PREFIX.length());
+                    String projectLabel = tmpString.substring(0, tmpString.indexOf("/")); //$NON-NLS-1$
+
+                    if (currentProject == null) {
+                        initCurrentProject();
+                    }
+
+                    if (currentProject.getTechnicalLabel().equalsIgnoreCase(projectLabel)) {
+                        return currentProject.getEmfProject();
+                    }
+                    for (Project project : getAllReferencedProjects()) {
+                        if (project.getTechnicalLabel().equalsIgnoreCase(projectLabel)) {
+                            return project.getEmfProject();
+                        }
+                    }
+                }
+            }
+        }
+
+        return null;
+    }
+
     public org.talend.core.model.properties.Project getProject(Project project, EObject object) {
         if (object != null) {
             if (object instanceof org.talend.core.model.properties.Project) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/UpdateRepositoryUtils.java

@@ -21,9 +21,11 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.core.GlobalServiceRegister;
+import org.talend.core.database.EDatabaseTypeName;
 import org.talend.core.model.metadata.IMetadataTable;
 import org.talend.core.model.metadata.MetadataToolHelper;
 import org.talend.core.model.metadata.builder.connection.Connection;
+import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
 import org.talend.core.model.metadata.builder.connection.MetadataTable;
 import org.talend.core.model.metadata.builder.connection.QueriesConnection;
 import org.talend.core.model.metadata.builder.connection.Query;
@@ -318,8 +320,8 @@ public final class UpdateRepositoryUtils {
                 // Generic
                 IGenericWizardService wizardService = null;
                 if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
-                    wizardService = (IGenericWizardService) GlobalServiceRegister.getDefault().getService(
-                            IGenericWizardService.class);
+                    wizardService = (IGenericWizardService) GlobalServiceRegister.getDefault()
+                            .getService(IGenericWizardService.class);
                 }
                 if (wizardService != null) {
                     Property property = ((ConnectionItem) item).getProperty();
@@ -411,7 +413,19 @@ public final class UpdateRepositoryUtils {
                 Object tableObject = tables.get(0);
                 if (tableObject instanceof MetadataTable) {
                     for (MetadataTable table : tables) {
+                        boolean has = false;
                         if (table.getLabel().equals(tableLable)) {
+                            has = true;
+                        }
+                        if (connection instanceof DatabaseConnection) {
+                            DatabaseConnection dbConnection = (DatabaseConnection) connection;
+                            if (EDatabaseTypeName.SAPHana.getDisplayName().equals(dbConnection.getDatabaseType())) {
+                                if (table.getName().equals(tableLable)) {
+                                    has = true;
+                                }
+                            }
+                        }
+                        if (has) {
                             if (GlobalServiceRegister.getDefault().isServiceRegistered(IMetadataManagmentService.class)) {
                                 IMetadataManagmentService mmService = (IMetadataManagmentService) GlobalServiceRegister
                                         .getDefault().getService(IMetadataManagmentService.class);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/model/IRepositoryService.java

@@ -128,4 +128,6 @@ public interface IRepositoryService extends IService {
 
     public void openProjectSettingDialog(final String pageId);
 
+    public boolean askRetryForNetworkIssue(Throwable ex);
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/model/RepositoryConstants.java

@@ -81,6 +81,8 @@ public class RepositoryConstants {
 
     public static final String REPOSITORY_REMOTE_ID = "remote"; //$NON-NLS-1$
 
+    public static final String REPOSITORY_CLOUD_ID = "cloud"; //$NON-NLS-1$
+
     public static final String REPOSITORY_URL = "url"; //$NON-NLS-1$
 
     public static final String TDQ_ALL_ITEM_PATTERN = ".*"; //$NON-NLS-1$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/model/RepositoryNodeUtilities.java

@@ -484,6 +484,7 @@ public class RepositoryNodeUtilities {
 
             ERepositoryObjectType tmpType = null;
             if (curType == ERepositoryObjectType.METADATA_CON_TABLE || curType == ERepositoryObjectType.METADATA_CON_VIEW
+                    || curType == ERepositoryObjectType.METADATA_CON_CALCULATION_VIEW
                     || curType == ERepositoryObjectType.METADATA_CON_SYNONYM
                     || curType == ERepositoryObjectType.METADATA_CON_QUERY
                     || curType == ERepositoryObjectType.METADATA_CONNECTIONS

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/preference/CorePreferencePage.java

@@ -30,6 +30,7 @@ import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.PlatformUI;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.ICoreService;
+import org.talend.core.PluginChecker;
 import org.talend.core.model.xml.XmlArray;
 import org.talend.core.prefs.ITalendCorePrefConstants;
 import org.talend.core.ui.i18n.Messages;
@@ -77,7 +78,9 @@ public class CorePreferencePage extends FieldEditorPreferencePage implements IWo
                 Messages.getString("CorePreferencePage.temporaryFiles"), fieldEditorParent); //$NON-NLS-1$
         addField(filePathTemp);
         FileFieldEditor javaInterpreter = new FileFieldEditor(ITalendCorePrefConstants.JAVA_INTERPRETER,
-                Messages.getString("CorePreferencePage.javaInterpreter"), true, fieldEditorParent) {; //$NON-NLS-1$
+                Messages.getString("CorePreferencePage.javaInterpreter"), true, fieldEditorParent) {
+//$NON-NLS-0$
+            ;
 
             @Override
             protected boolean checkState() {
@@ -102,10 +105,12 @@ public class CorePreferencePage extends FieldEditorPreferencePage implements IWo
                 Messages.getString("CorePreferencePage.iReportPath"), fieldEditorParent); //$NON-NLS-1$
         addField(ireportPath);
 
-        BooleanFieldEditor alwaysWelcome = new BooleanFieldEditor(ITalendCorePrefConstants.ALWAYS_WELCOME,
-                Messages.getString("CorePreferencePage.alwaysWelcome.v2"), //$NON-NLS-1$
-                fieldEditorParent);
-        addField(alwaysWelcome);
+        if (PluginChecker.isTIS()) {
+            BooleanFieldEditor alwaysWelcome = new BooleanFieldEditor(ITalendCorePrefConstants.ALWAYS_WELCOME,
+                    Messages.getString("CorePreferencePage.alwaysWelcome.v2"), //$NON-NLS-1$
+                    fieldEditorParent);
+            addField(alwaysWelcome);
+        }
 
         alwaysAskAtStartup = new BooleanFieldEditor(ITalendCorePrefConstants.LOGON_DIALOG_ALWAYS_ASK_ME_AT_STARTUP,
                 Messages.getString("CorePreferencePage.alwaysAskAtStartup"), //$NON-NLS-1$

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/services/IGitUIProviderService.java

@@ -1,14 +1,16 @@
 package org.talend.core.ui.services;
 
+import java.io.Serializable;
+
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
 import org.talend.core.IService;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.ui.properties.tab.IDynamicProperty;
 
-
-public interface IGitUIProviderService extends IService{
+public interface IGitUIProviderService extends IService {
 
     boolean isGitHistoryComposite(IDynamicProperty dp);
 
@@ -17,4 +19,6 @@ public interface IGitUIProviderService extends IService{
     IDynamicProperty createProcessGitHistoryComposite(Composite parent, Object view, TabbedPropertySheetWidgetFactory factory,
             IRepositoryViewObject obj);
 
+    public String[] changeCredentials(Shell parent, Serializable uriIsh, String initUser, boolean canStoreCredentials);
+
 }

main/plugins/org.talend.core/src/main/java/org/talend/core/model/runprocess/IEclipseProcessor.java

@@ -26,4 +26,6 @@ public interface IEclipseProcessor {
     public ILaunchConfiguration debug() throws ProcessorException;
 
     public void setTargetExecutionConfig(ITargetExecutionConfig serverConfiguration);
+    
+    public ITargetExecutionConfig getTargetExecutionConfig();
 }

main/plugins/org.talend.core/src/main/java/org/talend/core/services/IGITProviderService.java

@@ -34,4 +34,6 @@ public interface IGITProviderService extends IService {
 
     public void gitEclipseHandlerDelete(IProject eclipseProject, Project currentProject, String filePath);
 
+    public void clean();
+
 }

main/plugins/org.talend.core/src/main/java/org/talend/core/services/ISVNProviderService.java

@@ -35,4 +35,6 @@ public interface ISVNProviderService extends IService {
     public void svnEclipseHandlerDelete(IProject eclipseProject, Project currentProject, String filePath);
 
     public String getProjectUrl(Project project);
+
+    public void clean();
 }

main/plugins/org.talend.designer.maven.tos/resources/components/pom.xml

@@ -36,6 +36,11 @@
 	</repositories>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.talend.components</groupId>
+			<artifactId>components-couchbase</artifactId>
+			<version>${components.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.talend.components</groupId>
 			<artifactId>components-salesforce-runtime</artifactId>

main/plugins/org.talend.libraries.apache.cassandra/plugin.xml

@@ -53,6 +53,12 @@
             mvn_uri="mvn:org.talend.libraries/spark-cassandra-connector-assembly-2.0.2-patched-20170519/6.0.0"
             name="spark-cassandra-connector-assembly-2.0.2-patched-20170519.jar">
       </libraryNeeded>
+      <libraryNeeded
+            context="plugin:org.talend.libraries.apache.cassandra"
+            id="spark-cassandra-connector-assembly-2.0.5-patched-20171023.jar"
+            mvn_uri="mvn:org.talend.libraries/spark-cassandra-connector-assembly-2.0.5-patched-20171023/6.0.0"
+            name="spark-cassandra-connector-assembly-2.0.5-patched-20171023.jar">
+      </libraryNeeded>
    </extension>
 
 </plugin>

main/plugins/org.talend.librariesmanager.ui/src/main/java/messages.properties

@@ -108,12 +108,13 @@ InstallModuleDialog.copyURIBtn=Copy default MVN URI.
 InstallModuleDialog.error.findbyURI=The maven URI is not valid, please input a valid URI!
 
 ConfigModuleDialog.text=Module
-ConfigModuleDialog.message=Select a module .
+ConfigModuleDialog.message=Select a module : {0}
+ConfigModuleDialog.install.message=Install a module : {0}
 ConfigModuleDialog.platfromBtn=Platform
 ConfigModuleDialog.repositoryBtn=Artifact repository(local m2/nexus)
 ConfigModuleDialog.installNewBtn=Install a new module
 ConfigModuleDialog.findExistByNameBtn=Find by name
-ConfigModuleDialog.findExistByURIBtn=Find by maven RUI
+ConfigModuleDialog.findExistByURIBtn=Find by maven URI
 ConfigModuleDialog.moduleName.error=Please input a valid file name !
 ConfigModuleDialog.jarNotInstalled.error=This jar is not installed in the artifact repository, please install it !
 

main/plugins/org.talend.librariesmanager.ui/src/main/java/org/talend/librariesmanager/ui/dialogs/ConfigModuleDialog.java

@@ -299,7 +299,7 @@ public class ConfigModuleDialog extends TitleAreaDialog implements IConfigModule
             setupMavenURIByModuleName(moduleName);
             useCustomBtn.setEnabled(false);
             customUriText.setEnabled(false);
-            setMessage(Messages.getString("ConfigModuleDialog.message"), IMessageProvider.INFORMATION);
+            setMessage(Messages.getString("ConfigModuleDialog.message", moduleName), IMessageProvider.INFORMATION);
             getButton(IDialogConstants.OK_ID).setEnabled(true);
         }
     }
@@ -362,6 +362,9 @@ public class ConfigModuleDialog extends TitleAreaDialog implements IConfigModule
                 File file = new File(jarPathTxt.getText());
                 moduleName = file.getName();
                 setupMavenURIByModuleName(moduleName);
+                if (useCustomBtn.getSelection()) {
+                    customUriText.setEnabled(true);
+                }
                 checkErrorForInstall();
             }
         });
@@ -423,13 +426,36 @@ public class ConfigModuleDialog extends TitleAreaDialog implements IConfigModule
                     customUriText.setText("");
                     return;
                 }
-                moduleName = MavenUrlHelper.generateModuleNameByMavenURI(uri);
-                setupMavenURIByModuleName(moduleName);
-                // set current uri as new cusotm uri
-                if (!uri.equals(defaultUriTxt.getText().trim())) {
-                    customUriText.setText(uri);
-                    useCustomBtn.setSelection(true);
-                    layoutWarningComposite(false, defaultUriTxt.getText().trim());
+                ModuleNeeded testModule = new ModuleNeeded("", "", true, uri);
+                moduleName = testModule.getModuleName();
+                uri = testModule.getDefaultMavenURI();
+                ModuleNeeded found = null;
+                for (ModuleNeeded module : ModulesNeededProvider.getAllManagedModules()) {
+                    if (moduleName.equals(module.getModuleName())) {
+                        found = module;
+                        break;
+                    }
+                }
+                if (found != null) {
+                    String defualtURIFromModule = found.getDefaultMavenURI();
+                    String customURIFromModule = found.getCustomMavenUri();
+                    defaultUriTxt.setText(defualtURIFromModule);
+                    if (uri.equalsIgnoreCase(defualtURIFromModule) && customURIFromModule != null) {
+                        useCustomBtn.setSelection(false);
+                        customUriText.setText("");
+                        layoutWarningComposite(false, defaultUriTxt.getText().trim());
+                    } else if (!uri.equals(defualtURIFromModule)
+                            || (customURIFromModule != null && !customURIFromModule.equals(uri))) {
+                        customUriText.setText(uri);
+                        useCustomBtn.setSelection(true);
+                        layoutWarningComposite(false, defaultUriTxt.getText().trim());
+                    }
+                } else {
+                    setupMavenURIByModuleName(moduleName);
+                    if (!uri.equals(defaultUriTxt.getText())) {
+                        customUriText.setText(uri);
+                        useCustomBtn.setSelection(true);
+                    }
                 }
                 checkInstallStatusErrorForFindExisting();
             }
@@ -592,14 +618,14 @@ public class ConfigModuleDialog extends TitleAreaDialog implements IConfigModule
         if (deployed) {
             setMessage(Messages.getString("InstallModuleDialog.error.jarexsit"), IMessageProvider.ERROR);
         } else {
-            checkErrorForInstall();
+            setMessage(Messages.getString("ConfigModuleDialog.install.message", moduleName), IMessageProvider.INFORMATION);
         }
     }
 
     private void handleDetectPressedForFindExsting() {
         boolean deployed = checkInstalledStatusInMaven();
         if (deployed) {
-            setMessage(Messages.getString("ConfigModuleDialog.message"), IMessageProvider.INFORMATION);
+            setMessage(Messages.getString("ConfigModuleDialog.message", moduleName), IMessageProvider.INFORMATION);
         } else {
             setMessage(Messages.getString("ConfigModuleDialog.jarNotInstalled.error"), IMessageProvider.ERROR);
         }
@@ -621,7 +647,7 @@ public class ConfigModuleDialog extends TitleAreaDialog implements IConfigModule
 
     private void handleButtonPressed() {
         FileDialog dialog = new FileDialog(getShell());
-        dialog.setText(Messages.getString("InstallModuleDialog.title")); //$NON-NLS-1$
+        dialog.setText(Messages.getString("ConfigModuleDialog.install.message", moduleName)); //$NON-NLS-1$
 
         String filePath = this.jarPathTxt.getText().trim();
         if (filePath.length() == 0) {
@@ -666,7 +692,7 @@ public class ConfigModuleDialog extends TitleAreaDialog implements IConfigModule
 
         }
 
-        setMessage(Messages.getString("ConfigModuleDialog.message"), IMessageProvider.INFORMATION);
+        setMessage(Messages.getString("ConfigModuleDialog.message", moduleName), IMessageProvider.INFORMATION);
         getButton(IDialogConstants.OK_ID).setEnabled(true);
         return true;
     }
@@ -754,7 +780,7 @@ public class ConfigModuleDialog extends TitleAreaDialog implements IConfigModule
                 return false;
             }
         }
-        setMessage(Messages.getString("ConfigModuleDialog.message"), IMessageProvider.INFORMATION);
+        setMessage(Messages.getString("ConfigModuleDialog.message", moduleName), IMessageProvider.INFORMATION);
         return true;
     }
 

main/plugins/org.talend.librariesmanager.ui/src/main/java/org/talend/librariesmanager/utils/ModuleMavenURIUtils.java

@@ -138,7 +138,7 @@ public class ModuleMavenURIUtils {
 
         if (!deployStatus[0]) {
             ModuleStatusProvider.putDeployStatus(mvnURI, ELibraryInstallStatus.NOT_DEPLOYED);
-            ModuleStatusProvider.putStatus(mvnURI, ELibraryInstallStatus.NOT_INSTALLED);
+            // ModuleStatusProvider.putStatus(mvnURI, ELibraryInstallStatus.NOT_INSTALLED);
         }
 
         return deployStatus[0];

main/plugins/org.talend.librariesmanager.ui/src/main/java/org/talend/librariesmanager/utils/RemoteModulesHelper.java

@@ -392,8 +392,8 @@ public class RemoteModulesHelper {
             m.setName(name);
             m.setDescription(getFirstDescription(neededModules));
         }
-        ExceptionHandler.log("The download URL for " + name + " is not available (" + mvnUri + ")");//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         if (CommonsPlugin.isDebugMode()) {
+            ExceptionHandler.log("The download URL for " + name + " is not available (" + mvnUri + ")");//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
             appendToLogFile(mvnUri + "\n");//$NON-NLS-1$
         }
 

main/plugins/org.talend.librariesmanager.ui/src/main/java/org/talend/librariesmanager/utils/nexus/NexusDownloader.java

@@ -20,6 +20,7 @@ import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import org.eclipse.core.resources.IProject;
@@ -103,19 +104,30 @@ public class NexusDownloader implements IDownloadHelper {
                 int contentLength = connection.getContentLength();
                 fireDownloadStart(contentLength);
 
+                int refreshInterval = 1000;
+                if (contentLength < BUFFER_SIZE * 10) {
+                    refreshInterval = contentLength / 200;
+                }
                 int bytesDownloaded = 0;
                 byte[] buf = new byte[BUFFER_SIZE];
                 int bytesRead = -1;
+                long startTime = new Date().getTime();
+                int byteReadInloop = 0;
                 while ((bytesRead = bis.read(buf)) != -1) {
                     bos.write(buf, 0, bytesRead);
-                    fireDownloadProgress(bytesRead);
+                    long currentTime = new Date().getTime();
+                    byteReadInloop = byteReadInloop + bytesRead;
+                    if (currentTime - startTime > refreshInterval) {
+                        startTime = currentTime;
+                        fireDownloadProgress(byteReadInloop);
+                        byteReadInloop = 0;
+                    }
                     bytesDownloaded += bytesRead;
                     if (isCancel()) {
                         return;
                     }
                 }
                 bos.flush();
-                bos.close();
                 if (bytesDownloaded == contentLength) {
                     MavenArtifactsHandler deployer = new MavenArtifactsHandler();
                     deployer.install(downloadedFile.getAbsolutePath(), mavenUri);

main/plugins/org.talend.librariesmanager/resources/java/routines/system/BufferedOutput.java

@@ -64,8 +64,16 @@ public class BufferedOutput extends java.io.Writer {
         nChars = sz;
         nextChar = 0;
 
-        lineSeparator = (String) java.security.AccessController.doPrivileged(new sun.security.action.GetPropertyAction(
-                "line.separator")); //$NON-NLS-1$
+        lineSeparator = java.security.AccessController.doPrivileged(
+            new java.security.PrivilegedAction<String>() {
+
+              @Override
+              public String run() {
+                return System.getProperty("line.separator"); //$NON-NLS-1$
+              }
+              
+            }
+        );
     }
 
     /** Check to make sure that the stream has not been closed */

main/plugins/org.talend.librariesmanager/resources/java/routines/system/Constant.java

@@ -6,7 +6,7 @@ package routines.system;
  * @author Administrator
  *
  */
-public abstract class Constant {
+public class Constant {
 
     /**
      * the default pattern for date parse and format
@@ -14,8 +14,16 @@ public abstract class Constant {
     public static final String dateDefaultPattern = "dd-MM-yyyy";
 
     /**
-     * the default user agent string for AWS components
+     * the default user agent string for AWS and Azure components
      */
-    public static final String TALEND_USER_AGENT = "APN/1.0 Talend/6.4 Studio/6.4";
-
+    public static String getUserAgent(String studioVersion) {
+        return  "APN/1.0 Talend/" + studioVersion + " Studio/" + studioVersion;
+    }
+    
+    /**
+     * the default user agent string for GCS components
+     */
+    public static String getUserAgentGCS(String studioVersion) {
+        return "Studio/" + studioVersion + " (GPN:Talend) DataIntegration/" + studioVersion + " Jets3t/0.9.1";
+    }
 }

main/plugins/org.talend.metadata.managment.ui/src/main/java/org/talend/metadata/managment/ui/utils/OtherConnectionContextUtils.java

@@ -25,6 +25,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.talend.core.language.ECodeLanguage;
 import org.talend.core.language.LanguageManager;
 import org.talend.core.model.context.ContextUtils;
+import org.talend.core.model.metadata.ISAPConstant;
 import org.talend.core.model.metadata.builder.connection.AdditionalConnectionProperty;
 import org.talend.core.model.metadata.builder.connection.ConnectionFactory;
 import org.talend.core.model.metadata.builder.connection.FTPConnection;
@@ -44,6 +45,7 @@ import org.talend.core.model.properties.ContextItem;
 import org.talend.core.model.utils.ContextParameterUtils;
 import org.talend.core.ui.context.model.table.ConectionAdaptContextVariableModel;
 import org.talend.core.utils.TalendQuoteUtils;
+import org.talend.cwm.helper.TaggedValueHelper;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
 import org.talend.metadata.managment.ui.model.IConnParamName;
 
@@ -109,7 +111,7 @@ public final class OtherConnectionContextUtils {
         Encoding,
         // These constants seems to be used by deprecated code
         // Added temporary to avoid studio build failure
-        MDMURL,     
+        MDMURL,
         UNIVERSE,
         DATACLUSTER,
         DATAMODEL,
@@ -131,6 +133,12 @@ public final class OtherConnectionContextUtils {
         Client,
         SystemNumber,
         Language,
+        // Hana database properties
+        DbHost,
+        DbPort,
+        DbSchema,
+        DbUsername,
+        DbPassword,
     }
 
     /*
@@ -515,7 +523,8 @@ public final class OtherConnectionContextUtils {
         ConnectionContextHelper.createParameters(varList, paramName, conn.getUsername());
 
         paramName = prefixName + EParamName.MDM_Password;
-        ConnectionContextHelper.createParameters(varList, paramName, conn.getValue(conn.getPassword(), false), JavaTypesManager.PASSWORD);
+        ConnectionContextHelper.createParameters(varList, paramName, conn.getValue(conn.getPassword(), false),
+                JavaTypesManager.PASSWORD);
 
         paramName = prefixName + EParamName.MDM_URL;
         ConnectionContextHelper.createParameters(varList, paramName, conn.getServerUrl());
@@ -580,6 +589,28 @@ public final class OtherConnectionContextUtils {
                 case Language:
                     ConnectionContextHelper.createParameters(varList, paramName, conn.getLanguage());
                     break;
+                // Hana database properties
+                case DbHost:
+                    ConnectionContextHelper.createParameters(varList, paramName,
+                            TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_HOST, conn));
+                    break;
+                case DbPort:
+                    ConnectionContextHelper.createParameters(varList, paramName,
+                            TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_PORT, conn));
+                    break;
+                case DbSchema:
+                    ConnectionContextHelper.createParameters(varList, paramName,
+                            TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_SCHEMA, conn));
+                    break;
+                case DbUsername:
+                    ConnectionContextHelper.createParameters(varList, paramName,
+                            TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_USERNAME, conn));
+                    break;
+                case DbPassword:
+                    ConnectionContextHelper.createParameters(varList, paramName,
+                            conn.getValue(TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_PASSWORD, conn), false),
+                            JavaTypesManager.PASSWORD);
+                    break;
                 default:
                 }
             }
@@ -649,7 +680,8 @@ public final class OtherConnectionContextUtils {
         setSAPConnectionAdditionPropertiesForContextMode(sapConn);
     }
 
-    static void setSAPConnnectionBasicPropertiesForContextMode(SAPConnection sapConn, EParamName sapParam, String sapBasicVarName) {
+    static void setSAPConnnectionBasicPropertiesForContextMode(SAPConnection sapConn, EParamName sapParam,
+            String sapBasicVarName) {
         switch (sapParam) {
         case Client:
             sapConn.setClient(ContextParameterUtils.getNewScriptCode(sapBasicVarName, LANGUAGE));
@@ -669,6 +701,27 @@ public final class OtherConnectionContextUtils {
         case Language:
             sapConn.setLanguage(ContextParameterUtils.getNewScriptCode(sapBasicVarName, LANGUAGE));
             break;
+        // Hana database properties
+        case DbHost:
+            TaggedValueHelper.setTaggedValue(sapConn, ISAPConstant.PROP_DB_HOST,
+                    ContextParameterUtils.getNewScriptCode(sapBasicVarName, LANGUAGE));
+            break;
+        case DbPort:
+            TaggedValueHelper.setTaggedValue(sapConn, ISAPConstant.PROP_DB_PORT,
+                    ContextParameterUtils.getNewScriptCode(sapBasicVarName, LANGUAGE));
+            break;
+        case DbSchema:
+            TaggedValueHelper.setTaggedValue(sapConn, ISAPConstant.PROP_DB_SCHEMA,
+                    ContextParameterUtils.getNewScriptCode(sapBasicVarName, LANGUAGE));
+            break;
+        case DbUsername:
+            TaggedValueHelper.setTaggedValue(sapConn, ISAPConstant.PROP_DB_USERNAME,
+                    ContextParameterUtils.getNewScriptCode(sapBasicVarName, LANGUAGE));
+            break;
+        case DbPassword:
+            TaggedValueHelper.setTaggedValue(sapConn, ISAPConstant.PROP_DB_PASSWORD,
+                    ContextParameterUtils.getNewScriptCode(sapBasicVarName, LANGUAGE));
+            break;
         default:
         }
     }
@@ -685,12 +738,13 @@ public final class OtherConnectionContextUtils {
         String host = TalendQuoteUtils.removeQuotes(ConnectionContextHelper.getOriginalValue(contextType, conn.getHost()));
         String userName = TalendQuoteUtils
                 .removeQuotes(ConnectionContextHelper.getOriginalValue(contextType, conn.getUsername()));
-        String passWord = TalendQuoteUtils.removeQuotes(ConnectionContextHelper.getOriginalValue(contextType,
-                conn.getValue(conn.getPassword(), false)));
-        String systemNumber = TalendQuoteUtils.removeQuotes(ConnectionContextHelper.getOriginalValue(contextType,
-                conn.getSystemNumber()));
+        String passWord = TalendQuoteUtils
+                .removeQuotes(ConnectionContextHelper.getOriginalValue(contextType, conn.getValue(conn.getPassword(), false)));
+        String systemNumber = TalendQuoteUtils
+                .removeQuotes(ConnectionContextHelper.getOriginalValue(contextType, conn.getSystemNumber()));
         String language = TalendQuoteUtils
                 .removeQuotes(ConnectionContextHelper.getOriginalValue(contextType, conn.getLanguage()));
+        conn.setContextMode(false);
         conn.setClient(client);
         conn.setHost(host);
         conn.setUsername(userName);
@@ -699,10 +753,26 @@ public final class OtherConnectionContextUtils {
         conn.setLanguage(language);
 
         for (AdditionalConnectionProperty sapProperty : conn.getAdditionalProperties()) {
-            String contextPropertyValue = TalendQuoteUtils.removeQuotes(ConnectionContextHelper.getOriginalValue(contextType,
-                    sapProperty.getValue()));
+            String contextPropertyValue = TalendQuoteUtils
+                    .removeQuotes(ConnectionContextHelper.getOriginalValue(contextType, sapProperty.getValue()));
             sapProperty.setValue(contextPropertyValue);
         }
+        // Hana database properties
+        String dbHost = TalendQuoteUtils.removeQuotes(ConnectionContextHelper.getOriginalValue(contextType,
+                TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_HOST, conn)));
+        String dbPort = TalendQuoteUtils.removeQuotes(ConnectionContextHelper.getOriginalValue(contextType,
+                TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_PORT, conn)));
+        String dbSchema = TalendQuoteUtils.removeQuotes(ConnectionContextHelper.getOriginalValue(contextType,
+                TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_SCHEMA, conn)));
+        String dbUsername = TalendQuoteUtils.removeQuotes(ConnectionContextHelper.getOriginalValue(contextType,
+                TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_USERNAME, conn)));
+        String dbPassword = TalendQuoteUtils.removeQuotes(ConnectionContextHelper.getOriginalValue(contextType,
+                conn.getValue(TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_PASSWORD, conn), false)));
+        TaggedValueHelper.setTaggedValue(conn, ISAPConstant.PROP_DB_HOST, dbHost);
+        TaggedValueHelper.setTaggedValue(conn, ISAPConstant.PROP_DB_PORT, dbPort);
+        TaggedValueHelper.setTaggedValue(conn, ISAPConstant.PROP_DB_SCHEMA, dbSchema);
+        TaggedValueHelper.setTaggedValue(conn, ISAPConstant.PROP_DB_USERNAME, dbUsername);
+        TaggedValueHelper.setTaggedValue(conn, ISAPConstant.PROP_DB_PASSWORD, conn.getValue(dbPassword, true));
     }
 
     public static SAPConnection cloneOriginalValueSAPConnection(SAPConnection fileConn, ContextType contextType) {
@@ -732,6 +802,23 @@ public final class OtherConnectionContextUtils {
                 prop.setValue(propValue);
             }
         }
+        // Hana database properties
+        String dbHost = ConnectionContextHelper.getOriginalValue(contextType,
+                TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_HOST, fileConn));
+        String dbPort = ConnectionContextHelper.getOriginalValue(contextType,
+                TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_PORT, fileConn));
+        String dbSchema = ConnectionContextHelper.getOriginalValue(contextType,
+                TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_SCHEMA, fileConn));
+        String dbUsername = ConnectionContextHelper.getOriginalValue(contextType,
+                TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_USERNAME, fileConn));
+        String dbPassword = ConnectionContextHelper.getOriginalValue(contextType,
+                fileConn.getValue(TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_PASSWORD, fileConn), false));
+        TaggedValueHelper.setTaggedValue(cloneConn, ISAPConstant.PROP_DB_HOST, dbHost);
+        TaggedValueHelper.setTaggedValue(cloneConn, ISAPConstant.PROP_DB_PORT, dbPort);
+        TaggedValueHelper.setTaggedValue(cloneConn, ISAPConstant.PROP_DB_SCHEMA, dbSchema);
+        TaggedValueHelper.setTaggedValue(cloneConn, ISAPConstant.PROP_DB_USERNAME, dbUsername);
+        TaggedValueHelper.setTaggedValue(cloneConn, ISAPConstant.PROP_DB_PASSWORD, dbPassword);
+
         ConnectionContextHelper.cloneConnectionProperties(fileConn, cloneConn);
 
         return cloneConn;
@@ -783,7 +870,8 @@ public final class OtherConnectionContextUtils {
         }
     }
 
-    static void setMDMConnnectionBasicPropertiesForContextMode(MDMConnection mdmConn, EParamName mdmParam, String mdmBasicVarName) {
+    static void setMDMConnnectionBasicPropertiesForContextMode(MDMConnection mdmConn, EParamName mdmParam,
+            String mdmBasicVarName) {
         switch (mdmParam) {
         case MDM_URL:
             mdmConn.setServerUrl(ContextParameterUtils.getNewScriptCode(mdmBasicVarName, LANGUAGE));
@@ -802,9 +890,12 @@ public final class OtherConnectionContextUtils {
         if (conn == null || contextType == null) {
             return;
         }
-        String username = TalendQuoteUtils.removeQuotes(ConnectionContextHelper.getOriginalValue(contextType, conn.getUsername()));
-        String password = TalendQuoteUtils.removeQuotes(ConnectionContextHelper.getOriginalValue(contextType, conn.getPassword()));       
-        String serverUrl = TalendQuoteUtils.removeQuotes(ConnectionContextHelper.getOriginalValue(contextType, conn.getServerUrl()));
+        String username = TalendQuoteUtils
+                .removeQuotes(ConnectionContextHelper.getOriginalValue(contextType, conn.getUsername()));
+        String password = TalendQuoteUtils
+                .removeQuotes(ConnectionContextHelper.getOriginalValue(contextType, conn.getPassword()));
+        String serverUrl = TalendQuoteUtils
+                .removeQuotes(ConnectionContextHelper.getOriginalValue(contextType, conn.getServerUrl()));
 
         conn.setUsername(username);
         conn.setPassword(password);
@@ -1548,7 +1639,8 @@ public final class OtherConnectionContextUtils {
 
     }
 
-    public static SAPConnection getOriginalValueConnection(SAPConnection connection, String contextString, boolean defaultContext) {
+    public static SAPConnection getOriginalValueConnection(SAPConnection connection, String contextString,
+            boolean defaultContext) {
         if (connection.isContextMode()) {
             ContextType contextType = ConnectionContextHelper.getContextTypeForContextMode(connection, contextString,
                     defaultContext);

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/core/model/metadata/builder/database/ExtractMetaDataFromDataBase.java

@@ -26,8 +26,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import metadata.managment.i18n.Messages;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.apache.log4j.Logger;
@@ -63,6 +61,8 @@ import org.talend.metadata.managment.repository.ManagerConnection;
 import org.talend.utils.sql.ConnectionUtils;
 import org.talend.utils.sql.metadata.constants.GetTable;
 
+import metadata.managment.i18n.Messages;
+
 /**
  * DOC cantoine. Extract Meta Data Table. Contains all the Table and Metadata about a DB Connection. <br/>
  * 
@@ -86,6 +86,7 @@ public class ExtractMetaDataFromDataBase {
         TABLETYPE_BASE_TABLE("BASE TABLE"), //for mariadb //$NON-NLS-1$ 
         TABLETYPE_VIEW("VIEW"), //$NON-NLS-1$
         TABLETYPE_SYNONYM("SYNONYM"), //$NON-NLS-1$
+        TABLETYPE_CALCULATION_VIEW("CALCULATION VIEW"), //$NON-NLS-1$
         TABLETYPE_ALL_SYNONYM("ALL_SYNONYM"), //$NON-NLS-1$
         TABLETYPE_ALIAS("ALIAS"), //$NON-NLS-1$
         TABLETYPE_EXTERNAL_TABLE("EXTERNAL TABLE"), //$NON-NLS-1$ //Added by Marvin Wang on Feb. 5, 2012 for bug TDI-24413.

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/core/model/metadata/builder/database/ExtractMetaDataUtils.java

@@ -37,8 +37,6 @@ import java.util.regex.Pattern;
 import java.util.zip.CRC32;
 import java.util.zip.CheckedInputStream;
 
-import metadata.managment.i18n.Messages;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IProject;
@@ -49,6 +47,7 @@ import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.utils.database.AS400DatabaseMetaData;
 import org.talend.commons.utils.database.DB2ForZosDataBaseMetadata;
 import org.talend.commons.utils.database.EXASOLDatabaseMetaData;
+import org.talend.commons.utils.database.SAPHanaDataBaseMetadata;
 import org.talend.commons.utils.database.SASDataBaseMetadata;
 import org.talend.commons.utils.database.SybaseDatabaseMetaData;
 import org.talend.commons.utils.database.SybaseIQDatabaseMetaData;
@@ -83,6 +82,8 @@ import org.talend.repository.ProjectManager;
 import org.talend.repository.model.IMetadataService;
 import org.talend.utils.exceptions.MissingDriverException;
 import org.talend.utils.sql.ConnectionUtils;
+
+import metadata.managment.i18n.Messages;
 import orgomg.cwm.objectmodel.core.Expression;
 
 /**
@@ -275,6 +276,8 @@ public class ExtractMetaDataUtils {
                     dbMetaData = createAS400FakeDatabaseMetaData(conn);
                 } else if (EDatabaseTypeName.EXASOL.getXmlName().equals(dbType)) {
                     dbMetaData = createEXASOLFakeDatabaseMetaData(conn);
+                } else if (EDatabaseTypeName.SAPHana.getXmlName().equals(dbType)) {
+                    dbMetaData = createSAPHanaFakeDatabaseMetaData(conn);
                 } else {
                     dbMetaData = conn.getMetaData();
                 }
@@ -332,7 +335,7 @@ public class ExtractMetaDataUtils {
         String dbType = metadataConnection.getDbType();
         boolean isSqlMode = metadataConnection.isSqlMode();
         String dbVersion = metadataConnection.getDbVersionString();
-        if (EDatabaseTypeName.IBMDB2ZOS.getXmlName().equals(dbType)) {
+        if (EDatabaseTypeName.IBMDB2ZOS.getXmlName().equals(dbType) || EDatabaseTypeName.SAPHana.getXmlName().equals(dbType)) {
             return true;
         } else if (EDatabaseTypeName.TERADATA.getXmlName().equals(dbType) && isSqlMode) {
             return true;
@@ -400,6 +403,11 @@ public class ExtractMetaDataUtils {
         return tmd;
     }
 
+    private DatabaseMetaData createSAPHanaFakeDatabaseMetaData(Connection conn) {
+        SAPHanaDataBaseMetadata tmd = new SAPHanaDataBaseMetadata(conn);
+        return tmd;
+    }
+
     private DatabaseMetaData createSASFakeDatabaseMetaData(Connection conn) {
         SASDataBaseMetadata tmd = new SASDataBaseMetadata(conn);
         return tmd;
@@ -945,6 +953,7 @@ public class ExtractMetaDataUtils {
                             && (EDatabaseVersion4Drivers.VERTICA_6.getVersionValue().equals(dbVersion)
                                     || EDatabaseVersion4Drivers.VERTICA_5_1.getVersionValue().equals(dbVersion)
                                     || EDatabaseVersion4Drivers.VERTICA_6_1_X.getVersionValue().equals(dbVersion) || EDatabaseVersion4Drivers.VERTICA_7
+                                    .getVersionValue().equals(dbVersion) || EDatabaseVersion4Drivers.VERTICA_9
                                     .getVersionValue().equals(dbVersion))) {
                         driverClassName = EDatabase4DriverClassName.VERTICA2.getDriverClass();
                     } else if (EDatabaseTypeName.MYSQL.getXmlName().equals(dbType)

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/core/model/metadata/builder/database/manager/ExtractManager.java

@@ -60,6 +60,7 @@ import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.cwm.helper.CatalogHelper;
 import org.talend.cwm.helper.ColumnSetHelper;
 import org.talend.cwm.helper.ConnectionHelper;
+import org.talend.cwm.helper.TaggedValueHelper;
 import org.talend.cwm.relational.RelationalFactory;
 import org.talend.cwm.relational.TdColumn;
 import org.talend.metadata.managment.connection.manager.HiveConnectionManager;
@@ -574,10 +575,13 @@ public class ExtractManager {
                         if (ownedElement != null) {
                             for (ModelElement m : ownedElement) {
                                 if (m instanceof org.talend.core.model.metadata.builder.connection.MetadataTable) {
-                                    String label = ((org.talend.core.model.metadata.builder.connection.MetadataTable) m)
-                                            .getLabel();
+                                    org.talend.core.model.metadata.builder.connection.MetadataTable metadataTable = (org.talend.core.model.metadata.builder.connection.MetadataTable) m;
+                                    String label = metadataTable.getName();
                                     if (label.equals(tableName)) {
-                                        schemaName = s.getName();
+                                        schemaName = getSpecialSchema(dbConnection.getDatabaseType(), metadataTable);
+                                        if (StringUtils.isEmpty(schemaName)) {
+                                            schemaName = s.getName();
+                                        }
                                         break;
                                     }
                                 }
@@ -633,6 +637,16 @@ public class ExtractManager {
         return catalogAndSchema;
     }
 
+    private String getSpecialSchema(String dbType,
+            org.talend.core.model.metadata.builder.connection.MetadataTable metadataTable) {
+        if (dbType != null && EDatabaseTypeName.SAPHana.getDisplayName().equals(dbType)) {
+            if (metadataTable != null) {
+                return TaggedValueHelper.getValueString(GetTable.TABLE_SCHEM.name(), metadataTable);
+            }
+        }
+        return null;
+    }
+
     protected List<TdColumn> extractColumns(DatabaseMetaData dbMetaData, IMetadataConnection metadataConnection,
             String databaseType, String catalogName, String schemaName, String tableName) {
         MappingTypeRetriever mappingTypeRetriever = null;
@@ -654,7 +668,11 @@ public class ExtractManager {
             // Synchro view structure after alter commands.
             synchroViewStructure(catalogName, schemaName, tableName);
 
-            columns = getColumnsResultSet(dbMetaData, catalogName, schemaName, tableName);
+            if (EDatabaseTypeName.SAPHana.getDisplayName().equals(metadataConnection.getDbType())) {
+                columns = dbMetaData.getColumns(catalogName, schemaName, tableName, null);
+            } else {
+                columns = getColumnsResultSet(dbMetaData, catalogName, schemaName, tableName);
+            }
             if (MetadataConnectionUtils.isMysql(dbMetaData)) {
                 boolean check = !Pattern.matches("^\\w+$", tableName);//$NON-NLS-1$
                 if (check && !columns.next()) {
@@ -857,7 +875,7 @@ public class ExtractManager {
         int column_size = 0;
         long numPrecRadix = 0;
         try {
-            if ("NUMBER".equalsIgnoreCase(typeName)) { //$NON-NLS-1$                            
+            if ("NUMBER".equalsIgnoreCase(typeName)) { //$NON-NLS-1$
                 boolean isGetFailed = false;
                 Object precision = columns.getObject("DATA_PRECISION");
                 Object scale = columns.getObject("DATA_SCALE");
@@ -970,7 +988,8 @@ public class ExtractManager {
      * @param tableInfoParameters
      * @return
      */
-    public List<String> returnTablesFormConnection(IMetadataConnection metadataConnection, TableInfoParameters tableInfoParameters) {
+    public List<String> returnTablesFormConnection(IMetadataConnection metadataConnection,
+            TableInfoParameters tableInfoParameters) {
         getTableTypeMap().clear();
         List<String> itemTablesName = new ArrayList<String>();
         // add by wzhang
@@ -1022,8 +1041,8 @@ public class ExtractManager {
     }
 
     protected List<String> retrieveItemTables(IMetadataConnection metadataConnection, TableInfoParameters tableInfoParameters,
-            List<String> itemTablesName) throws SQLException, ClassNotFoundException, InstantiationException,
-            IllegalAccessException {
+            List<String> itemTablesName)
+            throws SQLException, ClassNotFoundException, InstantiationException, IllegalAccessException {
         Set<String> nameFiters = tableInfoParameters.getNameFilters();
 
         if (nameFiters.isEmpty()) {
@@ -1057,8 +1076,8 @@ public class ExtractManager {
      * @throws ClassNotFoundException
      */
     protected List<String> getTableNamesFromTablesForMultiSchema(TableInfoParameters tableInfo, String namePattern,
-            IMetadataConnection iMetadataConnection) throws SQLException, ClassNotFoundException, InstantiationException,
-            IllegalAccessException {
+            IMetadataConnection iMetadataConnection)
+            throws SQLException, ClassNotFoundException, InstantiationException, IllegalAccessException {
         ExtractMetaDataUtils extractMeta = ExtractMetaDataUtils.getInstance();
         String[] multiSchemas = extractMeta.getMultiSchems(extractMeta.getSchema());
         List<String> tableNames = new ArrayList<String>();
@@ -1087,8 +1106,8 @@ public class ExtractManager {
      * @throws ClassNotFoundException
      */
     protected ResultSet getResultSetFromTableInfo(TableInfoParameters tableInfo, String namePattern,
-            IMetadataConnection iMetadataConnection, String schema) throws SQLException, ClassNotFoundException,
-            InstantiationException, IllegalAccessException {
+            IMetadataConnection iMetadataConnection, String schema)
+            throws SQLException, ClassNotFoundException, InstantiationException, IllegalAccessException {
         ResultSet rsTables = null;
         ExtractMetaDataUtils extractMeta = ExtractMetaDataUtils.getInstance();
         String tableNamePattern = "".equals(namePattern) ? null : namePattern; //$NON-NLS-1$
@@ -1171,8 +1190,8 @@ public class ExtractManager {
 
     public String getTableComment(IMetadataConnection metadataConnection, ResultSet resultSet, String nameKey)
             throws SQLException {
-        return ExtractMetaDataFromDataBase
-                .getTableComment(nameKey, resultSet, true, ExtractMetaDataUtils.getInstance().getConn());
+        return ExtractMetaDataFromDataBase.getTableComment(nameKey, resultSet, true,
+                ExtractMetaDataUtils.getInstance().getConn());
     }
 
 }

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/metadata/managment/model/DBConnectionFillerImpl.java

@@ -163,10 +163,10 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl<DatabaseConnectio
 
             if (dbMetadata != null) {
                 // MOD sizhaoliu TDQ-6316 The 2 tagged values should be added for all database including Hive
-                String productName = dbMetadata.getDatabaseProductName() == null ? PluginConstant.EMPTY_STRING : dbMetadata
-                        .getDatabaseProductName();
-                String productVersion = dbMetadata.getDatabaseProductVersion() == null ? PluginConstant.EMPTY_STRING : dbMetadata
-                        .getDatabaseProductVersion();
+                String productName = dbMetadata.getDatabaseProductName() == null ? PluginConstant.EMPTY_STRING
+                        : dbMetadata.getDatabaseProductName();
+                String productVersion = dbMetadata.getDatabaseProductVersion() == null ? PluginConstant.EMPTY_STRING
+                        : dbMetadata.getDatabaseProductVersion();
                 // TDI-35419 TDQ-11853: make sure the redshift connection save the productName is redshift, not use the
                 // postgresql.becauses we use this value to create dbmslauguage
                 boolean isRedshift = dbconn.getDatabaseType().equals(EDatabaseTypeName.REDSHIFT.getDisplayName());
@@ -444,7 +444,8 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl<DatabaseConnectio
                         if (isHive) {
                             temp = MetaDataConstants.TABLE_CAT.name();
                         } else {
-                            temp = MetadataConnectionUtils.isOdbcPostgresql(dbJDBCMetadata) ? DatabaseConstant.ODBC_POSTGRESQL_CATALOG_NAME
+                            temp = MetadataConnectionUtils.isOdbcPostgresql(dbJDBCMetadata)
+                                    ? DatabaseConstant.ODBC_POSTGRESQL_CATALOG_NAME
                                     : MetaDataConstants.TABLE_CAT.name();
                         }
                         catalogName = catalogNames.getString(temp);
@@ -455,9 +456,8 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl<DatabaseConnectio
                         }
                     } catch (Exception e) {
                         log.warn(e, e);
-                        if (dbJDBCMetadata.getDatabaseProductName() != null
-                                && dbJDBCMetadata.getDatabaseProductName().toLowerCase()
-                                        .indexOf(DatabaseConstant.POSTGRESQL_PRODUCT_NAME) > -1) {
+                        if (dbJDBCMetadata.getDatabaseProductName() != null && dbJDBCMetadata.getDatabaseProductName()
+                                .toLowerCase().indexOf(DatabaseConstant.POSTGRESQL_PRODUCT_NAME) > -1) {
                             catalogName = ""; //$NON-NLS-1$
                         }
                     }
@@ -703,8 +703,8 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl<DatabaseConnectio
         return false;
     }
 
-    private List<String> postFillCatalog(List<Catalog> catalogList, List<String> catalogFilterList,
-            List<String> scheamFilterList, String catalogName, Connection dbConn) {
+    private List<String> postFillCatalog(List<Catalog> catalogList, List<String> catalogFilterList, List<String> scheamFilterList,
+            String catalogName, Connection dbConn) {
         Catalog catalog = CatalogHelper.createCatalog(catalogName);
         catalogList.add(catalog);
         DatabaseConnection dbConnection = (DatabaseConnection) dbConn;
@@ -718,8 +718,8 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl<DatabaseConnectio
                     // TDI-23485:filter database for AS400,should not use schema filter
                     catalogFilterList.add(iMetadataCon.getDatabase());
                 }
-                String pattern = ExtractMetaDataUtils.getInstance().retrieveSchemaPatternForAS400(
-                        iMetadataCon.getAdditionalParams());
+                String pattern = ExtractMetaDataUtils.getInstance()
+                        .retrieveSchemaPatternForAS400(iMetadataCon.getAdditionalParams());
                 String sid = getDatabaseName(dbConnection);
                 if (pattern != null && !"".equals(pattern)) { //$NON-NLS-1$
                     String[] multiSchems = ExtractMetaDataUtils.getInstance().getMultiSchems(pattern);
@@ -761,8 +761,8 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl<DatabaseConnectio
                 if (!StringUtils.isEmpty(iMetadataCon.getDatabase()) && !filterList.contains(iMetadataCon.getDatabase())) {
                     filterList.add(iMetadataCon.getDatabase());
                 }
-                String pattern = ExtractMetaDataUtils.getInstance().retrieveSchemaPatternForAS400(
-                        iMetadataCon.getAdditionalParams());
+                String pattern = ExtractMetaDataUtils.getInstance()
+                        .retrieveSchemaPatternForAS400(iMetadataCon.getAdditionalParams());
                 if (pattern != null && !"".equals(pattern)) { //$NON-NLS-1$
                     String[] multiSchems = ExtractMetaDataUtils.getInstance().getMultiSchems(pattern);
                     if (multiSchems != null) {
@@ -867,7 +867,8 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl<DatabaseConnectio
                             Schema createByUiSchema = createSchemaByUiSchema(dbConn);
                             schemaList.add(createByUiSchema);
                             break;
-                        } else if (isCreateElement(schemaFilter, schemaName, ManagerConnection.isSchemaCaseSensitive(dbTypeName))) {
+                        } else if (isCreateElement(schemaFilter, schemaName,
+                                ManagerConnection.isSchemaCaseSensitive(dbTypeName))) {
                             Schema schema = SchemaHelper.createSchema(schemaName);
                             schemaList.add(schema);
                             schemaNameCacheTmp.add(schemaName);
@@ -1007,7 +1008,7 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl<DatabaseConnectio
                 if (tableName == null || tablesToFilter.contains(tableName)) {
                     continue;
                 }
-                //                if (!isOracle && !isOracle8i && !isOracleJdbc && tableName.startsWith("/")) { //$NON-NLS-1$
+                // if (!isOracle && !isOracle8i && !isOracleJdbc && tableName.startsWith("/")) { //$NON-NLS-1$
                 // continue;
                 // }
                 if (!isOracle8i) {
@@ -1030,6 +1031,13 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl<DatabaseConnectio
                     metadatatable.setTableType(ETableTypes.TABLETYPE_TABLE.getName());
                 } else if (ETableTypes.VIRTUAL_VIEW.getName().equals(temptableType)) {
                     metadatatable.setTableType(ETableTypes.TABLETYPE_VIEW.getName());
+                } else if (ETableTypes.TABLETYPE_CALCULATION_VIEW.getName().equals(temptableType)) {
+                    String catalog = getStringFromResultSet(tables, GetTable.TABLE_CAT.name());
+                    TaggedValueHelper.setTaggedValue(metadatatable, GetTable.TABLE_CAT.name(), catalog);
+                    String schema = getStringFromResultSet(tables, GetTable.TABLE_SCHEM.name());
+                    TaggedValueHelper.setTaggedValue(metadatatable, GetTable.TABLE_SCHEM.name(), schema);
+                    TaggedValueHelper.setTaggedValue(metadatatable, GetTable.TABLE_TYPE.name(), temptableType);
+                    metadatatable.setTableType(ETableTypes.TABLETYPE_CALCULATION_VIEW.getName());
                 } else {
                     metadatatable.setTableType(temptableType);
                 }
@@ -1355,13 +1363,13 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl<DatabaseConnectio
         }
         return valueOfString;
     }
-    
+
     private String getRemarksFromResultSet(ResultSet resultSet) {
         String valueOfString = null;
         try {
             valueOfString = resultSet.getString(GetColumn.REMARKS.name());
         } catch (SQLException e) {
-            //do nothing
+            // do nothing
         }
         return valueOfString;
     }
@@ -1404,8 +1412,15 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl<DatabaseConnectio
             }
 
             boolean isHive = MetadataConnectionUtils.isHive(dbJDBCMetadata);
-            
-            ResultSet columns = dbJDBCMetadata.getColumns(catalogName, schemaPattern, tablePattern, columnPattern);
+            ResultSet columns = null;
+            String tableType = TaggedValueHelper.getValueString(GetTable.TABLE_TYPE.name(), colSet);
+            if (tableType != null && ETableTypes.TABLETYPE_CALCULATION_VIEW.getName().equals(tableType)) {
+                catalogName = TaggedValueHelper.getValueString(GetTable.TABLE_CAT.name(), colSet);
+                schemaPattern = TaggedValueHelper.getValueString(GetTable.TABLE_SCHEM.name(), colSet);
+                columns = dbJDBCMetadata.getColumns(catalogName, schemaPattern, tablePattern, columnPattern);
+            } else {
+                columns = dbJDBCMetadata.getColumns(catalogName, schemaPattern, tablePattern, columnPattern);
+            }
             if (MetadataConnectionUtils.isMysql(dbJDBCMetadata)) {
                 boolean check = !Pattern.matches("^\\w+$", tablePattern);//$NON-NLS-1$
                 if (check && !columns.next()) {
@@ -1443,7 +1458,8 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl<DatabaseConnectio
                     if (!extractMeta.needFakeDatabaseMetaData(iMetadataConnection)) {
                         dataType = getIntFromResultSet(columns, GetColumn.DATA_TYPE.name());
                     }
-                    // MOD scorreia 2010-07-24 removed the call to column.getSQLDataType() here because obviously the sql
+                    // MOD scorreia 2010-07-24 removed the call to column.getSQLDataType() here because obviously the
+                    // sql
                     // data type it is null and results in a NPE
                     typeName = getStringFromResultSet(columns, GetColumn.TYPE_NAME.name());
                     if (EDatabaseTypeName.INFORMIX.getDisplayName().equals(iMetadataConnection.getDbType())) {
@@ -1464,13 +1480,15 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl<DatabaseConnectio
                         if (typeName.toLowerCase().equals("date")) { //$NON-NLS-1$
                             dataType = 91;
                             pattern = TalendQuoteUtils.addQuotes("dd-MM-yyyy");
-                            // MOD scorreia 2010-07-24 removed the call to column.getSQLDataType() here because obviously
+                            // MOD scorreia 2010-07-24 removed the call to column.getSQLDataType() here because
+                            // obviously
                             // the sql
                             // data type it is null and results in a NPE
                         } else if (typeName.toLowerCase().equals("time")) { //$NON-NLS-1$
                             dataType = 92;
                             pattern = TalendQuoteUtils.addQuotes("HH:mm:ss");
-                            // MOD scorreia 2010-07-24 removed the call to column.getSQLDataType() here because obviously
+                            // MOD scorreia 2010-07-24 removed the call to column.getSQLDataType() here because
+                            // obviously
                             // the sql
                             // data type it is null and results in a NPE
                         }
@@ -1479,8 +1497,9 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl<DatabaseConnectio
                         int column_size = getIntFromResultSet(columns, GetColumn.COLUMN_SIZE.name());
                         column.setLength(column_size);
                         decimalDigits = getIntFromResultSet(columns, GetColumn.DECIMAL_DIGITS.name());
-                        
-                        if(isHive && typeName.equalsIgnoreCase("DECIMAL") && columnPattern==null && getStringFromResultSet(columns, GetColumn.DECIMAL_DIGITS.name()) == null){
+
+                        if (isHive && typeName.equalsIgnoreCase("DECIMAL") && columnPattern == null
+                                && getStringFromResultSet(columns, GetColumn.DECIMAL_DIGITS.name()) == null) {
                             ResultSet result = dbJDBCMetadata.getColumns(catalogName, schemaPattern, tablePattern, columnName);
                             while (result.next()) {
                                 decimalDigits = getIntFromResultSet(result, GetColumn.DECIMAL_DIGITS.name());
@@ -1535,11 +1554,9 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl<DatabaseConnectio
                             }
                         }
                         if (mappingTypeRetriever != null) {
-                            String talendType = mappingTypeRetriever
-                                    .getDefaultSelectedTalendType(
-                                            typeName,
-                                            extractMeta.getIntMetaDataInfo(columns, "COLUMN_SIZE"), ExtractMetaDataUtils.getInstance().getIntMetaDataInfo(columns, //$NON-NLS-1$
-                                                            "DECIMAL_DIGITS")); //$NON-NLS-1$
+                            String talendType = mappingTypeRetriever.getDefaultSelectedTalendType(typeName,
+                                    extractMeta.getIntMetaDataInfo(columns, "COLUMN_SIZE"), //$NON-NLS-1$
+                                    ExtractMetaDataUtils.getInstance().getIntMetaDataInfo(columns, "DECIMAL_DIGITS"));
                             column.setTalendType(talendType);
                             column.setSourceType(typeName);
                         }
@@ -1550,8 +1567,10 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl<DatabaseConnectio
                         // do nothing
                     }
 
-                    // Comment, getColumnComment() method should be called at the end of this loop, because if the database
-                    // type is oracle 12c, when call this method will close the stream of the columns ResultSet which create
+                    // Comment, getColumnComment() method should be called at the end of this loop, because if the
+                    // database
+                    // type is oracle 12c, when call this method will close the stream of the columns ResultSet which
+                    // create
                     // by dbJDBCMetadata.getColumns()
                     String colComment = getColumnComment(dbJDBCMetadata, columns, tablePattern, column.getName(), schemaPattern);
                     colComment = ManagementTextUtils.filterSpecialChar(colComment);
@@ -1634,7 +1653,8 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl<DatabaseConnectio
 
                     int dataType = 0;
                     try {
-                        // MOD scorreia 2010-07-24 removed the call to column.getSQLDataType() here because obviously the
+                        // MOD scorreia 2010-07-24 removed the call to column.getSQLDataType() here because obviously
+                        // the
                         // sql
                         // data type it is null and results in a NPE
                         typeName = getStringFromResultSet(columns, GetColumn.TYPE_NAME.name());
@@ -1718,11 +1738,10 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl<DatabaseConnectio
                     extractMeta.handleDefaultValue(column, dbJDBCMetadata);
 
                     if (mappingTypeRetriever != null) {
-                        String talendType = mappingTypeRetriever
-                                .getDefaultSelectedTalendType(
-                                        typeName,
-                                        extractMeta.getIntMetaDataInfo(columns, "COLUMN_SIZE"), (dbJDBCMetadata instanceof TeradataDataBaseMetadata) ? 0 : extractMeta.getIntMetaDataInfo(columns, //$NON-NLS-1$
-                                                "DECIMAL_DIGITS")); //$NON-NLS-1$
+                        String talendType = mappingTypeRetriever.getDefaultSelectedTalendType(typeName,
+                                extractMeta.getIntMetaDataInfo(columns, "COLUMN_SIZE"), //$NON-NLS-1$
+                                (dbJDBCMetadata instanceof TeradataDataBaseMetadata) ? 0
+                                        : extractMeta.getIntMetaDataInfo(columns, "DECIMAL_DIGITS"));
                         column.setTalendType(talendType);
                         String defaultSelectedDbType = mappingTypeRetriever.getDefaultSelectedDbType(talendType);
                         column.setSourceType(defaultSelectedDbType);
@@ -1730,7 +1749,8 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl<DatabaseConnectio
 
                     // Comment
                     // MOD msjian TDQ-8546: fix the oracle type database column's comment is wrong
-                    // getColumnComment() method should be called at the end of this loop, because if the database type is
+                    // getColumnComment() method should be called at the end of this loop, because if the database type
+                    // is
                     // oracle 12c, when call this method will close the stream of the columns ResultSet which create by
                     // dbJDBCMetadata.getColumns()
                     String colComment = getColumnComment(dbJDBCMetadata, columns, tablePattern, column.getName(), schemaPattern);

main/plugins/org.talend.model/model/metadata.ecore

@@ -363,6 +363,8 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="jcoVersion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="additionalProperties" upperBound="-1"
         eType="#//AdditionalConnectionProperty" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="BWAdvancedDataStoreObjects"
+        upperBound="-1" eType="#//SAPBWTable" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="BWDataSources" upperBound="-1"
         eType="#//SAPBWTable" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="BWDataStoreObjects" upperBound="-1"

main/plugins/org.talend.model/model/metadata.genmodel

@@ -199,6 +199,7 @@
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference metadata.ecore#//SAPConnection/IDocs"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//SAPConnection/jcoVersion"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference metadata.ecore#//SAPConnection/additionalProperties"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference metadata.ecore#//SAPConnection/BWAdvancedDataStoreObjects"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference metadata.ecore#//SAPConnection/BWDataSources"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference metadata.ecore#//SAPConnection/BWDataStoreObjects"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference metadata.ecore#//SAPConnection/BWInfoCubes"/>

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/ConnectionPackage.java

@@ -5615,6 +5615,15 @@ public interface ConnectionPackage extends EPackage {
      */
     int SAP_CONNECTION__ADDITIONAL_PROPERTIES = CONNECTION_FEATURE_COUNT + 10;
 
+    /**
+     * The feature id for the '<em><b>BW Advanced Data Store Objects</b></em>' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int SAP_CONNECTION__BW_ADVANCED_DATA_STORE_OBJECTS = CONNECTION_FEATURE_COUNT + 11;
+
     /**
      * The feature id for the '<em><b>BW Data Sources</b></em>' containment reference list.
      * <!-- begin-user-doc -->
@@ -5622,7 +5631,7 @@ public interface ConnectionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SAP_CONNECTION__BW_DATA_SOURCES = CONNECTION_FEATURE_COUNT + 11;
+    int SAP_CONNECTION__BW_DATA_SOURCES = CONNECTION_FEATURE_COUNT + 12;
 
     /**
      * The feature id for the '<em><b>BW Data Store Objects</b></em>' containment reference list.
@@ -5631,7 +5640,7 @@ public interface ConnectionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SAP_CONNECTION__BW_DATA_STORE_OBJECTS = CONNECTION_FEATURE_COUNT + 12;
+    int SAP_CONNECTION__BW_DATA_STORE_OBJECTS = CONNECTION_FEATURE_COUNT + 13;
 
     /**
      * The feature id for the '<em><b>BW Info Cubes</b></em>' containment reference list.
@@ -5640,7 +5649,7 @@ public interface ConnectionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SAP_CONNECTION__BW_INFO_CUBES = CONNECTION_FEATURE_COUNT + 13;
+    int SAP_CONNECTION__BW_INFO_CUBES = CONNECTION_FEATURE_COUNT + 14;
 
     /**
      * The feature id for the '<em><b>BW Info Objects</b></em>' containment reference list.
@@ -5649,7 +5658,7 @@ public interface ConnectionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SAP_CONNECTION__BW_INFO_OBJECTS = CONNECTION_FEATURE_COUNT + 14;
+    int SAP_CONNECTION__BW_INFO_OBJECTS = CONNECTION_FEATURE_COUNT + 15;
 
     /**
      * The number of structural features of the '<em>SAP Connection</em>' class.
@@ -5658,7 +5667,7 @@ public interface ConnectionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SAP_CONNECTION_FEATURE_COUNT = CONNECTION_FEATURE_COUNT + 15;
+    int SAP_CONNECTION_FEATURE_COUNT = CONNECTION_FEATURE_COUNT + 16;
 
     /**
      * The meta object id for the '{@link org.talend.core.model.metadata.builder.connection.impl.SAPFunctionUnitImpl <em>SAP Function Unit</em>}' class.
@@ -21665,6 +21674,17 @@ public interface ConnectionPackage extends EPackage {
      */
     EReference getSAPConnection_AdditionalProperties();
 
+    /**
+     * Returns the meta object for the containment reference list '{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getBWAdvancedDataStoreObjects <em>BW Advanced Data Store Objects</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the containment reference list '<em>BW Advanced Data Store Objects</em>'.
+     * @see org.talend.core.model.metadata.builder.connection.SAPConnection#getBWAdvancedDataStoreObjects()
+     * @see #getSAPConnection()
+     * @generated
+     */
+    EReference getSAPConnection_BWAdvancedDataStoreObjects();
+
     /**
      * Returns the meta object for the containment reference list '{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getBWDataSources <em>BW Data Sources</em>}'.
      * <!-- begin-user-doc -->
@@ -26138,6 +26158,14 @@ public interface ConnectionPackage extends EPackage {
          */
         EReference SAP_CONNECTION__ADDITIONAL_PROPERTIES = eINSTANCE.getSAPConnection_AdditionalProperties();
 
+        /**
+         * The meta object literal for the '<em><b>BW Advanced Data Store Objects</b></em>' containment reference list feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EReference SAP_CONNECTION__BW_ADVANCED_DATA_STORE_OBJECTS = eINSTANCE.getSAPConnection_BWAdvancedDataStoreObjects();
+
         /**
          * The meta object literal for the '<em><b>BW Data Sources</b></em>' containment reference list feature.
          * <!-- begin-user-doc -->

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPConnection.java

@@ -26,6 +26,7 @@ import org.eclipse.emf.common.util.EMap;
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getIDocs <em>IDocs</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getJcoVersion <em>Jco Version</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getAdditionalProperties <em>Additional Properties</em>}</li>
+ *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getBWAdvancedDataStoreObjects <em>BW Advanced Data Store Objects</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getBWDataSources <em>BW Data Sources</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getBWDataStoreObjects <em>BW Data Store Objects</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getBWInfoCubes <em>BW Info Cubes</em>}</li>
@@ -291,6 +292,22 @@ public interface SAPConnection extends Connection {
      */
     EList<AdditionalConnectionProperty> getAdditionalProperties();
 
+    /**
+     * Returns the value of the '<em><b>BW Advanced Data Store Objects</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.SAPBWTable}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>BW Advanced Data Store Objects</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>BW Advanced Data Store Objects</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_BWAdvancedDataStoreObjects()
+     * @model containment="true" resolveProxies="true"
+     * @generated
+     */
+    EList<SAPBWTable> getBWAdvancedDataStoreObjects();
+
     /**
      * Returns the value of the '<em><b>BW Data Sources</b></em>' containment reference list.
      * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.SAPBWTable}.

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/ConnectionPackageImpl.java

@@ -599,9 +599,8 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
             return (ConnectionPackage) EPackage.Registry.INSTANCE.getEPackage(ConnectionPackage.eNS_URI);
 
         // Obtain or create and register package
-        ConnectionPackageImpl theConnectionPackage = (ConnectionPackageImpl) (EPackage.Registry.INSTANCE
-                .get(eNS_URI) instanceof ConnectionPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-                        : new ConnectionPackageImpl());
+        ConnectionPackageImpl theConnectionPackage = (ConnectionPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ConnectionPackageImpl ? EPackage.Registry.INSTANCE
+                .get(eNS_URI) : new ConnectionPackageImpl());
 
         isInited = true;
 
@@ -640,22 +639,19 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
 
         // Obtain or create and register interdependencies
         RelationalPackageImpl theRelationalPackage_1 = (RelationalPackageImpl) (EPackage.Registry.INSTANCE
-                .getEPackage(org.talend.cwm.relational.RelationalPackage.eNS_URI) instanceof RelationalPackageImpl
-                        ? EPackage.Registry.INSTANCE.getEPackage(org.talend.cwm.relational.RelationalPackage.eNS_URI)
-                        : org.talend.cwm.relational.RelationalPackage.eINSTANCE);
+                .getEPackage(org.talend.cwm.relational.RelationalPackage.eNS_URI) instanceof RelationalPackageImpl ? EPackage.Registry.INSTANCE
+                .getEPackage(org.talend.cwm.relational.RelationalPackage.eNS_URI)
+                : org.talend.cwm.relational.RelationalPackage.eINSTANCE);
         SoftwaredeploymentPackageImpl theSoftwaredeploymentPackage_1 = (SoftwaredeploymentPackageImpl) (EPackage.Registry.INSTANCE
-                .getEPackage(
-                        org.talend.cwm.softwaredeployment.SoftwaredeploymentPackage.eNS_URI) instanceof SoftwaredeploymentPackageImpl
-                                ? EPackage.Registry.INSTANCE
-                                        .getEPackage(org.talend.cwm.softwaredeployment.SoftwaredeploymentPackage.eNS_URI)
-                                : org.talend.cwm.softwaredeployment.SoftwaredeploymentPackage.eINSTANCE);
+                .getEPackage(org.talend.cwm.softwaredeployment.SoftwaredeploymentPackage.eNS_URI) instanceof SoftwaredeploymentPackageImpl ? EPackage.Registry.INSTANCE
+                .getEPackage(org.talend.cwm.softwaredeployment.SoftwaredeploymentPackage.eNS_URI)
+                : org.talend.cwm.softwaredeployment.SoftwaredeploymentPackage.eINSTANCE);
         ConstantsPackageImpl theConstantsPackage = (ConstantsPackageImpl) (EPackage.Registry.INSTANCE
-                .getEPackage(ConstantsPackage.eNS_URI) instanceof ConstantsPackageImpl
-                        ? EPackage.Registry.INSTANCE.getEPackage(ConstantsPackage.eNS_URI) : ConstantsPackage.eINSTANCE);
+                .getEPackage(ConstantsPackage.eNS_URI) instanceof ConstantsPackageImpl ? EPackage.Registry.INSTANCE
+                .getEPackage(ConstantsPackage.eNS_URI) : ConstantsPackage.eINSTANCE);
         XmlPackageImpl theXmlPackage_1 = (XmlPackageImpl) (EPackage.Registry.INSTANCE
-                .getEPackage(org.talend.cwm.xml.XmlPackage.eNS_URI) instanceof XmlPackageImpl
-                        ? EPackage.Registry.INSTANCE.getEPackage(org.talend.cwm.xml.XmlPackage.eNS_URI)
-                        : org.talend.cwm.xml.XmlPackage.eINSTANCE);
+                .getEPackage(org.talend.cwm.xml.XmlPackage.eNS_URI) instanceof XmlPackageImpl ? EPackage.Registry.INSTANCE
+                .getEPackage(org.talend.cwm.xml.XmlPackage.eNS_URI) : org.talend.cwm.xml.XmlPackage.eINSTANCE);
 
         // Create package meta-data objects
         theConnectionPackage.createPackageContents();
@@ -1645,7 +1641,7 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
      * <!-- end-user-doc -->
      * @generated
      */
-    public EReference getSAPConnection_BWDataSources() {
+    public EReference getSAPConnection_BWAdvancedDataStoreObjects() {
         return (EReference) sapConnectionEClass.getEStructuralFeatures().get(11);
     }
 
@@ -1654,7 +1650,7 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
      * <!-- end-user-doc -->
      * @generated
      */
-    public EReference getSAPConnection_BWDataStoreObjects() {
+    public EReference getSAPConnection_BWDataSources() {
         return (EReference) sapConnectionEClass.getEStructuralFeatures().get(12);
     }
 
@@ -1663,7 +1659,7 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
      * <!-- end-user-doc -->
      * @generated
      */
-    public EReference getSAPConnection_BWInfoCubes() {
+    public EReference getSAPConnection_BWDataStoreObjects() {
         return (EReference) sapConnectionEClass.getEStructuralFeatures().get(13);
     }
 
@@ -1672,10 +1668,19 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
      * <!-- end-user-doc -->
      * @generated
      */
-    public EReference getSAPConnection_BWInfoObjects() {
+    public EReference getSAPConnection_BWInfoCubes() {
         return (EReference) sapConnectionEClass.getEStructuralFeatures().get(14);
     }
 
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EReference getSAPConnection_BWInfoObjects() {
+        return (EReference) sapConnectionEClass.getEStructuralFeatures().get(15);
+    }
+
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
@@ -4490,6 +4495,7 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
         createEReference(sapConnectionEClass, SAP_CONNECTION__IDOCS);
         createEAttribute(sapConnectionEClass, SAP_CONNECTION__JCO_VERSION);
         createEReference(sapConnectionEClass, SAP_CONNECTION__ADDITIONAL_PROPERTIES);
+        createEReference(sapConnectionEClass, SAP_CONNECTION__BW_ADVANCED_DATA_STORE_OBJECTS);
         createEReference(sapConnectionEClass, SAP_CONNECTION__BW_DATA_SOURCES);
         createEReference(sapConnectionEClass, SAP_CONNECTION__BW_DATA_STORE_OBJECTS);
         createEReference(sapConnectionEClass, SAP_CONNECTION__BW_INFO_CUBES);
@@ -4974,8 +4980,8 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
                 !IS_DERIVED, IS_ORDERED);
 
         initEClass(connectionEClass, Connection.class, "Connection", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getConnection_Version(), ecorePackage.getEString(), "version", null, 0, 1, Connection.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getConnection_Version(), ecorePackage.getEString(), "version", null, 0, 1, Connection.class,
+                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEReference(getConnection_Queries(), this.getQueriesConnection(), this.getQueriesConnection_Connection(), "queries",
                 null, 0, 1, Connection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -5051,8 +5057,9 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
                 IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getMetadataTable_TableType(), ecorePackage.getEString(), "tableType", null, 0, 1, MetadataTable.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getMetadataTable_AttachedCDC(), ecorePackage.getEBoolean(), "attachedCDC", null, 0, 1, MetadataTable.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getMetadataTable_AttachedCDC(), ecorePackage.getEBoolean(), "attachedCDC", null, 0, 1,
+                MetadataTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+                IS_ORDERED);
         initEAttribute(getMetadataTable_ActivatedCDC(), ecorePackage.getEBoolean(), "activatedCDC", null, 0, 1,
                 MetadataTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED);
@@ -5079,9 +5086,9 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
         initEAttribute(getFileConnection_FieldSeparatorValue(), ecorePackage.getEString(), "FieldSeparatorValue", null, 1, 1,
                 FileConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED);
-        initEAttribute(getFileConnection_RowSeparatorType(), this.getRowSeparator(), "RowSeparatorType", "Standart_EOL = 1", 1, 1,
-                FileConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-                IS_ORDERED);
+        initEAttribute(getFileConnection_RowSeparatorType(), this.getRowSeparator(), "RowSeparatorType", "Standart_EOL = 1", 1,
+                1, FileConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                !IS_DERIVED, IS_ORDERED);
         initEAttribute(getFileConnection_RowSeparatorValue(), ecorePackage.getEString(), "RowSeparatorValue", null, 0, 1,
                 FileConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED);
@@ -5151,8 +5158,8 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getMDMConnection_Password(), ecorePackage.getEString(), "Password", null, 0, 1, MDMConnection.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getMDMConnection_Port(), ecorePackage.getEString(), "Port", null, 0, 1, MDMConnection.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getMDMConnection_Port(), ecorePackage.getEString(), "Port", null, 0, 1, MDMConnection.class,
+                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getMDMConnection_Server(), ecorePackage.getEString(), "Server", null, 0, 1, MDMConnection.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getMDMConnection_Universe(), ecorePackage.getEString(), "Universe", null, 0, 1, MDMConnection.class,
@@ -5254,8 +5261,8 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
 
         initEClass(sapConnectionEClass, SAPConnection.class, "SAPConnection", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getSAPConnection_Host(), ecorePackage.getEString(), "Host", null, 0, 1, SAPConnection.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getSAPConnection_Host(), ecorePackage.getEString(), "Host", null, 0, 1, SAPConnection.class,
+                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getSAPConnection_Username(), ecorePackage.getEString(), "Username", null, 0, 1, SAPConnection.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getSAPConnection_Password(), ecorePackage.getEString(), "Password", null, 0, 1, SAPConnection.class,
@@ -5267,49 +5274,52 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
                 IS_ORDERED);
         initEAttribute(getSAPConnection_Language(), ecorePackage.getEString(), "Language", null, 0, 1, SAPConnection.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getSAPConnection_Funtions(), this.getSAPFunctionUnit(), null, "Funtions", null, 0, -1, SAPConnection.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-                !IS_DERIVED, IS_ORDERED);
+        initEReference(getSAPConnection_Funtions(), this.getSAPFunctionUnit(), null, "Funtions", null, 0, -1,
+                SAPConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getSAPConnection_CurrentFucntion(), ecorePackage.getEString(), "currentFucntion", null, 0, 1,
                 SAPConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED);
         initEReference(getSAPConnection_IDocs(), this.getSAPIDocUnit(), this.getSAPIDocUnit_Connection(), "IDocs", null, 0, -1,
-                SAPConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                SAPConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getSAPConnection_JcoVersion(), ecorePackage.getEString(), "jcoVersion", null, 0, 1, SAPConnection.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEReference(getSAPConnection_AdditionalProperties(), this.getAdditionalConnectionProperty(), null,
                 "additionalProperties", null, 0, -1, SAPConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getSAPConnection_BWAdvancedDataStoreObjects(), this.getSAPBWTable(), null, "BWAdvancedDataStoreObjects",
+                null, 0, -1, SAPConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEReference(getSAPConnection_BWDataSources(), this.getSAPBWTable(), null, "BWDataSources", null, 0, -1,
-                SAPConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                SAPConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEReference(getSAPConnection_BWDataStoreObjects(), this.getSAPBWTable(), null, "BWDataStoreObjects", null, 0, -1,
-                SAPConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                SAPConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEReference(getSAPConnection_BWInfoCubes(), this.getSAPBWTable(), null, "BWInfoCubes", null, 0, -1,
-                SAPConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                SAPConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEReference(getSAPConnection_BWInfoObjects(), this.getSAPBWTable(), null, "BWInfoObjects", null, 0, -1,
-                SAPConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                SAPConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
         initEClass(sapFunctionUnitEClass, SAPFunctionUnit.class, "SAPFunctionUnit", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getSAPFunctionUnit_OutputType(), ecorePackage.getEString(), "OutputType", null, 0, 1,
-                SAPFunctionUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-                IS_ORDERED);
+                SAPFunctionUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                !IS_DERIVED, IS_ORDERED);
         initEAttribute(getSAPFunctionUnit_OutputTableName(), ecorePackage.getEString(), "OutputTableName", null, 0, 1,
-                SAPFunctionUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-                IS_ORDERED);
+                SAPFunctionUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                !IS_DERIVED, IS_ORDERED);
         initEReference(getSAPFunctionUnit_InputParameterTable(), this.getInputSAPFunctionParameterTable(),
                 this.getInputSAPFunctionParameterTable_FunctionUnit(), "InputParameterTable", null, 0, 1, SAPFunctionUnit.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED);
         initEReference(getSAPFunctionUnit_OutputParameterTable(), this.getOutputSAPFunctionParameterTable(),
-                this.getOutputSAPFunctionParameterTable_FunctionUnit(), "OutputParameterTable", null, 0, 1, SAPFunctionUnit.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-                !IS_DERIVED, IS_ORDERED);
+                this.getOutputSAPFunctionParameterTable_FunctionUnit(), "OutputParameterTable", null, 0, 1,
+                SAPFunctionUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEReference(getSAPFunctionUnit_MetadataTable(), this.getMetadataTable(), null, "MetadataTable", null, 0, 1,
                 SAPFunctionUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -5330,15 +5340,15 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
                 SAPFunctionUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getSAPFunctionUnit_AsXmlSchema(), ecorePackage.getEBoolean(), "asXmlSchema", null, 0, 1,
-                SAPFunctionUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-                IS_ORDERED);
+                SAPFunctionUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                !IS_DERIVED, IS_ORDERED);
 
         EOperation op = addEOperation(sapFunctionUnitEClass, null, "setDocument", 0, 1, IS_UNIQUE, IS_ORDERED);
         addEParameter(op, theCorePackage.getString(), "document", 0, 1, IS_UNIQUE, IS_ORDERED);
 
         initEClass(sapiDocUnitEClass, SAPIDocUnit.class, "SAPIDocUnit", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getSAPIDocUnit_Connection(), this.getSAPConnection(), this.getSAPConnection_IDocs(), "connection", null, 0,
-                1, SAPIDocUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        initEReference(getSAPIDocUnit_Connection(), this.getSAPConnection(), this.getSAPConnection_IDocs(), "connection", null,
+                0, 1, SAPIDocUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getSAPIDocUnit_ProgramId(), ecorePackage.getEString(), "programId", null, 0, 1, SAPIDocUnit.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -5349,13 +5359,14 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getSAPIDocUnit_XmlFile(), ecorePackage.getEString(), "xmlFile", null, 0, 1, SAPIDocUnit.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getSAPIDocUnit_UseHtmlOutput(), ecorePackage.getEBoolean(), "useHtmlOutput", null, 0, 1, SAPIDocUnit.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getSAPIDocUnit_UseHtmlOutput(), ecorePackage.getEBoolean(), "useHtmlOutput", null, 0, 1,
+                SAPIDocUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+                IS_ORDERED);
         initEAttribute(getSAPIDocUnit_HtmlFile(), ecorePackage.getEString(), "htmlFile", null, 0, 1, SAPIDocUnit.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-        initEClass(sapFunctionParameterColumnEClass, SAPFunctionParameterColumn.class, "SAPFunctionParameterColumn", !IS_ABSTRACT,
-                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEClass(sapFunctionParameterColumnEClass, SAPFunctionParameterColumn.class, "SAPFunctionParameterColumn",
+                !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getSAPFunctionParameterColumn_ParameterType(), ecorePackage.getEString(), "ParameterType", null, 0, 1,
                 SAPFunctionParameterColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED);
@@ -5396,9 +5407,9 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
         initEClass(outputSAPFunctionParameterTableEClass, OutputSAPFunctionParameterTable.class,
                 "OutputSAPFunctionParameterTable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
         initEReference(getOutputSAPFunctionParameterTable_FunctionUnit(), this.getSAPFunctionUnit(),
-                this.getSAPFunctionUnit_OutputParameterTable(), "functionUnit", null, 0, 1, OutputSAPFunctionParameterTable.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-                !IS_DERIVED, IS_ORDERED);
+                this.getSAPFunctionUnit_OutputParameterTable(), "functionUnit", null, 0, 1,
+                OutputSAPFunctionParameterTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
         initEClass(regexpFileConnectionEClass, RegexpFileConnection.class, "RegexpFileConnection", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS);
@@ -5421,8 +5432,7 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
                 !IS_DERIVED, IS_ORDERED);
         initEReference(getXmlFileConnection_Schema(), this.getXmlXPathLoopDescriptor(),
                 this.getXmlXPathLoopDescriptor_Connection(), "schema", null, 0, -1, XmlFileConnection.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-                IS_ORDERED);
+                !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getXmlFileConnection_Encoding(), ecorePackage.getEString(), "Encoding", null, 0, 1,
                 XmlFileConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED);
@@ -5455,9 +5465,10 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
                 IS_ORDERED);
         initEAttribute(getSchemaTarget_TagName(), ecorePackage.getEString(), "TagName", null, 0, 1, SchemaTarget.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getSchemaTarget_Schema(), this.getXmlXPathLoopDescriptor(), this.getXmlXPathLoopDescriptor_SchemaTargets(),
-                "schema", null, 0, 1, SchemaTarget.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getSchemaTarget_Schema(), this.getXmlXPathLoopDescriptor(),
+                this.getXmlXPathLoopDescriptor_SchemaTargets(), "schema", null, 0, 1, SchemaTarget.class, !IS_TRANSIENT,
+                !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+                IS_ORDERED);
 
         initEClass(queriesConnectionEClass, QueriesConnection.class, "QueriesConnection", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS);
@@ -5469,8 +5480,8 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
         initEClass(queryEClass, Query.class, "Query", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getQuery_Value(), ecorePackage.getEString(), "value", null, 0, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getQuery_Value(), ecorePackage.getEString(), "value", null, 0, 1, Query.class, !IS_TRANSIENT,
+                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEReference(getQuery_Queries(), this.getQueriesConnection(), this.getQueriesConnection_Query(), "queries", null, 0, 1,
                 Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -5534,8 +5545,8 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
                 1, XmlXPathLoopDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED);
         initEReference(getXmlXPathLoopDescriptor_Connection(), this.getXmlFileConnection(), this.getXmlFileConnection_Schema(),
-                "connection", null, 0, 1, XmlXPathLoopDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                "connection", null, 0, 1, XmlXPathLoopDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+                !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEReference(getXmlXPathLoopDescriptor_SchemaTargets(), this.getSchemaTarget(), this.getSchemaTarget_Schema(),
                 "schemaTargets", null, 0, -1, XmlXPathLoopDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -5585,8 +5596,8 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
         initEAttribute(getLDAPSchemaConnection_LimitValue(), ecorePackage.getEInt(), "LimitValue", null, 0, 1,
                 LDAPSchemaConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getLDAPSchemaConnection_EncryptionMethodName(), ecorePackage.getEString(), "EncryptionMethodName", null, 0,
-                1, LDAPSchemaConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute(getLDAPSchemaConnection_EncryptionMethodName(), ecorePackage.getEString(), "EncryptionMethodName", null,
+                0, 1, LDAPSchemaConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED);
         initEAttribute(getLDAPSchemaConnection_Value(), ecorePackage.getEString(), "Value", null, 0, -1,
                 LDAPSchemaConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
@@ -5609,8 +5620,8 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
         initEAttribute(getLDAPSchemaConnection_BaseDNs(), ecorePackage.getEString(), "BaseDNs", null, 0, -1,
                 LDAPSchemaConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getLDAPSchemaConnection_GetBaseDNsFromRoot(), ecorePackage.getEBoolean(), "GetBaseDNsFromRoot", null, 0, 1,
-                LDAPSchemaConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute(getLDAPSchemaConnection_GetBaseDNsFromRoot(), ecorePackage.getEBoolean(), "GetBaseDNsFromRoot", null, 0,
+                1, LDAPSchemaConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED);
         initEAttribute(getLDAPSchemaConnection_ReturnAttributes(), ecorePackage.getEString(), "ReturnAttributes", null, 0, -1,
                 LDAPSchemaConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
@@ -5629,8 +5640,9 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
         initEAttribute(getWSDLSchemaConnection_MethodName(), ecorePackage.getEString(), "methodName", null, 0, 1,
                 WSDLSchemaConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDLSchemaConnection_Parameters(), this.getList(), "parameters", null, 0, 1, WSDLSchemaConnection.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getWSDLSchemaConnection_Parameters(), this.getList(), "parameters", null, 0, 1,
+                WSDLSchemaConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                !IS_DERIVED, IS_ORDERED);
         initEAttribute(getWSDLSchemaConnection_UserName(), ecorePackage.getEString(), "UserName", null, 0, 1,
                 WSDLSchemaConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED);
@@ -5686,8 +5698,8 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
                 WSDLSchemaConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-        initEClass(salesforceSchemaConnectionEClass, SalesforceSchemaConnection.class, "SalesforceSchemaConnection", !IS_ABSTRACT,
-                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEClass(salesforceSchemaConnectionEClass, SalesforceSchemaConnection.class, "SalesforceSchemaConnection",
+                !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getSalesforceSchemaConnection_WebServiceUrl(), ecorePackage.getEString(), "webServiceUrl", null, 0, 1,
                 SalesforceSchemaConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED);
@@ -5752,8 +5764,8 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
         initEAttribute(getSalesforceSchemaConnection_CallbackPort(), ecorePackage.getEString(), "callbackPort", null, 0, 1,
                 SalesforceSchemaConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getSalesforceSchemaConnection_SalesforceVersion(), ecorePackage.getEString(), "salesforceVersion", null, 0,
-                1, SalesforceSchemaConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        initEAttribute(getSalesforceSchemaConnection_SalesforceVersion(), ecorePackage.getEString(), "salesforceVersion", null,
+                0, 1, SalesforceSchemaConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getSalesforceSchemaConnection_Token(), ecorePackage.getEString(), "token", null, 0, 1,
                 SalesforceSchemaConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
@@ -5788,8 +5800,8 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
         initEAttribute(getSubscriberTable_System(), ecorePackage.getEBoolean(), "system", null, 0, 1, SubscriberTable.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-        initEClass(sapTestInputParameterTableEClass, SAPTestInputParameterTable.class, "SAPTestInputParameterTable", !IS_ABSTRACT,
-                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEClass(sapTestInputParameterTableEClass, SAPTestInputParameterTable.class, "SAPTestInputParameterTable",
+                !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
         initEReference(getSAPTestInputParameterTable_FunctionUnit(), this.getSAPFunctionUnit(),
                 this.getSAPFunctionUnit_TestInputParameterTable(), "functionUnit", null, 0, 1, SAPTestInputParameterTable.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
@@ -5826,9 +5838,9 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getConceptTarget_TargetName(), ecorePackage.getEString(), "targetName", null, 0, 1, ConceptTarget.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getConceptTarget_RelativeLoopExpression(), ecorePackage.getEString(), "RelativeLoopExpression", null, 0, 1,
-                ConceptTarget.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-                IS_ORDERED);
+        initEAttribute(getConceptTarget_RelativeLoopExpression(), ecorePackage.getEString(), "RelativeLoopExpression", null, 0,
+                1, ConceptTarget.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                !IS_DERIVED, IS_ORDERED);
 
         initEClass(hl7ConnectionEClass, HL7Connection.class, "HL7Connection", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS);
@@ -5908,16 +5920,16 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
 
         initEClass(ftpConnectionEClass, FTPConnection.class, "FTPConnection", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getFTPConnection_Host(), ecorePackage.getEString(), "Host", null, 0, 1, FTPConnection.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getFTPConnection_Port(), ecorePackage.getEString(), "Port", null, 0, 1, FTPConnection.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getFTPConnection_Host(), ecorePackage.getEString(), "Host", null, 0, 1, FTPConnection.class,
+                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getFTPConnection_Port(), ecorePackage.getEString(), "Port", null, 0, 1, FTPConnection.class,
+                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getFTPConnection_Username(), ecorePackage.getEString(), "Username", null, 0, 1, FTPConnection.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getFTPConnection_Password(), ecorePackage.getEString(), "Password", null, 0, 1, FTPConnection.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getFTPConnection_Mode(), ecorePackage.getEString(), "Mode", null, 0, 1, FTPConnection.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getFTPConnection_Mode(), ecorePackage.getEString(), "Mode", null, 0, 1, FTPConnection.class,
+                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getFTPConnection_Ecoding(), ecorePackage.getEString(), "Ecoding", null, 0, 1, FTPConnection.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getFTPConnection_SFTP(), ecorePackage.getEBoolean(), "SFTP", null, 0, 1, FTPConnection.class,
@@ -6041,8 +6053,7 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
         initEAttribute(getConditionType_Value(), ecorePackage.getEString(), "value", null, 0, 1, ConditionType.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-        initEClass(innerJoinMapEClass, Map.Entry.class, "InnerJoinMap", !IS_ABSTRACT, !IS_INTERFACE,
-                !IS_GENERATED_INSTANCE_CLASS);
+        initEClass(innerJoinMapEClass, Map.Entry.class, "InnerJoinMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getInnerJoinMap_Key(), ecorePackage.getEString(), "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT,
                 !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getInnerJoinMap_Value(), ecorePackage.getEString(), "value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT,
@@ -6072,9 +6083,9 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
                 SalesforceModuleUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEReference(getSalesforceModuleUnit_Connection(), this.getSalesforceSchemaConnection(),
-                this.getSalesforceSchemaConnection_Modules(), "connection", null, 0, 1, SalesforceModuleUnit.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-                IS_ORDERED);
+                this.getSalesforceSchemaConnection_Modules(), "connection", null, 0, 1, SalesforceModuleUnit.class,
+                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+                !IS_DERIVED, IS_ORDERED);
         initEReference(getSalesforceModuleUnit_Tables(), this.getMetadataTable(), null, "tables", null, 0, -1,
                 SalesforceModuleUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -6138,11 +6149,11 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
         initEClass(additionalConnectionPropertyEClass, AdditionalConnectionProperty.class, "AdditionalConnectionProperty",
                 !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getAdditionalConnectionProperty_PropertyName(), ecorePackage.getEString(), "propertyName", null, 0, 1,
-                AdditionalConnectionProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-                !IS_DERIVED, IS_ORDERED);
+                AdditionalConnectionProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getAdditionalConnectionProperty_Value(), ecorePackage.getEString(), "Value", null, 0, 1,
-                AdditionalConnectionProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-                !IS_DERIVED, IS_ORDERED);
+                AdditionalConnectionProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
         initEClass(sapbwTableEClass, SAPBWTable.class, "SAPBWTable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getSAPBWTable_ModelType(), ecorePackage.getEString(), "modelType", null, 0, 1, SAPBWTable.class,
@@ -6160,8 +6171,8 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
         initEClass(sapbwTableFieldEClass, SAPBWTableField.class, "SAPBWTableField", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getSAPBWTableField_LogicalName(), ecorePackage.getEString(), "logicalName", null, 0, 1,
-                SAPBWTableField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-                IS_ORDERED);
+                SAPBWTableField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                !IS_DERIVED, IS_ORDERED);
 
         // Initialize enums and add enum literals
         initEEnum(fileFormatEEnum, FileFormat.class, "FileFormat");
@@ -6245,96 +6256,131 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
         String source = "http://www.eclipse.org/emf/2002/GenModel";
         addAnnotation(connectionEClass, source, new String[] { "documentation",
                 "base class tha represent a connection, may be to a database or a file or else" });
-        addAnnotation(getConnection_Queries(), source,
-                new String[] { "documentation", "This defines the SQL queries related to this connection" });
-        addAnnotation(getConnection_ContextMode(), source,
-                new String[] { "documentation", "whether this connection is defined using a context or is standalone" });
+        addAnnotation(getConnection_Queries(), source, new String[] { "documentation",
+                "This defines the SQL queries related to this connection" });
+        addAnnotation(getConnection_ContextMode(), source, new String[] { "documentation",
+                "whether this connection is defined using a context or is standalone" });
         addAnnotation(getConnection_ContextId(), source, new String[] { "documentation",
                 "Id of the context this connection is linked to, only used when ContextMode attribute is true" });
         addAnnotation(metadataColumnEClass, source, new String[] { "documentation",
                 "represents a metada column which contains source (such as DB) definitions as weel as Talend mappings" });
-        addAnnotation(getMetadataColumn_SourceType(), source, new String[] { "documentation",
-                "Schema DB type (VARCHAR for example ), can be initialised from DB  column type and modified by the user.)\r\nThis is maintained in synch with the TalendType (at least in the Table schema editor).\r\n" });
-        addAnnotation(getMetadataColumn_DefaultValue(), source, new String[] { "documentation",
-                "@deprecated Use initialValue  instead\r\n(This represents the default value for column. This may be changed by the user.)\r\n\r\n" });
-        addAnnotation(getMetadataColumn_TalendType(), source, new String[] { "documentation",
-                "java type used by Talend for handling this column elements; This seems to be synched with the sourceType.\r\nThis must be the case for schema used for Table creation." });
-        addAnnotation(getMetadataColumn_Key(), source, new String[] { "documentation",
-                "Whether this column is a considered a key, in a business meaning (This is not technical).\r\nThis may apply to file, xml or dB columns.\r\nMay be changed by the user.\r\nWhen retrieving Metadata from DB this will be set to true if the column belong to the primary key." });
-        addAnnotation(getMetadataColumn_Nullable(), source,
-                new String[] { "documentation", "whether this column supports null values. May be changed by the user." });
-        addAnnotation(getMetadataColumn_Table(), source,
-                new String[] { "documentation", "reference to the containing table or view" });
-        addAnnotation(getMetadataColumn_OriginalField(), source,
-                new String[] { "documentation", "@deprecated use g(s)etName\r\nLogical name of the column" });
+        addAnnotation(
+                getMetadataColumn_SourceType(),
+                source,
+                new String[] {
+                        "documentation",
+                        "Schema DB type (VARCHAR for example ), can be initialised from DB  column type and modified by the user.)\r\nThis is maintained in synch with the TalendType (at least in the Table schema editor).\r\n" });
+        addAnnotation(
+                getMetadataColumn_DefaultValue(),
+                source,
+                new String[] {
+                        "documentation",
+                        "@deprecated Use initialValue  instead\r\n(This represents the default value for column. This may be changed by the user.)\r\n\r\n" });
+        addAnnotation(
+                getMetadataColumn_TalendType(),
+                source,
+                new String[] {
+                        "documentation",
+                        "java type used by Talend for handling this column elements; This seems to be synched with the sourceType.\r\nThis must be the case for schema used for Table creation." });
+        addAnnotation(
+                getMetadataColumn_Key(),
+                source,
+                new String[] {
+                        "documentation",
+                        "Whether this column is a considered a key, in a business meaning (This is not technical).\r\nThis may apply to file, xml or dB columns.\r\nMay be changed by the user.\r\nWhen retrieving Metadata from DB this will be set to true if the column belong to the primary key." });
+        addAnnotation(getMetadataColumn_Nullable(), source, new String[] { "documentation",
+                "whether this column supports null values. May be changed by the user." });
+        addAnnotation(getMetadataColumn_Table(), source, new String[] { "documentation",
+                "reference to the containing table or view" });
+        addAnnotation(getMetadataColumn_OriginalField(), source, new String[] { "documentation",
+                "@deprecated use g(s)etName\r\nLogical name of the column" });
         addAnnotation(getMetadataColumn_Pattern(), source,
                 new String[] { "documentation", "pattern mainly used for date parsing" });
-        addAnnotation(abstractMetadataObjectEClass, source,
-                new String[] { "documentation", "base class for all the metadata model" });
-        addAnnotation(getAbstractMetadataObject_Properties(), source, new String[] { "documentation",
-                "@deprecated Use taggedValue instead\r\n(map of general purpose key/value that is available to all classes of the metamodel.)\r\n" });
+        addAnnotation(abstractMetadataObjectEClass, source, new String[] { "documentation",
+                "base class for all the metadata model" });
+        addAnnotation(
+                getAbstractMetadataObject_Properties(),
+                source,
+                new String[] {
+                        "documentation",
+                        "@deprecated Use taggedValue instead\r\n(map of general purpose key/value that is available to all classes of the metamodel.)\r\n" });
         addAnnotation(getAbstractMetadataObject_Id(), source, new String[] { "documentation", "logical identifier" });
-        addAnnotation(getAbstractMetadataObject_Comment(), source,
-                new String[] { "documentation", "free comment of this element, may be displayed to the user." });
-        addAnnotation(getAbstractMetadataObject_Label(), source,
-                new String[] { "documentation", "name to be displayed for the current object" });
+        addAnnotation(getAbstractMetadataObject_Comment(), source, new String[] { "documentation",
+                "free comment of this element, may be displayed to the user." });
+        addAnnotation(getAbstractMetadataObject_Label(), source, new String[] { "documentation",
+                "name to be displayed for the current object" });
         addAnnotation(metadataTableEClass, source, new String[] { "documentation", "representation of a of set of columns" });
         addAnnotation(getMetadataTable_SourceName(), source, new String[] { "documentation",
                 "@deprecated use g(s)etName()\r\nname of the table, that is actual DB table name for DB tables" });
-        addAnnotation(getMetadataTable_TableType(), source,
-                new String[] { "documentation", "of value of TABLE, VIEW, SYNONYM, ALL_SYNONYM" });
-        addAnnotation(getMetadataTable_AttachedCDC(), source,
-                new String[] { "documentation", "whether a CDC table is attached to this table" });
-        addAnnotation(getMetadataTable_ActivatedCDC(), source,
-                new String[] { "documentation", "whether CDC is activated, that is the trigger are set to record the changes" });
-        addAnnotation(getMetadataTable_Columns(), source, new String[] { "documentation",
-                "List of columns related to this table, this is a derived attribute from the feature attribute, thus volatile and transiant" });
+        addAnnotation(getMetadataTable_TableType(), source, new String[] { "documentation",
+                "of value of TABLE, VIEW, SYNONYM, ALL_SYNONYM" });
+        addAnnotation(getMetadataTable_AttachedCDC(), source, new String[] { "documentation",
+                "whether a CDC table is attached to this table" });
+        addAnnotation(getMetadataTable_ActivatedCDC(), source, new String[] { "documentation",
+                "whether CDC is activated, that is the trigger are set to record the changes" });
+        addAnnotation(
+                getMetadataTable_Columns(),
+                source,
+                new String[] { "documentation",
+                        "List of columns related to this table, this is a derived attribute from the feature attribute, thus volatile and transiant" });
         addAnnotation(getMetadataTable_Connection(), source, new String[] { "documentation",
                 "@deprecated use MetadataTableHelper.getFirstconnection()\r\nref to the connection that contains this table" });
-        addAnnotation(mdmConnectionEClass.getEOperations().get(0), source, new String[] { "documentation",
-                "return the connection string to connect to the MDM server,\r\nit is a concatenation of protocol, server, port and context.\r\nthe connection string returned may not be a valid URL if some of the concatenated elements are not properly set.\r\nNo checking is done." });
-        addAnnotation(getMDMConnection_Protocol(), source,
-                new String[] { "documentation", "protocol used for connecting to MDM server, initial protocol is HTTP" });
+        addAnnotation(
+                mdmConnectionEClass.getEOperations().get(0),
+                source,
+                new String[] {
+                        "documentation",
+                        "return the connection string to connect to the MDM server,\r\nit is a concatenation of protocol, server, port and context.\r\nthe connection string returned may not be a valid URL if some of the concatenated elements are not properly set.\r\nNo checking is done." });
+        addAnnotation(getMDMConnection_Protocol(), source, new String[] { "documentation",
+                "protocol used for connecting to MDM server, initial protocol is HTTP" });
         addAnnotation(getMDMConnection_Context(), source, new String[] { "documentation",
                 "part of the url for connecting to the server, \r\nthe last part that defined the MDM web app context" });
         addAnnotation(databaseConnectionEClass, source, new String[] { "documentation", "Defines a connection to a Database" });
-        addAnnotation(getDatabaseConnection_DatabaseType(), source,
-                new String[] { "documentation", "logical type of the DB (for instance MySQL)" });
-        addAnnotation(getDatabaseConnection_DriverJarPath(), source,
-                new String[] { "documentation", "absolute path to the jar that may be used for Generic JDBC connection" });
-        addAnnotation(getDatabaseConnection_DriverClass(), source,
-                new String[] { "documentation", "initial class for generic JDBC connection" });
-        addAnnotation(getDatabaseConnection_URL(), source, new String[] { "documentation",
-                "the connection base URL for JDBC protocol.\r\nIt is a concatenation of DatabaseType, ServerName, Port and other attributes of this class" });
+        addAnnotation(getDatabaseConnection_DatabaseType(), source, new String[] { "documentation",
+                "logical type of the DB (for instance MySQL)" });
+        addAnnotation(getDatabaseConnection_DriverJarPath(), source, new String[] { "documentation",
+                "absolute path to the jar that may be used for Generic JDBC connection" });
+        addAnnotation(getDatabaseConnection_DriverClass(), source, new String[] { "documentation",
+                "initial class for generic JDBC connection" });
+        addAnnotation(
+                getDatabaseConnection_URL(),
+                source,
+                new String[] {
+                        "documentation",
+                        "the connection base URL for JDBC protocol.\r\nIt is a concatenation of DatabaseType, ServerName, Port and other attributes of this class" });
         addAnnotation(getDatabaseConnection_DbVersionString(), source, new String[] { "documentation",
                 "may hold the version of the Database for a given Database type (for instance MySQL_4 or MySQL_5)" });
-        addAnnotation(getDatabaseConnection_Port(), source,
-                new String[] { "documentation", "port used for the Database Connection" });
-        addAnnotation(getDatabaseConnection_Username(), source,
-                new String[] { "documentation", "user name used for DB connection authentification" });
-        addAnnotation(getDatabaseConnection_Password(), source,
-                new String[] { "documentation", "password used for DB connection authentification" });
-        addAnnotation(getDatabaseConnection_ServerName(), source,
-                new String[] { "documentation", "IP adress or machine name of the DB server to connect to." });
-        addAnnotation(getDatabaseConnection_FileFieldName(), source,
-                new String[] { "documentation", "Database file used for DB such as SqlLite" });
+        addAnnotation(getDatabaseConnection_Port(), source, new String[] { "documentation",
+                "port used for the Database Connection" });
+        addAnnotation(getDatabaseConnection_Username(), source, new String[] { "documentation",
+                "user name used for DB connection authentification" });
+        addAnnotation(getDatabaseConnection_Password(), source, new String[] { "documentation",
+                "password used for DB connection authentification" });
+        addAnnotation(getDatabaseConnection_ServerName(), source, new String[] { "documentation",
+                "IP adress or machine name of the DB server to connect to." });
+        addAnnotation(getDatabaseConnection_FileFieldName(), source, new String[] { "documentation",
+                "Database file used for DB such as SqlLite" });
         addAnnotation(getDatabaseConnection_SID(), source, new String[] { "documentation", "Logical name of the Database" });
-        addAnnotation(getDatabaseConnection_AdditionalParams(), source,
-                new String[] { "documentation", "parameters that are to be added to the connection URL" });
-        addAnnotation(getDatabaseConnection_CdcConns(), source,
-                new String[] { "documentation", "reference to CDC definition for this connection" });
-        addAnnotation(sapFunctionUnitEClass.getEOperations().get(0), source,
-                new String[] { "documentation", "@deprecated use SAPFunctionHelper.getFirstDocument().g(s)etReference()" });
-        addAnnotation(sapFunctionParameterColumnEClass.getEOperations().get(0), source,
-                new String[] { "documentation", "@deprecated use ModelElementHelper.getFirstDescription().setBody()" });
-        addAnnotation(cdcConnectionEClass, source,
-                new String[] { "documentation", "defining Change Data Capture for a given connection" });
+        addAnnotation(getDatabaseConnection_AdditionalParams(), source, new String[] { "documentation",
+                "parameters that are to be added to the connection URL" });
+        addAnnotation(getDatabaseConnection_CdcConns(), source, new String[] { "documentation",
+                "reference to CDC definition for this connection" });
+        addAnnotation(sapFunctionUnitEClass.getEOperations().get(0), source, new String[] { "documentation",
+                "@deprecated use SAPFunctionHelper.getFirstDocument().g(s)etReference()" });
+        addAnnotation(sapFunctionParameterColumnEClass.getEOperations().get(0), source, new String[] { "documentation",
+                "@deprecated use ModelElementHelper.getFirstDescription().setBody()" });
+        addAnnotation(cdcConnectionEClass, source, new String[] { "documentation",
+                "defining Change Data Capture for a given connection" });
         addAnnotation(getCDCConnection_Connection(), source,
                 new String[] { "documentation", "the connection this CDC relates to" });
-        addAnnotation(getCDCType_LinkDB(), source,
-                new String[] { "documentation", "ID of the .properties file related to the CDC database" });
-        addAnnotation(genericPackageEClass, source, new String[] { "documentation",
-                "Default CWM package to use when none of the existing cwm packages fit the metadata to describe.\r\nThis is a container between Connection and MetadataTable" });
+        addAnnotation(getCDCType_LinkDB(), source, new String[] { "documentation",
+                "ID of the .properties file related to the CDC database" });
+        addAnnotation(
+                genericPackageEClass,
+                source,
+                new String[] {
+                        "documentation",
+                        "Default CWM package to use when none of the existing cwm packages fit the metadata to describe.\r\nThis is a container between Connection and MetadataTable" });
     }
 
     /**

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/SAPConnectionImpl.java

@@ -51,6 +51,7 @@ import org.talend.core.model.metadata.builder.connection.SAPIDocUnit;
  *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.SAPConnectionImpl#getIDocs <em>IDocs</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.SAPConnectionImpl#getJcoVersion <em>Jco Version</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.SAPConnectionImpl#getAdditionalProperties <em>Additional Properties</em>}</li>
+ *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.SAPConnectionImpl#getBWAdvancedDataStoreObjects <em>BW Advanced Data Store Objects</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.SAPConnectionImpl#getBWDataSources <em>BW Data Sources</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.SAPConnectionImpl#getBWDataStoreObjects <em>BW Data Store Objects</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.SAPConnectionImpl#getBWInfoCubes <em>BW Info Cubes</em>}</li>
@@ -252,6 +253,16 @@ public class SAPConnectionImpl extends ConnectionImpl implements SAPConnection {
      */
     protected EList<AdditionalConnectionProperty> additionalProperties;
 
+    /**
+     * The cached value of the '{@link #getBWAdvancedDataStoreObjects() <em>BW Advanced Data Store Objects</em>}' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getBWAdvancedDataStoreObjects()
+     * @generated
+     * @ordered
+     */
+    protected EList<SAPBWTable> bwAdvancedDataStoreObjects;
+
     /**
      * The cached value of the '{@link #getBWDataSources() <em>BW Data Sources</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -525,6 +536,19 @@ public class SAPConnectionImpl extends ConnectionImpl implements SAPConnection {
         return additionalProperties;
     }
 
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EList<SAPBWTable> getBWAdvancedDataStoreObjects() {
+        if (bwAdvancedDataStoreObjects == null) {
+            bwAdvancedDataStoreObjects = new EObjectContainmentEList.Resolving<SAPBWTable>(SAPBWTable.class, this,
+                    ConnectionPackage.SAP_CONNECTION__BW_ADVANCED_DATA_STORE_OBJECTS);
+        }
+        return bwAdvancedDataStoreObjects;
+    }
+
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -606,6 +630,8 @@ public class SAPConnectionImpl extends ConnectionImpl implements SAPConnection {
             return ((InternalEList<?>) getIDocs()).basicRemove(otherEnd, msgs);
         case ConnectionPackage.SAP_CONNECTION__ADDITIONAL_PROPERTIES:
             return ((InternalEList<?>) getAdditionalProperties()).basicRemove(otherEnd, msgs);
+        case ConnectionPackage.SAP_CONNECTION__BW_ADVANCED_DATA_STORE_OBJECTS:
+            return ((InternalEList<?>) getBWAdvancedDataStoreObjects()).basicRemove(otherEnd, msgs);
         case ConnectionPackage.SAP_CONNECTION__BW_DATA_SOURCES:
             return ((InternalEList<?>) getBWDataSources()).basicRemove(otherEnd, msgs);
         case ConnectionPackage.SAP_CONNECTION__BW_DATA_STORE_OBJECTS:
@@ -648,6 +674,8 @@ public class SAPConnectionImpl extends ConnectionImpl implements SAPConnection {
             return getJcoVersion();
         case ConnectionPackage.SAP_CONNECTION__ADDITIONAL_PROPERTIES:
             return getAdditionalProperties();
+        case ConnectionPackage.SAP_CONNECTION__BW_ADVANCED_DATA_STORE_OBJECTS:
+            return getBWAdvancedDataStoreObjects();
         case ConnectionPackage.SAP_CONNECTION__BW_DATA_SOURCES:
             return getBWDataSources();
         case ConnectionPackage.SAP_CONNECTION__BW_DATA_STORE_OBJECTS:
@@ -705,6 +733,10 @@ public class SAPConnectionImpl extends ConnectionImpl implements SAPConnection {
             getAdditionalProperties().clear();
             getAdditionalProperties().addAll((Collection<? extends AdditionalConnectionProperty>) newValue);
             return;
+        case ConnectionPackage.SAP_CONNECTION__BW_ADVANCED_DATA_STORE_OBJECTS:
+            getBWAdvancedDataStoreObjects().clear();
+            getBWAdvancedDataStoreObjects().addAll((Collection<? extends SAPBWTable>) newValue);
+            return;
         case ConnectionPackage.SAP_CONNECTION__BW_DATA_SOURCES:
             getBWDataSources().clear();
             getBWDataSources().addAll((Collection<? extends SAPBWTable>) newValue);
@@ -766,6 +798,9 @@ public class SAPConnectionImpl extends ConnectionImpl implements SAPConnection {
         case ConnectionPackage.SAP_CONNECTION__ADDITIONAL_PROPERTIES:
             getAdditionalProperties().clear();
             return;
+        case ConnectionPackage.SAP_CONNECTION__BW_ADVANCED_DATA_STORE_OBJECTS:
+            getBWAdvancedDataStoreObjects().clear();
+            return;
         case ConnectionPackage.SAP_CONNECTION__BW_DATA_SOURCES:
             getBWDataSources().clear();
             return;
@@ -813,6 +848,8 @@ public class SAPConnectionImpl extends ConnectionImpl implements SAPConnection {
             return JCO_VERSION_EDEFAULT == null ? jcoVersion != null : !JCO_VERSION_EDEFAULT.equals(jcoVersion);
         case ConnectionPackage.SAP_CONNECTION__ADDITIONAL_PROPERTIES:
             return additionalProperties != null && !additionalProperties.isEmpty();
+        case ConnectionPackage.SAP_CONNECTION__BW_ADVANCED_DATA_STORE_OBJECTS:
+            return bwAdvancedDataStoreObjects != null && !bwAdvancedDataStoreObjects.isEmpty();
         case ConnectionPackage.SAP_CONNECTION__BW_DATA_SOURCES:
             return bwDataSources != null && !bwDataSources.isEmpty();
         case ConnectionPackage.SAP_CONNECTION__BW_DATA_STORE_OBJECTS:

main/plugins/org.talend.model/src/main/java/org/talend/cwm/helper/ConnectionHelper.java

@@ -41,6 +41,7 @@ import org.talend.cwm.xml.TdXmlElementType;
 import org.talend.cwm.xml.TdXmlSchema;
 import org.talend.utils.security.CryptoHelper;
 import org.talend.utils.sql.ConnectionUtils;
+
 import orgomg.cwm.foundation.softwaredeployment.Component;
 import orgomg.cwm.foundation.softwaredeployment.DataManager;
 import orgomg.cwm.objectmodel.core.ModelElement;
@@ -65,7 +66,8 @@ public class ConnectionHelper {
     public static final String DOT_STRING = "."; //$NON-NLS-1$
 
     // MOD xqliu 2011-07-04 feature 22201
-    //public static final String PASSPHRASE = "99ZwBDt1L9yMX2ApJx fnv94o99OeHbCGuIHTy22 V9O6cZ2i374fVjdV76VX9g49DG1r3n90hT5c1"; //$NON-NLS-1$
+    // public static final String PASSPHRASE = "99ZwBDt1L9yMX2ApJx fnv94o99OeHbCGuIHTy22
+    // V9O6cZ2i374fVjdV76VX9g49DG1r3n90hT5c1"; //$NON-NLS-1$
     public static final String PASSPHRASE = ConnectionUtils.PASSPHRASE;
 
     // ~
@@ -228,8 +230,8 @@ public class ConnectionHelper {
      * @return true if the value was not set before.
      */
     public static boolean setIdentifierQuoteString(String identifierQuoteString, Connection dataProvider) {
-        return TaggedValueHelper
-                .setTaggedValue(dataProvider, TaggedValueHelper.DB_IDENTIFIER_QUOTE_STRING, identifierQuoteString);
+        return TaggedValueHelper.setTaggedValue(dataProvider, TaggedValueHelper.DB_IDENTIFIER_QUOTE_STRING,
+                identifierQuoteString);
     }
 
     /**
@@ -968,6 +970,7 @@ public class ConnectionHelper {
             for (Package pack : new ArrayList<Package>(packages)) {
                 PackageHelper.getAllTables(pack, result);
             }
+            result.addAll(((SAPConnection) connection).getBWAdvancedDataStoreObjects());
             result.addAll(((SAPConnection) connection).getBWDataSources());
             result.addAll(((SAPConnection) connection).getBWDataStoreObjects());
             result.addAll(((SAPConnection) connection).getBWInfoCubes());

main/plugins/org.talend.model/src/main/java/org/talend/cwm/helper/SAPBWTableHelper.java

@@ -13,6 +13,8 @@ import org.talend.core.model.metadata.builder.connection.SAPConnection;
 public class SAPBWTableHelper {
     
     // bw object type
+    public static final String TYPE_ADVANCEDDATASTOREOBJECT = "AdvancedDataStoreObject"; //$NON-NLS-1$
+
     public static final String TYPE_DATASOURCE = "DataSource"; //$NON-NLS-1$
 
     public static final String TYPE_DATASTOREOBJECT = "DataStoreObject"; //$NON-NLS-1$
@@ -53,6 +55,9 @@ public class SAPBWTableHelper {
     public static List<SAPBWTable> getBWTableList(Connection connection, String bwTableType) {
         List<SAPBWTable> bwTables;
         switch (bwTableType) {
+        case TYPE_ADVANCEDDATASTOREOBJECT:
+            bwTables = ((SAPConnection) connection).getBWAdvancedDataStoreObjects();
+            break;
         case TYPE_DATASOURCE:
             bwTables = ((SAPConnection) connection).getBWDataSources();
             break;

main/plugins/org.talend.platform.logging/src/log4j.xml

@@ -26,6 +26,10 @@
     <logger name="org.ops4j.pax.url.mvn.internal.config.MavenRepositoryURL" additivity="true"> <level value="error" /> </logger>
     <logger name="org.ops4j.pax.url.mvn.internal.AetherBasedResolver" additivity="true"> <level value="error" /> </logger>
     <logger name="shaded.org.eclipse.aether.internal.impl.WarnChecksumPolicy" additivity="true"> <level value="error" /> </logger>
+    <logger name="org.talend.components.api.service.internal.osgi.DefinitionRegistryOsgi" additivity="true"> <level value="error" /> </logger>
+    <logger name="org.talend.components.api.service.common.DefinitionRegistry" additivity="true"> <level value="error" /> </logger>
+    <logger name="org.talend.components.api.service.context.osgi.GlobalContextOsgi" additivity="true"> <level value="error" /> </logger>
+    <logger name="org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingFactory" additivity="true"> <level value="error" /> </logger>
 	<logger name="org.hibernate" additivity="true"> <level value="error" /> </logger>
 	<logger name="com.mchange" additivity="true"> <level value="warn" /> </logger>
 	<logger name="net.sf.ehcache" additivity="true"> <level value="warn" /> </logger>

main/plugins/org.talend.rcp/plugin.xml

@@ -210,7 +210,7 @@
    </menuContribution>
 </extension>
 <extension
-               point="org.eclipse.ui.activities">
+      point="org.eclipse.ui.activities">
             <activity
                   id="org.talend.rcp.branding.activity.hideMenu"
                   name="hideMenus">
@@ -223,6 +223,10 @@
                   id="org.talend.rcp.branding.activity.hidePerspective"
                   name="hidePerspective">
             </activity>
+            <activity
+                  id="org.talend.rcp.branding.activity.hideImportMenus"
+                  name="hideImportMenus">
+            </activity>
             <activity
                   id="org.talend.rcp.branding.activity.hideMenuForTOS"
                   name="hideMenuForTOS">
@@ -337,6 +341,14 @@
                   activityId="org.talend.rcp.branding.activity.hideMenuForTOS"
                   pattern=".*/org.eclipse.equinox.p2.ui.sdk.install">
             </activityPatternBinding>
+            <activityPatternBinding
+                  activityId="org.talend.rcp.branding.activity.hideImportMenus"
+                  pattern="org.eclipse.ui.ide/org.eclipse.ui.wizards.import.FileSystem">
+            </activityPatternBinding>
+            <activityPatternBinding
+                  activityId="org.talend.rcp.branding.activity.hideImportMenus"
+                  pattern="org.eclipse.ui.ide/org.eclipse.ui.wizards.import.ZipFile">
+            </activityPatternBinding>
      </extension>
 <extension
       point="org.eclipse.core.expressions.propertyTesters">

main/plugins/org.talend.rcp/src/main/java/messages.properties

@@ -108,6 +108,7 @@ WelcomePageDynamicContentProvider.GettingStartedImportDemoBrief=Import project d
 DynamicContentProvider.analysis=no previously opened analysis
 DynamicContentProvider.businessModels=no previously opened business models
 DynamicContentProvider.TalendNewsTitle=Talend news
+DynamicContentProvider.tryCloud=Try Talend Cloud FREE for 30 days
 DynamicContentProvider.isDisplayTitle=Do not display again
 DynamicContentProvider.jobs=no previously opened jobs
 DynamicContentProvider.routes=no previously opened routes

main/plugins/org.talend.rcp/src/main/java/org/talend/rcp/intro/OpenWebBrowserAction.java

@@ -12,11 +12,14 @@
 // ============================================================================
 package org.talend.rcp.intro;
 
+import java.net.URLDecoder;
 import java.util.Properties;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.swt.program.Program;
 import org.eclipse.ui.intro.IIntroSite;
 import org.eclipse.ui.intro.config.IIntroAction;
+import org.talend.commons.exception.ExceptionHandler;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.ui.branding.IBrandingService;
 
@@ -86,6 +89,16 @@ public class OpenWebBrowserAction implements IIntroAction {
                 Program.launch(TRAINNING_URL);
             } else if ("showTalendHelpCenter".equals(type.toString())) {
                 Program.launch(TALEND_HELP_CENTER);
+            } else if ("showUrl".equals(type.toString())) { //$NON-NLS-1$
+                String url = (String) params.get("url"); //$NON-NLS-1$
+                if (StringUtils.isNotEmpty(url)) {
+                    try {
+                        url = URLDecoder.decode(url, "UTF-8"); //$NON-NLS-1$
+                    } catch (Exception e) {
+                        ExceptionHandler.process(e);
+                    }
+                    Program.launch(url);
+                }
             }
         }
     }

main/plugins/org.talend.rcp/src/main/java/org/talend/rcp/intro/contentProvider/DynamicContentProvider.java

@@ -15,6 +15,7 @@ package org.talend.rcp.intro.contentProvider;
 import java.io.PrintWriter;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -31,6 +32,7 @@ import org.talend.commons.utils.VersionUtils;
 import org.talend.commons.utils.network.NetworkUtil;
 import org.talend.core.CorePlugin;
 import org.talend.core.GlobalServiceRegister;
+import org.talend.core.PluginChecker;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.IRepositoryViewObject;
@@ -45,14 +47,21 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
 
 /**
  * DOC WCHEN keep this class for old branding system before feature TDI-18168
  */
 public class DynamicContentProvider extends IntroProvider {
 
+    public static final String OPEN_IN_BROWSER_URL = "http://org.eclipse.ui.intro/runAction?pluginId=org.talend.rcp&class=org.talend.rcp.intro.OpenWebBrowserAction&type=showUrl&url="; //$NON-NLS-1$
+
     public static final String ONLINE_PAGE_URL = "https://www.talend.com/builtin_news/index.php"; //$NON-NLS-1$
 
+    public static final String CLOUD_PAGE_URL = "https://www.talend.com/builtin_news/oss/"; //$NON-NLS-1$
+
+    public static final String TRY_CLOUD_URL = "https://integrationcloud.talend.com"; //$NON-NLS-1$
+
     private static final String LEVEL_SEPARATOR = "."; //$NON-NLS-1$
 
     /*
@@ -84,7 +93,7 @@ public class DynamicContentProvider extends IntroProvider {
             if (latestItems.size() == 0) {
                 parent.appendChild(dom.createTextNode(Messages.getString("DynamicContentProvider.services"))); //$NON-NLS-1$
             }
-        } else if (ERepositoryObjectType.PROCESS_ROUTE != null && ERepositoryObjectType.PROCESS_ROUTE.name().equals(id)) { //$NON-NLS-1$
+        } else if (ERepositoryObjectType.PROCESS_ROUTE != null && ERepositoryObjectType.PROCESS_ROUTE.name().equals(id)) { // $NON-NLS-1$
             latestItems = getLatestModifiedItems(ERepositoryObjectType.PROCESS_ROUTE, 8);
             url = "http://org.eclipse.ui.intro/runAction?pluginId=org.talend.camel.designer&" //$NON-NLS-1$
                     + "class=org.talend.camel.designer.ui.EditCamelProcess&" //$NON-NLS-1$
@@ -108,10 +117,14 @@ public class DynamicContentProvider extends IntroProvider {
             if (latestItems.size() == 0) {
                 parent.appendChild(dom.createTextNode(Messages.getString("DynamicContentProvider.analysis"))); //$NON-NLS-1$
             }
-        } else if ("ALWAYS_WELCOME".equals(id)) { //$NON-NLS-1$
+        } else if ("ALWAYS_WELCOME".equals(id) && PluginChecker.isTIS()) { //$NON-NLS-1$
             creatAlwaysWelcome(dom, parent);
         } else if ("CUSTOMER_PAGE".equals(id)) { //$NON-NLS-1$
-            createOnlinePage(dom, parent);
+            createNewsPage(dom, parent);
+        } else if ("INTEGRATION_CLOUD".equals(id)) { //$NON-NLS-1$
+            createCloudPage(dom, parent);
+        } else if ("TOP_MESSAGE".equals(id)) { //$NON-NLS-1$
+            createTopMessage(dom, parent);
         }
 
         for (IRepositoryViewObject object : latestItems) {
@@ -144,14 +157,14 @@ public class DynamicContentProvider extends IntroProvider {
         parent.appendChild(input);
     }
 
-    protected String getOnlinePageURL() {
+    protected String getOnlinePageURL(String onlinePage) {
         StringBuffer url = new StringBuffer();
-        url.append(ONLINE_PAGE_URL);
+        url.append(onlinePage);
         // edition
         String edition = null;
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IBrandingService.class)) {
-            IBrandingService brandingService = (IBrandingService) GlobalServiceRegister.getDefault().getService(
-                    IBrandingService.class);
+            IBrandingService brandingService = (IBrandingService) GlobalServiceRegister.getDefault()
+                    .getService(IBrandingService.class);
             edition = brandingService.getAcronym();
         }
         // version
@@ -182,14 +195,22 @@ public class DynamicContentProvider extends IntroProvider {
         return url.toString();
     }
 
-    protected void createOnlinePage(Document dom, Element parent) {
+    protected void createNewsPage(Document dom, Element parent) {
+        createOnlinePage(dom, parent, ONLINE_PAGE_URL, Messages.getString("DynamicContentProvider.TalendNewsTitle")); //$NON-NLS-1$
+    }
+
+    protected void createCloudPage(Document dom, Element parent) {
+        createOnlinePage(dom, parent, CLOUD_PAGE_URL, null);
+    }
+
+    protected void createOnlinePage(Document dom, Element parent, String onlinePageUrl, String title) {
         if (!NetworkUtil.isNetworkValid()) {
             setDIVStyle(dom, false);
             return;
         }
         HttpURLConnection urlConnection = null;
         try {
-            URL url = new URL(getOnlinePageURL());
+            URL url = new URL(getOnlinePageURL(onlinePageUrl));
             urlConnection = (HttpURLConnection) url.openConnection();
             urlConnection.setRequestMethod("GET"); //$NON-NLS-1$
             urlConnection.setDoOutput(true);
@@ -215,14 +236,16 @@ public class DynamicContentProvider extends IntroProvider {
         div.setAttribute("style", "overflow:auto;height:400px;width:260px;padding-left:20px;"); //$NON-NLS-1$ //$NON-NLS-2$
         tdElem.appendChild(div);
 
-        Element spanElem = dom.createElement("span"); //$NON-NLS-1$
-        spanElem.setAttribute("class", "style_1 style_2 style_3"); //$NON-NLS-1$ //$NON-NLS-2$
-        spanElem.appendChild(dom.createTextNode(Messages.getString("DynamicContentProvider.TalendNewsTitle"))); //$NON-NLS-1$
-        div.appendChild(spanElem);
-        div.appendChild(dom.createElement("br")); //$NON-NLS-1$
-
+        if (title != null) {
+            Element spanElem = dom.createElement("span"); //$NON-NLS-1$
+            spanElem.setAttribute("class", "style_1 style_2 style_3"); //$NON-NLS-1$ //$NON-NLS-2$
+            spanElem.appendChild(dom.createTextNode(title));
+            div.appendChild(spanElem);
+            div.appendChild(dom.createElement("br")); //$NON-NLS-1$
+        }
+        
         Element iFrame = dom.createElement("iframe"); //$NON-NLS-1$
-        iFrame.setAttribute("src", getOnlinePageURL()); //$NON-NLS-1$
+        iFrame.setAttribute("src", getOnlinePageURL(onlinePageUrl)); //$NON-NLS-1$
         iFrame.setAttribute("frameborder", "0"); //$NON-NLS-1$ //$NON-NLS-2$
         iFrame.setAttribute("width", "240px"); //$NON-NLS-1$ //$NON-NLS-2$
         iFrame.setAttribute("height", "370px"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -230,6 +253,28 @@ public class DynamicContentProvider extends IntroProvider {
         div.appendChild(iFrame);
     }
 
+    protected void createTopMessage(Document dom, Element parent) {
+        Element topMessageElem = dom.createElement("div"); //$NON-NLS-1$
+        topMessageElem.setAttribute("style", //$NON-NLS-1$
+                "position: absolute;left: 660px;top: 22px;width: 200px;text-align: center;line-height: 28px;letter-spacing: 1px;"); //$NON-NLS-1$
+        parent.appendChild(topMessageElem);
+
+        Element ticHrefElem = dom.createElement("a"); //$NON-NLS-1$
+        String url = TRY_CLOUD_URL;
+        try {
+            url = URLEncoder.encode(url, "UTF-8"); //$NON-NLS-1$
+        } catch (Exception e) {
+            org.talend.commons.exception.ExceptionHandler.process(e);
+        }
+        ticHrefElem.setAttribute("href", OPEN_IN_BROWSER_URL + url); //$NON-NLS-1$
+        ticHrefElem.setAttribute("style", //$NON-NLS-1$
+                "color: #c3d600;font-size: 20px;text-decoration: none;font-family: Calibri, Candara, Segoe, Segoe UI, Optima, Arial, sans-serif;"); //$NON-NLS-1$
+        topMessageElem.appendChild(ticHrefElem);
+
+        Text tryCloudTextNode = dom.createTextNode(Messages.getString("DynamicContentProvider.tryCloud")); //$NON-NLS-1$
+        ticHrefElem.appendChild(tryCloudTextNode);
+    }
+
     protected void setTDAttribute(Element tdElem) {
         tdElem.setAttribute("class", "separator"); //$NON-NLS-1$ //$NON-NLS-2$
     }

main/plugins/org.talend.rcp/src/main/java/org/talend/rcp/intro/contentProvider/DynamicContentProviderGeneric.java

@@ -152,7 +152,9 @@ public class DynamicContentProviderGeneric extends DynamicContentProvider {
             input.appendChild(dom.createTextNode(Messages.getString("DynamicContentProvider.isDisplayTitle")));
             parent.appendChild(input);
         } else if ("CUSTOMER_PAGE".equals(id)) {
-            createOnlinePage(dom, parent);
+            createNewsPage(dom, parent);
+        } else if ("INTEGRATION_CLOUD".equals(id)) { //$NON-NLS-1$
+            createCloudPage(dom, parent);
         } else if ("CREATE_NEW_ITEM".equals(id)) {
             Element td = dom.createElement("td");
             setTDStyle(td);

main/plugins/org.talend.registration/content/talendForgeDiage.html

@@ -290,10 +290,8 @@
 		var value = document.getElementById('name2').value;
 
 		var isOK = false;
-		if (value != "") {
-			if (value.replace(/^\w+$/g, "") == "" ){
-				isOK = true;
-			}
+		if (trimStr(value) != "") {
+			isOK = true;
 		}
 
 	    if (isOK){
@@ -418,16 +416,16 @@
     <form method="post" action="">
     <table align="center"><tbody>
     <tr>
-      <td colspan="2"><font style="font-size:20px;"><span><internationalization id="TalendForgeDialog.labelTitle.Version1" /> <b><internationalization id="TalendForgeDialog.labelTitle.Version2" /></b></span></font></td>
+      <td colspan="2"><font style="font-size:20px;"><span><internationalization id="TalendForgeDialog.labelTitle.Version_1" /> </span></font></td>
     </tr>
     <tr>
       <td>
                   <ul>
-                        <li style="font-size:12px;font-family:Arial"><internationalization id="TalendForgeDialog.labelMessageOnePart1" /> <b><internationalization id="TalendForgeDialog.labelMessageOnePart2" /></b> <internationalization id="TalendForgeDialog.labelMessageOnePart3" /></li>
+                        <li style="font-size:12px;font-family:Arial"><internationalization id="TalendForgeDialog.labelMessageOnePart_1" /></li>
                         <br/><br/>
-                        <li style="font-size:12px;font-family:Arial"><internationalization id="TalendForgeDialog.labelMessageTwo1" /> <b><internationalization id="TalendForgeDialog.labelMessageTwo2" /></b> <internationalization id="TalendForgeDialog.labelMessageTwo3" /></li>
+                        <li style="font-size:12px;font-family:Arial"><internationalization id="TalendForgeDialog.labelMessageTwo_1" /> </li>
                         <br/><br/>
-                        <li style="font-size:12px;font-family:Arial"><internationalization id="TalendForgeDialog.labelMessageThreeVer1" /> <b><internationalization id="TalendForgeDialog.labelMessageThreeVer2" /></b></li>
+                        <li style="font-size:12px;font-family:Arial"><internationalization id="TalendForgeDialog.labelMessageThreeVer_1" /> </li>
                         <br/>
                   </ul>
       </td>
@@ -580,7 +578,7 @@
 				  </div>
              </td><td></td></tr>
              <tr><td></td><td colspan="2" class="checkBoxStyles">
-             <input type="checkbox" class="checkbox" name="checkbox1" id="agree" onclick="refreshCreateAccountButtton();" ><font style="font-size:12px;"><internationalization id="TalendForgeDialog.agreeButtonVer1" /><a href="http://www.talendforge.org/Talend_Contributor_Agreement.txt" target="_blank"><internationalization id="TalendForgeDialog.agreeButtonVer2" /></a></font></input>
+             <input type="checkbox" class="checkbox" name="checkbox1" id="agree" onclick="refreshCreateAccountButtton();" ><font style="font-size:12px;"><internationalization id="TalendForgeDialog.agreeButtonVer_1" /><a href="https://community.talend.com/t5/user/UserTermsOfServicePage" target="_blank"><internationalization id="TalendForgeDialog.agreeButtonVer_2" /></a></font></input>
              </td></tr>
              <tr><td></td><td colspan="2">
              <input type="checkbox" class="checkbox"  name="checkbox2" id="improve" checked="checked" /><font style="font-size:12px;"><internationalization id="TalendForgeDialog.improveButton" /></font>

main/plugins/org.talend.registration/src/main/java/messages.properties

@@ -61,17 +61,11 @@ RegisterManagement.userNameCharacter=Username should not contain more than 32 ch
 RegisterManagement.realnameInvalid=Realname invalid (bad format).
 RegisterManagement.errors=Errors
 RegisterManagement.wrongUserOrPassword=Username or password is wrong.
-TalendForgeDialog.newProjectTitle=Connect to TalendForge
-TalendForgeDialog.labelTitle.Version1=Connect your Studio to TalendForge, the Talend 
-TalendForgeDialog.labelTitle.Version2=Online Community.
-TalendForgeDialog.labelMessageOnePart1=Download 
-TalendForgeDialog.labelMessageOnePart2=new components and connectors 
-TalendForgeDialog.labelMessageOnePart3=from Talend Exchange.
-TalendForgeDialog.labelMessageTwo1=Access the most recent 
-TalendForgeDialog.labelMessageTwo2=Documentation and Tech articles 
-TalendForgeDialog.labelMessageTwo3=from Talend social knowledgebase.
-TalendForgeDialog.labelMessageThreeVer1=See the latest messages in the Talend
-TalendForgeDialog.labelMessageThreeVer2=Discussions Forums.
+TalendForgeDialog.newProjectTitle1=Connect to Talend Community
+TalendForgeDialog.labelTitle.Version_1=Connect your Studio to the Talend Community.
+TalendForgeDialog.labelMessageOnePart_1=Can't find the right connector in the Studio? Check out Talend Exchange for Community-contributed connectors on exchange.talend.com 
+TalendForgeDialog.labelMessageTwo_1=Access the latest product documentation and technical articles of Talend Help on help.talend.com
+TalendForgeDialog.labelMessageThreeVer_1=Find answers to your questions and help other users in the discussion boards on community.talend.com
 TalendForgeDialog.createLabel=Create an account 
 TalendForgeDialog.userNameLabel=Username:
 TalendForgeDialog.userNameLabel.tooltip=Username is needed
@@ -83,8 +77,8 @@ TalendForgeDialog.passwordLabel=Password:
 TalendForgeDialog.passwordLabel.tooltip=Password is needed
 TalendForgeDialog.passwordAgainLabel=Password(again):
 TalendForgeDialog.passwordAgainLabel.tooltip=Password(again) must be the same as Password
-TalendForgeDialog.agreeButtonVer1=I agree to the 
-TalendForgeDialog.agreeButtonVer2=TalendForge Terms of Use
+TalendForgeDialog.agreeButtonVer_1=I agree with the 
+TalendForgeDialog.agreeButtonVer_2=Community terms of use
 TalendForgeDialog.improveButton=I want to help to improve Talend by sharing anonymous usage statistics
 TalendForgeDialog.readMore=(read more...)
 TalendForgeDialog.createAccountButton.v1=CREATE ACCOUNT

main/plugins/org.talend.registration/src/main/java/org/talend/registration/wizards/register/TalendForgeDialog.java

@@ -78,7 +78,7 @@ public class TalendForgeDialog extends TrayDialog {
     @Override
     protected void configureShell(final Shell newShell) {
         super.configureShell(newShell);
-        newShell.setText(Messages.getString("TalendForgeDialog.newProjectTitle")); //$NON-NLS-1$
+        newShell.setText(Messages.getString("TalendForgeDialog.newProjectTitle1")); //$NON-NLS-1$
     }
 
     @Override

main/plugins/org.talend.repository.localprovider/src/main/java/org/talend/repository/localprovider/model/LocalRepositoryFactory.java

@@ -2433,6 +2433,19 @@ public class LocalRepositoryFactory extends AbstractEMFRepositoryFactory impleme
             case PropertiesPackage.EDIFACT_CONNECTION_ITEM:
                 itemResource = save(resourceSet, (EDIFACTConnectionItem) item);
                 break;
+            case PropertiesPackage.CONNECTION_ITEM:
+                // connection item may be used by extention point
+                boolean created = false;
+                for (IRepositoryContentHandler handler : RepositoryContentManager.getHandlers()) {
+                    itemResource = handler.save(item);
+                    if (itemResource != null) {
+                        created = true;
+                        break;
+                    }
+                }
+                if (created) {
+                    break;
+                }
             default:
                 throw new UnsupportedOperationException();
             }
@@ -2802,6 +2815,20 @@ public class LocalRepositoryFactory extends AbstractEMFRepositoryFactory impleme
             case PropertiesPackage.EDIFACT_CONNECTION_ITEM:// gldu add for 19384
                 itemResource = create(project2, (EDIFACTConnectionItem) item, ERepositoryObjectType.METADATA_EDIFACT, path);
                 break;
+            case PropertiesPackage.CONNECTION_ITEM:
+                // connection item may be used by extention point
+                final int classifierID = eClass.getClassifierID();
+                boolean created = false;
+                for (IRepositoryContentHandler handler : RepositoryContentManager.getHandlers()) {
+                    itemResource = handler.create(project2, item, classifierID, path);
+                    if (itemResource != null) {
+                        created = true;
+                        break;
+                    }
+                }
+                if (created) {
+                    break;
+                }
             default:
 
                 throw new UnsupportedOperationException();

main/plugins/org.talend.repository.metadata/src/main/java/org/talend/repository/metadata/i18n/messages.properties

@@ -1002,6 +1002,7 @@ DatabaseTableFilterForm.selectType=Select Types
 DatabaseTableFilterForm.setNameFilter=Set the Name Filter\: 
 DatabaseTableFilterForm.setSqlFilter=Set the Sql Filter\: 
 DatabaseTableFilterForm.synonym=SYNONYM
+DatabaseTableFilterForm.calculationView=CALCULATION VIEW
 DatabaseTableFilterForm.table=TABLE
 DatabaseTableFilterForm.useNameFilter=Use the Name Filter
 DatabaseTableFilterForm.useSqlFilter=Use the Sql Filter

main/plugins/org.talend.repository.metadata/src/main/java/org/talend/repository/ui/wizards/metadata/connection/database/DatabaseWizard.java

@@ -467,6 +467,7 @@ public class DatabaseWizard extends CheckLastVersionRepositoryWizard implements
                         && (EDatabaseVersion4Drivers.VERTICA_6.getVersionValue().equals(dbVersion)
                                 || EDatabaseVersion4Drivers.VERTICA_5_1.getVersionValue().equals(dbVersion)
                                 || EDatabaseVersion4Drivers.VERTICA_6_1_X.getVersionValue().equals(dbVersion) || EDatabaseVersion4Drivers.VERTICA_7
+                                .getVersionValue().equals(dbVersion) || EDatabaseVersion4Drivers.VERTICA_9
                                 .getVersionValue().equals(dbVersion))) {
                     driverClass = EDatabase4DriverClassName.VERTICA2.getDriverClass();
                 } else if (EDatabaseTypeName.IMPALA.equals(dbType)) {

main/plugins/org.talend.repository.metadata/src/main/java/org/talend/repository/ui/wizards/metadata/table/database/DatabaseTableFilterForm.java

@@ -64,6 +64,8 @@ public class DatabaseTableFilterForm extends AbstractForm {
 
     private Button synonymCheck;
 
+    private Button calculationViewCheck;
+
     // hide for the bug 7959
 
     private Button publicSynonymCheck;
@@ -116,6 +118,8 @@ public class DatabaseTableFilterForm extends AbstractForm {
             getTableInfoParameters().changeType(ETableTypes.MANAGED_TABLE, tableCheck.getSelection());
             getTableInfoParameters().changeType(ETableTypes.INDEX_TABLE, tableCheck.getSelection());
             getTableInfoParameters().changeType(ETableTypes.VIRTUAL_VIEW, viewCheck.getSelection());
+        } else if (EDatabaseTypeName.SAPHana.getDisplayName().equals(metadataconnection.getDbType())) {
+            getTableInfoParameters().changeType(ETableTypes.TABLETYPE_CALCULATION_VIEW, calculationViewCheck.getSelection());
         }
         // hide for the bug 7959
         if (isOracle()) {
@@ -144,10 +148,11 @@ public class DatabaseTableFilterForm extends AbstractForm {
         tableCheck.setEnabled(getTableInfoParameters().isUsedName());
         viewCheck.setEnabled(getTableInfoParameters().isUsedName());
         synonymCheck.setEnabled(getTableInfoParameters().isUsedName());
-
         if (isOracle()) {
             publicSynonymCheck.setEnabled(getTableInfoParameters().isUsedName());
             ExtractMetaDataUtils.getInstance().setUseAllSynonyms(publicSynonymCheck.getSelection());
+        } else if (EDatabaseTypeName.SAPHana.getDisplayName().equals(metadataconnection.getDbType())) {
+            calculationViewCheck.setEnabled(getTableInfoParameters().isUsedName());
         }
 
         removeButton.setEnabled(getTableInfoParameters().isUsedName());
@@ -270,7 +275,7 @@ public class DatabaseTableFilterForm extends AbstractForm {
         Group typesFilter = new Group(composite2, SWT.NONE);
         typesFilter.setText(Messages.getString("DatabaseTableFilterForm.selectType")); //$NON-NLS-1$
         gridLayout = new GridLayout();
-        gridLayout.numColumns = 3;
+        gridLayout.numColumns = 4;
 
         typesFilter.setLayout(gridLayout);
 
@@ -292,6 +297,10 @@ public class DatabaseTableFilterForm extends AbstractForm {
             publicSynonymCheck.setText(Messages.getString("DatabaseTableFilterForm.allSynonyms")); //$NON-NLS-1$
             publicSynonymCheck.setSelection(false);
             // ExtractMetaDataUtils.setVale(publicSynonymCheck.getSelection());
+        } else if (EDatabaseTypeName.SAPHana.getDisplayName().equals(metadataconnection.getDbType())) {
+            calculationViewCheck = new Button(typesFilter, SWT.CHECK);
+            calculationViewCheck.setText(Messages.getString("DatabaseTableFilterForm.calculationView")); //$NON-NLS-1$
+            calculationViewCheck.setSelection(true);
         }
 
         Composite namecomposite = new Composite(composite2, SWT.NONE);
@@ -373,6 +382,10 @@ public class DatabaseTableFilterForm extends AbstractForm {
         usedSql.setEnabled(false);
         sqllabel.setEnabled(false);
         sqlFilter.setEnabled(false);
+        if (EDatabaseTypeName.SAPHana.getDisplayName().equals(metadataconnection.getDbType())) {
+            calculationViewCheck.setEnabled(false);
+            calculationViewCheck.setSelection(false);
+        }
     }
 
     /**
@@ -462,6 +475,16 @@ public class DatabaseTableFilterForm extends AbstractForm {
                     }
                 }
 
+            });
+        } else if (EDatabaseTypeName.SAPHana.getDisplayName().equals(metadataconnection.getDbType())) {
+            calculationViewCheck.addSelectionListener(new SelectionAdapter() {
+
+                @Override
+                public void widgetSelected(SelectionEvent e) {
+                    getTableInfoParameters().changeType(ETableTypes.TABLETYPE_CALCULATION_VIEW,
+                            calculationViewCheck.getSelection());
+                }
+
             });
         }
         SelectionAdapter selectionAdapter = new SelectionAdapter() {

main/plugins/org.talend.repository.metadata/src/main/java/org/talend/repository/ui/wizards/metadata/table/database/SelectorTableForm.java

@@ -104,6 +104,7 @@ import org.talend.cwm.helper.ConnectionHelper;
 import org.talend.cwm.helper.PackageHelper;
 import org.talend.cwm.helper.SchemaHelper;
 import org.talend.cwm.helper.TableHelper;
+import org.talend.cwm.helper.TaggedValueHelper;
 import org.talend.cwm.relational.RelationalFactory;
 import org.talend.cwm.relational.TdColumn;
 import org.talend.cwm.relational.TdTable;
@@ -118,8 +119,10 @@ import org.talend.metadata.managment.utils.MetadataConnectionUtils;
 import org.talend.repository.metadata.i18n.Messages;
 import org.talend.repository.model.IProxyRepositoryFactory;
 import org.talend.utils.sql.ConnectionUtils;
+
 import orgomg.cwm.objectmodel.core.CoreFactory;
 import orgomg.cwm.objectmodel.core.ModelElement;
+import orgomg.cwm.objectmodel.core.TaggedValue;
 import orgomg.cwm.resource.relational.Catalog;
 import orgomg.cwm.resource.relational.NamedColumnSet;
 import orgomg.cwm.resource.relational.Schema;
@@ -1558,8 +1561,10 @@ public class SelectorTableForm extends AbstractForm {
                             dbtable = RelationalFactory.eINSTANCE.createTdTable();
                         }
                         dbtable.setComment(comment);
-                        TableHelper.setComment(comment, dbtable);
-                        dbtable.getTaggedValue().addAll(table.getTaggedValue());
+                        EList<TaggedValue> tvs = table.getTaggedValue();
+                        for (TaggedValue tv : tvs) {
+                            TaggedValueHelper.setTaggedValue(dbtable, tv.getTag(), tv.getValue());
+                        }
                         dbtable.setTableType(type);
                         String lableName = MetadataToolHelper.validateTableName(table.getName());
                         dbtable.setLabel(lableName);

main/plugins/org.talend.repository.view/src/org/talend/repository/viewer/action/RepoDoubleClickAction.java

@@ -260,7 +260,8 @@ public class RepoDoubleClickAction extends Action {
             return false;
         }
         if (ERepositoryObjectType.METADATA_SAP_BW_DATASOURCE != null) {
-            if (nodeType == ERepositoryObjectType.METADATA_SAP_BW_DATASOURCE
+            if (nodeType == ERepositoryObjectType.METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT
+                    || nodeType == ERepositoryObjectType.METADATA_SAP_BW_DATASOURCE
                     || nodeType == ERepositoryObjectType.METADATA_SAP_BW_DATASTOREOBJECT
                     || nodeType == ERepositoryObjectType.METADATA_SAP_BW_INFOCUBE
                     || nodeType == ERepositoryObjectType.METADATA_SAP_BW_INFOOBJECT) {

main/plugins/org.talend.repository.view/src/org/talend/repository/viewer/content/FolderListenerSingleTopContentProvider.java

@@ -227,8 +227,12 @@ public abstract class FolderListenerSingleTopContentProvider extends SingleTopLe
             }
         }
 
-        // to help garbage collection
-        topLevelNodeToPathMap.clear();
+        clearCache();
         super.dispose();
     }
+
+    public void clearCache() {
+        // to help garbage collection
+        topLevelNodeToPathMap.clear();
+    }
 }

pom.xml

@@ -200,17 +200,6 @@
 				<version>${tycho.version}</version>
 				<extensions>true</extensions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
-				<executions>
-					<execution>
-						<id>default-deploy</id>
-						<phase>none</phase>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 </project>