Merge branch 'master_eclipse' into Kepler

ilatypov · Dec 13, 2013 · 8a36a0f · 8a36a0f
2 parents 26d9567 + d5f0d4a
commit 8a36a0f
Show file tree

Hide file tree

Showing 225 changed files with 73,024 additions and 66,706 deletions.
diff --git a/...t.report.designer.ui/src/org/eclipse/birt/report/designer/ui/widget/TreeViewerBackup.java b/...t.report.designer.ui/src/org/eclipse/birt/report/designer/ui/widget/TreeViewerBackup.java
@@ -15,8 +15,10 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.viewers.TreePath;
 import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.osgi.service.environment.Constants;
 
 
 public class TreeViewerBackup implements ITreeViewerBackup
@@ -48,7 +50,9 @@ public void dispose( )
 	 */
 	public void updateCollapsedStatus( TreeViewer treeViewer, Object data )
 	{
-		treeViewer.collapseToLevel( data, TreeViewer.ALL_LEVELS );
+		if(!Constants.OS_MACOSX.equalsIgnoreCase( Platform.getOS( ) )){//collapse all sub nodes if not in MacOS
+			treeViewer.collapseToLevel( data, TreeViewer.ALL_LEVELS );
+		}
 		updateStatus( treeViewer );
 	}
 

diff --git a/....eclipse.birt.releng.birtbuilder/eclipse/buildConfigs/birt.nl/tools/LanguagePackBuild.xml b/....eclipse.birt.releng.birtbuilder/eclipse/buildConfigs/birt.nl/tools/LanguagePackBuild.xml
@@ -484,7 +484,55 @@
 			<property name="cvs.options" value="" />
 			<property name="cvsRoot" value="${cvs.root}" />
 		</projectInfo>
+
+                <projectInfo>
+                        <property name="projectName" value="org.eclipse.birt.data.oda.mongodb.nl" />
+                        <property name="repositoryPath" value="source/nl" />
+                        <property name="buildFileName" value="build.xml" />
+                        <property name="cvs.options" value="" />
+                        <property name="cvsRoot" value="${cvs.root}" />
+                </projectInfo>
 
+                <projectInfo>
+                        <property name="projectName" value="org.eclipse.birt.data.oda.mongodb.ui.nl" />
+                        <property name="repositoryPath" value="source/nl" />
+                        <property name="buildFileName" value="build.xml" />
+                        <property name="cvs.options" value="" />
+                        <property name="cvsRoot" value="${cvs.root}" />
+                </projectInfo>
+
+                <projectInfo>
+                        <property name="projectName" value="org.eclipse.birt.data.oda.pojo.nl" />
+                        <property name="repositoryPath" value="source/nl" />
+                        <property name="buildFileName" value="build.xml" />
+                        <property name="cvs.options" value="" />
+                        <property name="cvsRoot" value="${cvs.root}" />
+                </projectInfo>
+
+                <projectInfo>
+                        <property name="projectName" value="org.eclipse.birt.data.oda.pojo.ui.nl" />
+                        <property name="repositoryPath" value="source/nl" />
+                        <property name="buildFileName" value="build.xml" />
+                        <property name="cvs.options" value="" />
+                        <property name="cvsRoot" value="${cvs.root}" />
+                </projectInfo>
+
+                <projectInfo>
+                        <property name="projectName" value="org.eclipse.birt.report.engine.emitter.config.docx.nl" />
+                        <property name="repositoryPath" value="source/nl" />
+                        <property name="buildFileName" value="build.xml" />
+                        <property name="cvs.options" value="" />
+                        <property name="cvsRoot" value="${cvs.root}" />
+                </projectInfo>
+
+                <projectInfo>
+                        <property name="projectName" value="org.eclipse.birt.report.engine.emitter.config.pptx.nl" />
+                        <property name="repositoryPath" value="source/nl" />
+                        <property name="buildFileName" value="build.xml" />
+                        <property name="cvs.options" value="" />
+                        <property name="cvsRoot" value="${cvs.root}" />
+                </projectInfo>
+
 	</projectList>
 	<projectList id="ODA.language.pack.list">
 		<projectInfo>
@@ -1048,6 +1096,62 @@
 			<property name="cvs.options" value="${oda.build.version}" />
 			<property name="cvsRoot" value="${oda.cvs.root}" />
 		</projectInfo>
