Skip to content

Commit

Permalink
Merge branch 'Luna' of https://github.com/eclipse/birt.git into Luna
Browse files Browse the repository at this point in the history
  • Loading branch information
junouyang committed Sep 3, 2014
2 parents 1df34ee + 254ae06 commit 0d04b9d
Show file tree
Hide file tree
Showing 290 changed files with 1,099 additions and 705 deletions.
2 changes: 1 addition & 1 deletion UI/org.eclipse.birt.report.debug.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BIRT Debug Core Plug-in
Bundle-SymbolicName: org.eclipse.birt.report.debug.core;singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Require-Bundle: org.eclipse.birt.core,
org.eclipse.birt.report.engine;bundle-version="[2.3.0,5.0.0)"
Export-Package: org.eclipse.birt.report.debug.core.i18n,
Expand Down
2 changes: 1 addition & 1 deletion UI/org.eclipse.birt.report.debug.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BIRT Debug UI Plug-in
Bundle-SymbolicName: org.eclipse.birt.report.debug.ui; singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
Bundle-Vendor: Eclipse BIRT Project
Bundle-Localization: plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BIRT Designer Core
Bundle-SymbolicName: org.eclipse.birt.report.designer.core;singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Activator: org.eclipse.birt.report.designer.core.CorePlugin
Bundle-Vendor: Eclipse BIRT Project
Bundle-Localization: plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BIRT Samplereports Plug-in
Bundle-SymbolicName: org.eclipse.birt.report.designer.samplereports;singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Vendor: Eclipse BIRT Project
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BIRT Test Plugin
Bundle-SymbolicName: org.eclipse.birt.report.designer.tests; singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Activator: org.eclipse.birt.report.designer.tests.TestsPlugin
Bundle-Vendor: Eclipse BIRT Project
Bundle-Localization: plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BIRT Cube Builder Plug-in
Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.cubebuilder;singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Activator: org.eclipse.birt.report.designer.ui.cubebuilder.BuilderPlugin
Bundle-Vendor: Eclipse BIRT Project
Require-Bundle: org.eclipse.ui;bundle-version="[3.2.1,4.0.0)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BIRT Designer Data Plug-in
Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.data;singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: Eclipse BIRT Project
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BIRT Enhanced Script Editor Plug-in
Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.editor.script;singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
org.eclipse.gef;bundle-version="[3.2.1,4.0.0)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BIRT Advanced XML Editor Plug-in
Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.editor.xml.wtp;singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.wst.sse.core;bundle-version="[1.0.100,2.0.0)",
org.eclipse.wst.sse.ui;bundle-version="[1.0.201,2.0.0)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BIRT Editors Plug-in
Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.editors.schematic;singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BIRT MultipageEditor Extension Point Plug-in
Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.editors;singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Activator: org.eclipse.birt.report.designer.ui.editors.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BIRT Designer UI for IDE
Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.ide; singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Activator: org.eclipse.birt.report.designer.ui.IDEReportPlugin
Bundle-Vendor: Eclipse BIRT Project
Bundle-Localization: plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BIRT Library Explorer Plug-in
Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.lib.explorer; singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Activator: org.eclipse.birt.report.designer.ui.lib.explorer.LibraryExplorerPlugin
Bundle-Vendor: Eclipse BIRT Project
Bundle-Localization: plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BIRT Designer UI for Library
Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.lib; singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Activator: org.eclipse.birt.report.designer.ui.LibraryPlugin
Bundle-Vendor: Eclipse BIRT Project
Bundle-Localization: plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Static HTML Plug-in
Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.preview.static_html;singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Activator: org.eclipse.birt.report.designer.ui.preview.static_html.StaticHTMLPrviewPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
Expand Down
14 changes: 7 additions & 7 deletions UI/org.eclipse.birt.report.designer.ui.preview.test/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Test Plug-in
Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.preview.test
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Vendor: Eclipse BIRT Project
Require-Bundle: org.eclipse.birt.report.designer.ui.preview,
org.eclipse.birt.report.engine
org.eclipse.birt.report.engine,
org.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: com.ibm.icu.util
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,14 @@
import org.eclipse.birt.report.engine.api.IGetParameterDefinitionTask;
import org.eclipse.birt.report.engine.api.IParameterDefnBase;
import org.eclipse.birt.report.engine.api.IParameterSelectionChoice;
import org.eclipse.birt.report.engine.api.IProgressMonitor;
import org.eclipse.birt.report.engine.api.IReportEngine;
import org.eclipse.birt.report.engine.api.IReportRunnable;
import org.eclipse.birt.report.engine.api.IStatusHandler;
import org.eclipse.birt.report.model.api.ParameterHandle;
import org.eclipse.birt.report.model.api.SlotHandle;

import com.ibm.icu.util.TimeZone;
import com.ibm.icu.util.ULocale;