+                <projectInfo>
+                        <property name="projectName"
+                                value="org.eclipse.datatools.enablement.ingres.dbdefinition.nl" />
+                        <property name="repositoryPath" value="${ODA.repository.nl.path}" />
+                        <property name="buildFileName" value="build.xml" />
+                        <property name="cvs.options" value="${oda.build.version}" />
+                        <property name="cvsRoot" value="${oda.cvs.root}" />
+                </projectInfo>
+                <projectInfo>
+                        <property name="projectName"
+                                value="org.eclipse.datatools.enablement.ingres.nl" />
+                        <property name="repositoryPath" value="${ODA.repository.nl.path}" />
+                        <property name="buildFileName" value="build.xml" />
+                        <property name="cvs.options" value="${oda.build.version}" />
+                        <property name="cvsRoot" value="${oda.cvs.root}" />
+                </projectInfo>
+                <projectInfo>
+                        <property name="projectName"
+                                value="org.eclipse.datatools.enablement.ingres.ui.nl" />
+                        <property name="repositoryPath" value="${ODA.repository.nl.path}" />
+                        <property name="buildFileName" value="build.xml" />
+                        <property name="cvs.options" value="${oda.build.version}" />
+                        <property name="cvsRoot" value="${oda.cvs.root}" />
+                </projectInfo>
+                <projectInfo>
+                        <property name="projectName"
+                                value="org.eclipse.datatools.enablement.jdt.classpath.nl" />
+                        <property name="repositoryPath" value="${ODA.repository.nl.path}" />
+                        <property name="buildFileName" value="build.xml" />
+                        <property name="cvs.options" value="${oda.build.version}" />
+                        <property name="cvsRoot" value="${oda.cvs.root}" />
+                </projectInfo>
+                <projectInfo>
+                        <property name="projectName"
+                                value="org.eclipse.datatools.enablement.sqlite.dbdefinition.nl" />
+                        <property name="repositoryPath" value="${ODA.repository.nl.path}" />
+                        <property name="buildFileName" value="build.xml" />
+                        <property name="cvs.options" value="${oda.build.version}" />
+                        <property name="cvsRoot" value="${oda.cvs.root}" />
+                </projectInfo>
+                <projectInfo>
+                        <property name="projectName"
+                                value="org.eclipse.datatools.enablement.sqlite.nl" />
+                        <property name="repositoryPath" value="${ODA.repository.nl.path}" />
+                        <property name="buildFileName" value="build.xml" />
+                        <property name="cvs.options" value="${oda.build.version}" />
+                        <property name="cvsRoot" value="${oda.cvs.root}" />
+                </projectInfo>
+                <projectInfo>
+                        <property name="projectName"
+                                value="org.eclipse.datatools.enablement.sqlite.ui.nl" />
+                        <property name="repositoryPath" value="${ODA.repository.nl.path}" />
+                        <property name="buildFileName" value="build.xml" />
+                        <property name="cvs.options" value="${oda.build.version}" />
+                        <property name="cvsRoot" value="${oda.cvs.root}" />
+                </projectInfo>
 
 		<projectInfo>
 			<property name="projectName"

diff --git a/chart/org.eclipse.birt.chart.engine/src/org/eclipse/birt/chart/device/IDeviceRenderer.java b/chart/org.eclipse.birt.chart.engine/src/org/eclipse/birt/chart/device/IDeviceRenderer.java
@@ -36,7 +36,8 @@ public interface IDeviceRenderer extends
 {
 
 	/**
-	 * A property name that identifies a device-specific file identifier
+	 * A property name that identifies a device-specific file identifier. The
+	 * value can be either file path or instance of output stream.
 	 */
 	public static final String FILE_IDENTIFIER = "device.file.identifier"; //$NON-NLS-1$
 

diff --git a/...da.mongodb.ui/src/org/eclipse/birt/data/oda/mongodb/ui/impl/MongoDBDataSetWizardPage.java b/...da.mongodb.ui/src/org/eclipse/birt/data/oda/mongodb/ui/impl/MongoDBDataSetWizardPage.java
@@ -17,6 +17,7 @@
 
 import org.eclipse.birt.data.oda.mongodb.ui.i18n.Messages;
 import org.eclipse.birt.data.oda.mongodb.ui.util.FieldEntryWrapper;
+import org.eclipse.birt.data.oda.mongodb.ui.util.IHelpConstants;
 import org.eclipse.birt.data.oda.mongodb.ui.util.UIHelper;
 import org.eclipse.datatools.connectivity.internal.ui.dialogs.ExceptionHandler;
 import org.eclipse.datatools.connectivity.oda.IConnection;
@@ -194,6 +195,9 @@ public void run( )
 		resetLabelWidth( );
 
 		modelChanged = false;
+
+		UIHelper.setSystemHelp( getControl( ),
+				IHelpConstants.CONTEXT_ID_WIZARD_DATASET_MONGODB );
 	}
 
 	private void createBottomArea( Composite mainComposite )

diff --git a/...g/eclipse/birt/report/data/oda/jdbc/dbprofile/sampledb/internal/impl/SampleDbFactory.java b/...g/eclipse/birt/report/data/oda/jdbc/dbprofile/sampledb/internal/impl/SampleDbFactory.java
@@ -1,6 +1,6 @@
 /*
  *************************************************************************
- * Copyright (c) 2008, 2011 Actuate Corporation.
+ * Copyright (c) 2008, 2013 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -51,19 +51,30 @@ public class SampleDbFactory implements IExecutableExtension
     private static final String SAMPLE_DB_SEG = "seg0"; //$NON-NLS-1$
     private static final String PATH_SEPARATOR = "/"; //$NON-NLS-1$
 
-    // key and name of pre-defined driver definition, as specified in the 
-    // org.eclipse.datatools.connectivity.ProfileManagerInitializationProvider extension
-    private static final String DRIVER_DEFN_NAME_KEY = "%driver.definition.name"; //$NON-NLS-1$
+    // key and name of pre-defined driver and profile definition, as specified in the 
+    // org.eclipse.datatools.connectivity.ProfileManagerInitializationProvider extension and plugin.properties
+    private static final String DRIVER_DEFN_NAME_RESOURCE_KEY = "%driver.definition.name"; //$NON-NLS-1$
     private static final String SAMPLEDB_DRIVER_DEFN_DEFAULT_NAME = "BIRT SampleDb Derby Embedded Driver"; //$NON-NLS-1$
     private static final String SAMPLEDB_DRIVER_DEFN_RESOURCE_KEY = 
-        DRIVER_DEFN_NAME_KEY + " " + SAMPLEDB_DRIVER_DEFN_DEFAULT_NAME; //$NON-NLS-1$
+        DRIVER_DEFN_NAME_RESOURCE_KEY + " " + SAMPLEDB_DRIVER_DEFN_DEFAULT_NAME; //$NON-NLS-1$
+
+    private static final String SAMPLEDB_DRIVER_DEFN_ID_PREFIX =
+            "DriverDefn." + PLUGIN_ID + ".driverTemplate." ; //$NON-NLS-1$ //$NON-NLS-2$
+    static final String SAMPLEDB_DEFAULT_DRIVER_DEFN_ID = 
+            SAMPLEDB_DRIVER_DEFN_ID_PREFIX + SAMPLEDB_DRIVER_DEFN_DEFAULT_NAME;
+
+    private static final String PROFILE_NAME_RESOURCE_KEY = "%connection.profile.name"; //$NON-NLS-1$
+    private static final String SAMPLEDB_DEFAULT_PROFILE_NAME = "BIRT Classic Models Sample Database"; //$NON-NLS-1$
+    private static final String SAMPLEDB_PROFILE_NAME_RESOURCE_KEY = 
+            PROFILE_NAME_RESOURCE_KEY + " " + SAMPLEDB_DEFAULT_PROFILE_NAME; //$NON-NLS-1$
 
-    static final String SAMPLEDB_DRIVER_DEFN_ID =
-            "DriverDefn." + PLUGIN_ID + ".driverTemplate." + SAMPLEDB_DRIVER_DEFN_DEFAULT_NAME; //$NON-NLS-1$ //$NON-NLS-2$
     static final String SAMPLEDB_URL_RELATIVE_SUFFIX = PLUGIN_ID + PATH_SEPARATOR +
                 SAMPLE_DB_HOME_SUBDIR + PATH_SEPARATOR + SAMPLE_DB_NAME;
-    static final String SAMPLEDB_DEFAULT_PROFILE_NAME = "BIRT Classic Models Sample Database"; //$NON-NLS-1$
 
+    private static String sm_nlsDriverDefinitionId;
+    private static String sm_nlsDriverDefinitionName = getLocalizedDriverDefinitionNameImpl();
+    private static String sm_nlsSampleDbProfileName = getLocalizedSampleDbProfileNameImpl();
+
     /* (non-Javadoc)
      * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
      */
@@ -190,11 +201,44 @@ public boolean accept( File dir, String name )
 
     private void removeObsoleteDriverDefinition()
     {
-        String driverDefnName = 
-            PluginResourceLocator.getResourceString( PLUGIN_ID, SAMPLEDB_DRIVER_DEFN_RESOURCE_KEY );
+        String driverDefnName = getLocalizedDriverDefinitionName();
 
         // remove the driver definition instance if it is invalid
         ProfileDriverUtil.removeInvalidDriverDefinition( driverDefnName );
     }
 