/**
Expand Down Expand Up @@ -291,4 +294,68 @@ public void setLogger( Logger logger )

}

@Override
public void setTimeZone( TimeZone timeZone )
{
// TODO Auto-generated method stub

}

@Override
public void setParameterValue( String name, Object[] values )
{
// TODO Auto-generated method stub

}

@Override
public void setParameter( String name, Object[] values, String[] displayText )
{
// TODO Auto-generated method stub

}

@Override
public void setParameterDisplayText( String name, String[] text )
{
// TODO Auto-generated method stub

}

@Override
public void setDataSource( IDocArchiveReader dataSource, String reportlet )
{
// TODO Auto-generated method stub

}

@Override
public void setUserACL( String[] acl )
{
// TODO Auto-generated method stub

}

@Override
public void setProgressMonitor( IProgressMonitor monitor )
{
// TODO Auto-generated method stub

}

@Override
public void setStatusHandler( IStatusHandler handler )
{
// TODO Auto-generated method stub

}

@Override
public Collection getSelectionTreeForCascadingGroup(
String parameterGroupName )
{
// TODO Auto-generated method stub
return null;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,11 @@ public HashMap getTestConfig( )
return null;
}

public void setDesignHandle( ReportDesignHandle handle )
@Override
public void setDesignHandle( DesignElementHandle handle )
{
// TODO Auto-generated method stub

}

}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BIRT Preview Plug-in
Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.preview.web;singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Activator: org.eclipse.birt.report.designer.ui.preview.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

package org.eclipse.birt.report.designer.ui.preferences;

import java.text.Collator;
import java.util.Arrays;
import java.util.Iterator;
import java.util.Map.Entry;
Expand All @@ -29,6 +28,7 @@
import org.eclipse.birt.report.viewer.browsers.custom.CustomBrowser;
import org.eclipse.birt.report.viewer.utilities.AppContextUtil;
import org.eclipse.birt.report.viewer.utilities.WebViewer;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Preferences;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.preference.IPreferenceNode;
Expand Down Expand Up @@ -182,9 +182,11 @@ else if ( WebViewer.LOCALE_TABLE.values( ).contains( defaultLocale ) )
svgFlag = new Button( mainComposite, SWT.CHECK );
svgFlag.setLayoutData( new GridData( GridData.GRAB_HORIZONTAL ) );
svgFlag.setText( Messages.getString( "designer.preview.preference.browser.svg" ) ); //$NON-NLS-1$
svgFlag.setSelection( ViewerPlugin.getDefault( )
.getPluginPreferences( )
.getBoolean( WebViewer.SVG_FLAG ) );
svgFlag.setSelection( Platform.getPreferencesService( )
.getBoolean( ViewerPlugin.PLUGIN_ID,
WebViewer.SVG_FLAG,
true,
null ) );

// Show mastet page or not.
masterPageContent = new Button( mainComposite, SWT.CHECK );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BIRT Preview Plug-in
Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.preview;singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Activator: org.eclipse.birt.report.designer.ui.preview.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %ApplicationName
Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.rcp; singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Vendor: Eclipse BIRT Project
Bundle-Localization: plugin
Export-Package: org.eclipse.birt.report.designer.ui,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Report Samples IDE Plug-in
Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.samples.ide;singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Require-Bundle: org.eclipse.birt.report.designer.ui.samplesview,
org.eclipse.core.runtime,
org.eclipse.birt.report.designer.ui,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Report Samples RCP Plug-in
Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.samples.rcp;singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.birt.report.designer.ui.samplesview,
org.eclipse.birt.report.designer.ui,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BIRT Report Samples View Plug-in
Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.samplesview;singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: Eclipse BIRT Project
Eclipse-LazyStart: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BIRT UI Views Plug-in
Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.views;singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Activator: org.eclipse.birt.report.designer.ui.views.ReportViewsPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BIRT Designer UI
Bundle-SymbolicName: org.eclipse.birt.report.designer.ui; singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Activator: org.eclipse.birt.report.designer.ui.ReportPlugin
Bundle-Vendor: Eclipse BIRT Project
Bundle-Localization: plugin
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#jar name, group id, artifact id, version id
commons-discovery.jar, commons-discovery, commons-discovery, 0.5
axis.jar, commons-discovery, axis, 1.4
axis.jar, org.apache.axis, axis, 1.4
org.eclipse.birt.runtime.jar, org.eclipse.birt.runtime, org.eclipse.birt.runtime, 4.2.2


2 changes: 1 addition & 1 deletion build/org.eclipse.birt.chart/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BIRT Chart Framework
Bundle-SymbolicName: org.eclipse.birt.chart
Bundle-Version: 4.3.2.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Vendor: Eclipse BIRT Project
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Expand Down
2 changes: 1 addition & 1 deletion build/org.eclipse.birt.example/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BIRT Example
Bundle-SymbolicName: org.eclipse.birt.example
Bundle-Version: 4.3.2.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Vendor: Eclipse BIRT Project
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Expand Down
2 changes: 1 addition & 1 deletion build/org.eclipse.birt.releng.birtbuilder/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ BranchName=Luna
dtp_BranchName=master

# change this when you change the build working folder
WORKING_DIR=/home/adb/releng.441_RC1
WORKING_DIR=/home/adb/releng.441
LOG_FILE=adb.log

#set the monitor file name which is used for uploading builds to eclipse.org
Expand Down
Loading

0 comments on commit 0d04b9d

Please sign in to comment.