+    private static String getLocalizedDriverDefinitionName()
+    {
+        return sm_nlsDriverDefinitionName;
+    }
+
+    private static String getLocalizedDriverDefinitionNameImpl()
+    {
+        return PluginResourceLocator.getResourceString( PLUGIN_ID, SAMPLEDB_DRIVER_DEFN_RESOURCE_KEY );
+    }
+
+    static String getLocalizedSampleDbProfileName()
+    {
+        return sm_nlsSampleDbProfileName;
+    }
+
+    private static String getLocalizedSampleDbProfileNameImpl()
+    {
+        return PluginResourceLocator.getResourceString( PLUGIN_ID, SAMPLEDB_PROFILE_NAME_RESOURCE_KEY );        
+    }
+
+    static String getLocalizedDriverDefinitionId()
+    {
+        if( sm_nlsDriverDefinitionId == null )
+        {
+            synchronized( SampleDbFactory.class )
+            {
+                if( sm_nlsDriverDefinitionId == null )
+                    sm_nlsDriverDefinitionId =
+                            SAMPLEDB_DRIVER_DEFN_ID_PREFIX + getLocalizedDriverDefinitionName();
+            }
+        }
+        return sm_nlsDriverDefinitionId;
+    }
+
 }
diff --git a/.../birt/report/data/oda/jdbc/dbprofile/sampledb/internal/impl/SampleDbPropertyProvider.java b/.../birt/report/data/oda/jdbc/dbprofile/sampledb/internal/impl/SampleDbPropertyProvider.java
@@ -54,7 +54,7 @@ public Properties getDataSourceProperties( Properties candidateProperties,
         // for BIRT SampleDB
         Properties defaultProfileProps = new Properties();
         defaultProfileProps.setProperty( ConnectionProfileProperty.PROFILE_NAME_PROP_KEY,
-                                         SampleDbFactory.SAMPLEDB_DEFAULT_PROFILE_NAME );
+                                         SampleDbFactory.getLocalizedSampleDbProfileName() );
         IConnectionProfile sampleDbProfile = OdaProfileExplorer.getInstance()
                                         .getProfileByName( defaultProfileProps, appContext );
 
@@ -87,7 +87,8 @@ private static boolean isTransientSampleDbProfile( Properties dbProfileProps )
         String driverDefnId = dbProfileProps.getProperty(
                 ConnectionProfileConstants.PROP_DRIVER_DEFINITION_ID, null );
         if( driverDefnId == null ||
-            ! driverDefnId.equalsIgnoreCase( SampleDbFactory.SAMPLEDB_DRIVER_DEFN_ID ) )
+            ! ( driverDefnId.equalsIgnoreCase( SampleDbFactory.SAMPLEDB_DEFAULT_DRIVER_DEFN_ID ) ||
+                driverDefnId.equalsIgnoreCase( SampleDbFactory.getLocalizedDriverDefinitionId() ) ))
             return false;
 
         String dbUrl = dbProfileProps.getProperty( IJDBCConnectionProfileConstants.URL_PROP_ID, null );

diff --git a/...irt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/jdbc/JDBCDriverManager.java b/...irt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/jdbc/JDBCDriverManager.java
@@ -256,7 +256,13 @@ private Connection doConnect( String driverClass, String url,
 			if ( logger.isLoggable( Level.FINER ))
 				logger.finer( "Calling IConnectionFactory.getConnection. driverClass=" + driverClass + //$NON-NLS-1$
 						", url=" + LogUtil.encryptURL( url ) ); //$NON-NLS-1$
-			return factory.getConnection( driverClass, url, connectionProperties );
+			try
+			{
+				Connection cn = factory.getConnection( driverClass, url, connectionProperties );
+				return cn;
+			}
+			catch( Exception e )
+			{}
 		}
 
         // no driverinfo extension for driverClass connectionFactory       

diff --git a/features/org.eclipse.birt.feature/feature.xml b/features/org.eclipse.birt.feature/feature.xml
@@ -874,13 +874,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.birt.jetty.overlay"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.birt.me.prettyprint.hector"
          download-size="0"

diff --git a/features/org.eclipse.birt.nl.feature/feature.xml b/features/org.eclipse.birt.nl.feature/feature.xml
@@ -493,5 +493,53 @@
          version="0.0.0"
          fragment="true"
          unpack="false"/>
+
+   <plugin
+         id="org.eclipse.birt.data.oda.mongodb.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.birt.data.oda.mongodb.ui.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.birt.data.oda.pojo.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.birt.data.oda.pojo.ui.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.birt.report.engine.emitter.config.docx.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.birt.report.engine.emitter.config.pptx.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
 
 </feature>
diff --git a/features/org.eclipse.birt.osgi.runtime/feature.xml b/features/org.eclipse.birt.osgi.runtime/feature.xml
@@ -634,13 +634,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.birt.jetty.overlay"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.birt.me.prettyprint.hector"
          download-size="0"

diff --git a/nl/.project b/nl/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>nl</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>